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

Various logging, help output and comment tweaks

Browse Source
This commit is contained in:
Ian Barwick
2016-01-27 17:10:54 +09:00
parent a96f478a43
commit 1a6d830314
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
repmgr.c
View File

@@ -2418,12 +2418,11 @@ do_standby_follow(void)
* can be provided explicitly with -C/--remote-config-file, * can be provided explicitly with -C/--remote-config-file,
* otherwise repmgr will look in default locations on the * otherwise repmgr will look in default locations on the
* remote server * remote server
* - this does not yet support "rewinding" stopped nodes
* which will be unable to catch up with the primary
* *
* TODO: * TODO:
* - update docs * - update docs
* - make connection test timeouts/intervals configurable (see below) * - make connection test timeouts/intervals configurable (see below)
* - check that server configured for pg_rewind (checksums or wal_log_hints)
*/ */
static void static void
@@ -2806,7 +2805,7 @@ do_standby_switchover(void)
{ {
connection_success = true; connection_success = true;
log_notice(_("current master has been stopped")); log_notice(_("current master has been stopped\n"));
break; break;
} }
PQfinish(remote_conn); PQfinish(remote_conn);
@@ -2847,7 +2846,9 @@ do_standby_switchover(void)
pg_bindir, pg_bindir,
remote_data_directory, remote_data_directory,
options.conninfo); options.conninfo);
log_debug("Executing:\n%s\n", command);
log_notice("Executing pg_rewind on old master server\n");
log_debug("pg_rewind command is:\n%s\n", command);
initPQExpBuffer(&command_output); initPQExpBuffer(&command_output);
@@ -3027,7 +3028,7 @@ do_standby_switchover(void)
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)
{ {
log_verbose(LOG_INFO, _("node %i is replicating in state \"%s\"\n"), remote_node_id, remote_node_replication_state); log_verbose(LOG_NOTICE, _("node %i is replicating in state \"%s\"\n"), remote_node_id, remote_node_replication_state);
} }
else else
{ {
@@ -3091,7 +3092,7 @@ do_standby_switchover(void)
PQfinish(local_conn); PQfinish(local_conn);
log_info(_("switchover was successful\n")); log_notice(_("switchover was successful\n"));
return; return;
} }
@@ -3762,7 +3763,7 @@ do_help(void)
" the current master\n")); " the current master\n"));
printf(_(" --pg_rewind[=VALUE] (standby switchover) 9.3/9.4 only - use pg_rewind if available,\n" \ printf(_(" --pg_rewind[=VALUE] (standby switchover) 9.3/9.4 only - use pg_rewind if available,\n" \
" optionally providing a path to the binary\n")); " optionally providing a path to the binary\n"));
printf(_(" -k, --keep-history=VALUE (cluster cleanup) retain indicated number of days of history\n")); printf(_(" -k, --keep-history=VALUE (cluster cleanup) retain indicated number of days of history (default: 0)\n"));
printf(_(" --initdb-no-pwprompt (witness server) no superuser password prompt during initdb\n")); printf(_(" --initdb-no-pwprompt (witness server) no superuser password prompt during initdb\n"));
printf(_(" -S, --superuser=USERNAME (witness server) superuser username for witness database\n" \ printf(_(" -S, --superuser=USERNAME (witness server) superuser username for witness database\n" \
" (default: postgres)\n")); " (default: postgres)\n"));