From 754084c814de88c19b797641625a4f3b55a0d061 Mon Sep 17 00:00:00 2001 From: Ian Barwick Date: Sat, 26 Aug 2017 10:27:22 +0900 Subject: [PATCH] Update "repmgr standby --help" output --- README.md | 6 ++++-- repmgr-action-standby.c | 30 +++++++++++++++++++++++++----- repmgr-client.c | 2 -- 3 files changed, 29 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 96018df8..45005c55 100644 --- a/README.md +++ b/README.md @@ -15,8 +15,9 @@ dropped. Please continue to use repmgrd 3.x for those versions. ### BDR support `repmgr 4` supports monitoring of a two-node BDR 2.0 cluster. PostgreSQL 9.6 is -required for BDR 2.0. Note that BDR 2.0 is not publicly available; please contact -2ndQuadrant for details. `repmgr 4` will support future public BDR releases. +required for BDR 2.0. Note that BDR 2.0 is not publicly available; please +contact 2ndQuadrant for details. `repmgr 4` will support future public BDR +releases. Changes in repmgr4 and backwards compatibility ----------------------------------------------- @@ -503,6 +504,7 @@ and the cluster status will now look like this: 2 | node2 | primary | * running | | host=node2 dbname=repmgr user=repmgr 3 | node3 | standby | running | node2 | host=node3 dbname=repmgr user=repmgr + ### Caveats - You must ensure that following a server start using `pg_ctl`, log output diff --git a/repmgr-action-standby.c b/repmgr-action-standby.c index 26527f4d..0b67a3e7 100644 --- a/repmgr-action-standby.c +++ b/repmgr-action-standby.c @@ -1277,7 +1277,7 @@ do_standby_follow(void) /* * Attempt to connect to primary. * - * If --wait provided, loop for up `primary_response_timeout` + * If --wait provided, loop for up `primary_follow_timeout` * seconds before giving up */ @@ -4230,8 +4230,6 @@ do_standby_help(void) { print_help_header(); - - printf(_("Usage:\n")); printf(_(" %s [OPTIONS] standby clone\n"), progname()); printf(_(" %s [OPTIONS] standby register\n"), progname()); @@ -4245,26 +4243,39 @@ do_standby_help(void) printf(_("STANDBY CLONE\n")); puts(""); printf(_(" \"standby clone\" clones a standby from the primary or an upstream node.\n")); + puts(""); printf(_(" -c, --fast-checkpoint force fast checkpoint\n")); printf(_(" --copy-external-config-files[={samepath|pgdata}]\n" \ " copy configuration files located outside the \n" \ " data directory to the same path on the standby (default) or to the\n" \ " PostgreSQL data directory\n")); printf(_(" --no-upstream-connection when using Barman, do not connect to upstream node\n")); - printf(_(" --upstream-conninfo 'primary_conninfo' value to write in recovery.conf\n" \ + printf(_(" --upstream-conninfo \"primary_conninfo\" value to write in recovery.conf\n" \ " when the intended upstream server does not yet exist\n")); - + printf(_(" -R, --remote-user=USERNAME database server username for SSH operations (default: \"%s\")\n"), runtime_options.username); + printf(_(" --replication-user username to set in \"primary_conninfo\" in recovery.conf\n")); + printf(_(" --without-barman do not use Barman even if configured\n")); puts(""); printf(_("STANDBY REGISTER\n")); puts(""); printf(_(" \"standby register\" registers the standby node.\n")); puts(""); + printf(_(" -F, --force overwrite an existing node record, or if primary connection\n"\ + " parameters supplied, create record even if standby offline\n")); + printf(_(" --upstream-node-id ID of the upstream node to replicate from (optional)\n")); + printf(_(" --wait-sync[=VALUE] wait for the node record to synchronise to the standby\n"\ + " (optional timeout in seconds)\n")); + + puts(""); printf(_("STANDBY UNREGISTER\n")); puts(""); printf(_(" \"standby unregister\" unregisters an inactive standby node.\n")); puts(""); + printf(_(" --node-id ID node to unregister (optional, used when the node to unregister\n" \ + " is offline)\n")); + puts(""); printf(_("STANDBY PROMOTE\n")); puts(""); @@ -4275,11 +4286,20 @@ do_standby_help(void) puts(""); printf(_(" \"standby follow\" instructs a standby node to follow a new primary.\n")); puts(""); + printf(_(" -W, --wait wait for a primary to appear\n")); + puts(""); printf(_("STANDBY SWITCHOVER\n")); puts(""); printf(_(" \"standby switchover\" promotes a standby node to primary, and demotes the previous primary to a standby.\n")); puts(""); + printf(_(" --always-promote promote standby even if behind original primary\n")); + printf(_(" --dry-run perform checks etc. but don't actually execute switchover\n")); + printf(_(" -F, --force ignore warnings and continue anyway\n")); + printf(_(" --force-rewind 9.5 and later - use pg_rewind to reintegrate the old primary if necessary\n")); + printf(_(" -R, --remote-user=USERNAME database server username for SSH operations (default: \"%s\")\n"), runtime_options.username); + printf(_(" --siblings-follow have other standbys follow new primary\n")); + puts(""); } diff --git a/repmgr-client.c b/repmgr-client.c index 789408dd..4ab8d16d 100644 --- a/repmgr-client.c +++ b/repmgr-client.c @@ -1654,8 +1654,6 @@ do_help(void) printf(_(" -b, --pg_bindir=PATH path to PostgreSQL binaries (optional)\n")); printf(_(" -f, --config-file=PATH path to the repmgr configuration file\n")); printf(_(" -F, --force force potentially dangerous operations to happen\n")); - printf(_(" -R, --remote-user=USERNAME database server username for rsync/ssh (default: \"%s\")\n"), runtime_options.username); - puts(""); printf(_("Database connection options:\n")); printf(_(" -d, --dbname=DBNAME database to connect to (default: "));