github/repmgr
1
0
Fork 0
mirror of https://github.com/EnterpriseDB/repmgr.git synced 2026-03-26 16:46:28 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

repmgr: add new error code ERR_SWITCHOVER_FAIL

Browse Source
This commit is contained in:
Ian Barwick
2016-06-29 12:11:53 +09:00
parent 66b7dbbed7
commit 097024a32f
2 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
errcode.h
View File

@@ -38,5 +38,6 @@
#define ERR_INTERNAL 15 #define ERR_INTERNAL 15
#define ERR_MONITORING_FAIL 16 #define ERR_MONITORING_FAIL 16
#define ERR_BAD_BACKUP_LABEL 17 #define ERR_BAD_BACKUP_LABEL 17
#define ERR_SWITCHOVER_FAIL 18
#endif /* _ERRCODE_H_ */ #endif /* _ERRCODE_H_ */

25
repmgr.c
View File

@@ -2784,7 +2784,7 @@ do_standby_switchover(void)
log_err(_("switchover must be executed from the standby node to be promoted\n")); log_err(_("switchover must be executed from the standby node to be promoted\n"));
PQfinish(local_conn); PQfinish(local_conn);
exit(ERR_BAD_CONFIG); exit(ERR_SWITCHOVER_FAIL);
} }
server_version_num = check_server_version(local_conn, "master", true, NULL); server_version_num = check_server_version(local_conn, "master", true, NULL);
@@ -3201,7 +3201,7 @@ do_standby_switchover(void)
{ {
log_err(_("master server did not shut down\n")); log_err(_("master server did not shut down\n"));
log_hint(_("check the master server status before performing any further actions")); log_hint(_("check the master server status before performing any further actions"));
exit(ERR_FAILOVER_FAIL); exit(ERR_SWITCHOVER_FAIL);
} }
/* promote this standby */ /* promote this standby */
@@ -3365,7 +3365,7 @@ do_standby_switchover(void)
if (is_standby(remote_conn) == 0) if (is_standby(remote_conn) == 0)
{ {
log_err(_("new standby (old master) is not a standby\n")); log_err(_("new standby (old master) is not a standby\n"));
exit(ERR_FAILOVER_FAIL); exit(ERR_SWITCHOVER_FAIL);
} }
connection_success = true; connection_success = true;
break; break;
@@ -3379,7 +3379,7 @@ do_standby_switchover(void)
if (connection_success == false) if (connection_success == false)
{ {
log_err(_("unable to connect to new standby (old master)\n")); log_err(_("unable to connect to new standby (old master)\n"));
exit(ERR_FAILOVER_FAIL); exit(ERR_SWITCHOVER_FAIL);
} }
log_debug("new standby is in recovery\n"); log_debug("new standby is in recovery\n");
@@ -3388,15 +3388,14 @@ do_standby_switchover(void)
local_conn = establish_db_connection(options.conninfo, true); local_conn = establish_db_connection(options.conninfo, true);
query_result = get_node_replication_state(local_conn, remote_node_record.name, remote_node_replication_state); query_result = get_node_replication_state(local_conn, remote_node_record.name, remote_node_replication_state);
if (query_result == -1) if (query_result == -1)
{ {
log_err(_("unable to retrieve replication status for node %i\n"), remote_node_id); log_err(_("unable to retrieve replication status for node %i\n"), remote_node_id);
PQfinish(local_conn); PQfinish(local_conn);
// errcode? exit(ERR_SWITCHOVER_FAIL);
exit(ERR_DB_QUERY);
} }
if (query_result == 0) if (query_result == 0)
@@ -3405,7 +3404,6 @@ do_standby_switchover(void)
} }
else else
{ {
/* XXX other valid values? */
/* XXX we should poll for a while in case the node takes time to connect to the primary */ /* XXX we should poll for a while in case the node takes time to connect to the primary */
if (strcmp(remote_node_replication_state, "streaming") == 0 || if (strcmp(remote_node_replication_state, "streaming") == 0 ||
strcmp(remote_node_replication_state, "catchup") == 0) strcmp(remote_node_replication_state, "catchup") == 0)
@@ -3414,9 +3412,16 @@ do_standby_switchover(void)
} }
else else
{ {
log_err(_("node %i replication state is \"%s\"\n"), remote_node_id, remote_node_replication_state); /*
* Other possible replication states are:
* - startup
* - backup
* - UNKNOWN
*/
log_err(_("node %i has unexpected replication state \"%s\"\n"),
remote_node_id, remote_node_replication_state);
PQfinish(local_conn); PQfinish(local_conn);
exit(ERR_DB_QUERY); exit(ERR_SWITCHOVER_FAIL);
} }
} }