From 66219c3097c3557a9d9030a92c6c1e8033e6897a Mon Sep 17 00:00:00 2001 From: Ian Barwick Date: Wed, 6 Sep 2017 14:13:06 +0900 Subject: [PATCH] README and "repmgr standby --help" updates --- README.md | 6 +++--- repmgr-action-standby.c | 5 +++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index c677a608..ca836c60 100644 --- a/README.md +++ b/README.md @@ -774,11 +774,11 @@ can be used to reduce load on the primary and minimize bandwith usage between sites. `repmgr` supports cascading replication. When cloning a standby, in `repmgr.conf` -set the command-line parameter `--upstream-node-id` to the `--node-id` of the +set the command-line parameter `--upstream-node-id` to the `node_id` of the server the standby should connect to, and `repmgr` will perform the clone using this server and create `recovery.conf` to point to it. Note that if `--upstream-node-id` -is not explicitly provided, `repmgr` will use the primary as the server -to clone from and attach to. +is not explicitly provided, `repmgr` will set the standby's `recovery.conf` to +point to the primary node. To demonstrate cascading replication, ensure you have a primary and standby set up as shown above in the section "Setting up a simple replication cluster diff --git a/repmgr-action-standby.c b/repmgr-action-standby.c index 89004453..4f21dd8d 100644 --- a/repmgr-action-standby.c +++ b/repmgr-action-standby.c @@ -4985,10 +4985,11 @@ do_standby_help(void) " PostgreSQL data directory\n")); printf(_(" --dry-run perform checks but don't actually clone the standby\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" \ - " 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 user to make replication connections with (optional, not usually required)\n")); + printf(_(" --upstream-conninfo \"primary_conninfo\" value to write in recovery.conf\n" \ + " when the intended upstream server does not yet exist\n")); + printf(_(" --upstream-node-id ID of the upstream node to replicate from (optional, defaults to primary node)\n")); printf(_(" --without-barman do not use Barman even if configured\n")); puts("");