github/repmgr
1
0
Fork 0
mirror of https://github.com/EnterpriseDB/repmgr.git synced 2026-03-22 22:56:29 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

Use PQping only to check for server shutdown

Browse Source 
Functionally there's no difference between that and attempting to
make an actual connection, so use one method only, which also
simplifies the code.
This commit is contained in:
Ian Barwick
2016-07-01 07:50:27 +09:00
parent 746c9793ed
commit 60bceae905
1 changed files with 12 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
repmgr.c
View File

@@ -3195,27 +3195,22 @@ do_standby_switchover(void)
{
/* Check whether primary is available */
remote_conn = test_db_connection(remote_conninfo, false); /* don't fail on error */
PGPing ping_res = PQping(remote_conninfo);
/*
* If we're unable to connect, keep PQping-ing the server until it
* finally goes away
*/
if (PQstatus(remote_conn) != CONNECTION_OK)
/* database server could not be contacted */
if (ping_res == PQPING_NO_RESPONSE)
{
PGPing ping_res = PQping(remote_conninfo);
/*
* XXX here we should directly access the server and check that the
* pidfile has gone away so we can be sure the server is actually
* shut down and the PQPING_NO_RESPONSE is not due to other issues
* such as coincidental network failure.
*/
shutdown_success = true;
/* database server could not be contacted */
if (ping_res == PQPING_NO_RESPONSE)
{
/* XXX we should double-check access to the physical server here */
shutdown_success = true;
log_notice(_("current master has been stopped\n"));
break;
}
log_notice(_("current master has been stopped\n"));
break;
}
PQfinish(remote_conn);
/* XXX make configurable? */
sleep(options.reconnect_interval);