From 0b8755e27859bc765b29ad5dba9eded34c99968d Mon Sep 17 00:00:00 2001 From: Ian Barwick Date: Thu, 8 Feb 2018 16:28:50 +0900 Subject: [PATCH] "witness register": fix primary node check Addresses GitHub #377, based on report by user yonj1e in #373. --- HISTORY | 1 + doc/appendix-release-notes.sgml | 6 ++++++ repmgr-action-witness.c | 4 ++-- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/HISTORY b/HISTORY index 336099b3..99c34102 100644 --- a/HISTORY +++ b/HISTORY @@ -18,6 +18,7 @@ repmgr: fix parsing of "pg_basebackup_options"; GitHub #376 (Ian) repmgr: ensure "pg_subtrans" directory is created when cloning a standby in Barman mode (Ian) + repmgr: fix primary node check in "witness register"; GitHub #377 (Ian) 4.0.2 2018-01-18 repmgr: add missing -W option to getopt_long() invocation; GitHub #350 (Ian) diff --git a/doc/appendix-release-notes.sgml b/doc/appendix-release-notes.sgml index 1a4c6de0..424e762d 100644 --- a/doc/appendix-release-notes.sgml +++ b/doc/appendix-release-notes.sgml @@ -122,6 +122,12 @@ + + + repmgr witness register: + fix primary node check (GitHub #377). + + diff --git a/repmgr-action-witness.c b/repmgr-action-witness.c index e32aaefe..5f316e0c 100644 --- a/repmgr-action-witness.c +++ b/repmgr-action-witness.c @@ -110,12 +110,12 @@ do_witness_register(void) } /* check primary node's recovery type */ - recovery_type = get_recovery_type(witness_conn); + recovery_type = get_recovery_type(primary_conn); if (recovery_type == RECTYPE_STANDBY) { log_error(_("provided primary node is a standby")); - log_error(_("provide the connection details of the cluster's primary server")); + log_hint(_("provide the connection details of the cluster's primary server")); PQfinish(witness_conn); PQfinish(primary_conn);