After checking that master is alive, is_pgup() should return not keep

checking forever.
This commit is contained in:
Jaime Casanova
2011-12-01 23:58:12 -05:00
parent 3b2ccc5b78
commit 9d03d4a254
2 changed files with 4 additions and 1 deletions

View File

@@ -160,7 +160,7 @@ is_pgup(PGconn *conn, int timeout)
if (wait_connection_availability(conn, timeout) != 1) if (wait_connection_availability(conn, timeout) != 1)
goto failed; goto failed;
continue; break;
failed: failed:
// we need to retry, because we might just have loose the connection once // we need to retry, because we might just have loose the connection once
@@ -170,6 +170,7 @@ failed:
twice = true; twice = true;
} }
} }
return true;
} }

View File

@@ -388,6 +388,7 @@ WitnessMonitor(void)
* Execute the query asynchronously, but don't check for a result. We * Execute the query asynchronously, but don't check for a result. We
* will check the result next time we pause for a monitor step. * will check the result next time we pause for a monitor step.
*/ */
log_debug("WitnessMonitor: %s\n", sqlquery);
if (PQsendQuery(primaryConn, sqlquery) == 0) if (PQsendQuery(primaryConn, sqlquery) == 0)
log_warning(_("Query could not be sent to primary. %s\n"), log_warning(_("Query could not be sent to primary. %s\n"),
PQerrorMessage(primaryConn)); PQerrorMessage(primaryConn));
@@ -532,6 +533,7 @@ StandbyMonitor(void)
* Execute the query asynchronously, but don't check for a result. We * Execute the query asynchronously, but don't check for a result. We
* will check the result next time we pause for a monitor step. * will check the result next time we pause for a monitor step.
*/ */
log_debug("StandbyMonitor: %s\n", sqlquery);
if (PQsendQuery(primaryConn, sqlquery) == 0) if (PQsendQuery(primaryConn, sqlquery) == 0)
log_warning(_("Query could not be sent to primary. %s\n"), log_warning(_("Query could not be sent to primary. %s\n"),
PQerrorMessage(primaryConn)); PQerrorMessage(primaryConn));