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

"witness register": don't try and read nodes table if it doesn't exist

Browse Source 
Previously, "repmgr witness register --dry-run" would attempt to check
for records in the nodes table, but that might not exist yet. Skip
that check if the repmgr extension is not yet installed.

Implements GitHub #513.
This commit is contained in:
Ian Barwick
2018-11-28 15:04:32 +09:00
parent 311f7e561e
commit 2aacd29e60
1 changed files with 31 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
repmgr-action-witness.c
View File

@@ -37,6 +37,7 @@ do_witness_register(void)
PGconn *witness_conn = NULL; PGconn *witness_conn = NULL;
PGconn *primary_conn = NULL; PGconn *primary_conn = NULL;
RecoveryType recovery_type = RECTYPE_UNKNOWN; RecoveryType recovery_type = RECTYPE_UNKNOWN;
ExtensionStatus extension_status = REPMGR_UNKNOWN;
NodeInfoList nodes = T_NODE_INFO_LIST_INITIALIZER; NodeInfoList nodes = T_NODE_INFO_LIST_INITIALIZER;
t_node_info node_record = T_NODE_INFO_INITIALIZER; t_node_info node_record = T_NODE_INFO_INITIALIZER;
RecordStatus record_status = RECORD_NOT_FOUND; RecordStatus record_status = RECORD_NOT_FOUND;
@@ -214,33 +215,45 @@ do_witness_register(void)
} }
} }
extension_status = get_repmgr_extension_status(witness_conn, NULL);
/* /*
* if repmgr.nodes contains entries, delete if -F/--force provided, * Check if the witness database already contains node records;
* otherwise exit with error * only do this if the extension is actually installed.
*/ */
if (get_all_node_records(witness_conn, &nodes) == false) if (extension_status == REPMGR_INSTALLED
|| extension_status == REPMGR_OLD_VERSION_INSTALLED)
{ {
/* get_all_node_records() will display the error */ /*
PQfinish(witness_conn); * if repmgr.nodes contains entries, exit with error unless
PQfinish(primary_conn); * -F/--force provided (which will cause the existing records
exit(ERR_BAD_CONFIG); * to be overwritten)
} */
log_verbose(LOG_DEBUG, "%i node records found", nodes.node_count); if (get_all_node_records(witness_conn, &nodes) == false)
if (nodes.node_count > 0)
{
if (!runtime_options.force)
{ {
log_error(_("witness node is already initialised and contains node records")); /* get_all_node_records() will display the error */
log_hint(_("use option -F/--force to reinitialise the node"));
PQfinish(primary_conn);
PQfinish(witness_conn); PQfinish(witness_conn);
PQfinish(primary_conn);
exit(ERR_BAD_CONFIG); exit(ERR_BAD_CONFIG);
} }
}
clear_node_info_list(&nodes); log_verbose(LOG_DEBUG, "%i node records found", nodes.node_count);
if (nodes.node_count > 0)
{
if (!runtime_options.force)
{
log_error(_("witness node is already initialised and contains node records"));
log_hint(_("use option -F/--force to reinitialise the node"));
PQfinish(primary_conn);
PQfinish(witness_conn);
exit(ERR_BAD_CONFIG);
}
}
clear_node_info_list(&nodes);
}
if (runtime_options.dry_run == true) if (runtime_options.dry_run == true)
{ {