Changed v14 package name in install example

Per comment from Ton Machielsen in docs Slack channel: https://edb.slack.com/archives/CU5QEU5L7/p1669116950090219

.github/workflows/sonarqube-scan.yml

@@ -0,0 +1,37 @@
+name: SonarQube Scan
+on:
+  pull_request:
+  push:
+    branches: [ master ]
+  workflow_dispatch:  
+jobs:
+  sonarQube:
+    name: SonarQube-Job
+    runs-on: ubuntu-latest
+    steps:
+    
+      - name: Checkout source repo
+        uses: actions/checkout@v1
+        with:
+          ref: '${{ github.head_ref }}'
+    
+      - name: Checkout GitHub Action Repo
+        uses: actions/checkout@master
+        with:
+          repository: EnterpriseDB/edb-github-actions.git
+          ref: master
+          token: ${{ secrets.GH_SLONIK }}
+          path: .github/actions/edb-github-actions
+          
+      - name: SonarQube Scan
+        uses: ./.github/actions/edb-github-actions/sonarqube
+        with:
+            REPO_NAME: '${{github.event.repository.name}}'
+            SONAR_PROJECT_KEY: EnterpriseDB_repmgr
+            SONAR_URL: '${{secrets.SONARQUBE_URL}}'
+            SONAR_LOGIN: '${{secrets.SONARQUBE_LOGIN}}'
+            PULL_REQUEST_KEY: '${{github.event.number}}'
+            PULL_REQUEST_BRANCH: '${{github.head_ref}}'
+            PULL_REQUEST_BASE_BRANCH: '${{github.base_ref}}'
+            REPO_DEFAULT_BRANCH: '${{github.event.repository.default_branch}}'
+            REPO_EXCLUDE_FILES: '*properties*,**/src/test/**/*,**/*.sql,**/docs/**/*,**/*/*.java'

.github/workflows/sonarqube/configure-env.sh

@@ -0,0 +1,18 @@
+#!/bin/bash
+
+DEBIAN_FRONTEND=noninteractive sudo apt-get -y install debhelper curl autoconf zlib1g-dev \
+  libedit-dev libxml2-dev libxslt1-dev libkrb5-dev libssl-dev libpam0g-dev systemtap-sdt-dev \
+  libselinux1-dev build-essential bison apt-utils lsb-release devscripts \
+  software-properties-common git shellcheck flex
+
+sudo sh -c 'echo "deb http://apt.postgresql.org/pub/repos/apt $(lsb_release -cs)-pgdg main" > /etc/apt/sources.list.d/pgdg.list'
+wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | sudo apt-key add -
+sudo apt-get update
+
+sudo apt-get -y install libpq-dev postgresql-13 postgresql-server-dev-13
+
+./configure
+
+export PG_CONFIG=/usr/bin/pg_config
+
+/home/buildfarm/sonar/depends/build-wrapper-linux-x86/build-wrapper-linux-x86-64 --out-dir build_wrapper_output_directory make 

CONTRIBUTING.md

@@ -2,7 +2,7 @@ License and Contributions
 =========================
 
 `repmgr` is licensed under the GPL v3.  All of its code and documentation is
-Copyright 2010-2019, 2ndQuadrant Limited.  See the files COPYRIGHT and LICENSE for
+Copyright 2010-2021, EnterpriseDB Corporation.  See the files COPYRIGHT and LICENSE for
 details.
 
 The development of repmgr has primarily been sponsored by 2ndQuadrant customers.
@@ -12,10 +12,10 @@ which has received funding from the European Union's Seventh Framework Programme
 (FP7/2007-2013) under grant agreement 258862.
 
 Contributions to `repmgr` are welcome, and will be listed in the file `CREDITS`.
-2ndQuadrant Limited requires that any contributions provide a copyright
+EnterpriseDB Corporation requires that any contributions provide a copyright
 assignment and a disclaimer of any work-for-hire ownership claims from the
 employer of the developer.  This lets us make sure that all of the repmgr
-distribution remains free code.  Please contact info@2ndQuadrant.com for a
+distribution remains free code.  Please contact info@enterprise.com for a
 copy of the relevant Copyright Assignment Form.
 
 Code style

COPYRIGHT

@@ -1,4 +1,4 @@
-Copyright (c) 2010-2019, 2ndQuadrant Limited
+Copyright (c) 2010-2021, EnterpriseDB Corporation
 All rights reserved.
 
 This program is free software: you can redistribute it and/or modify

FAQ.md

@@ -5,6 +5,6 @@ The repmgr 4 FAQ is located here: [repmgr FAQ (Frequently Asked Questions)](http
 
 The repmgr 3.x FAQ can be found here:
 
-    https://github.com/2ndQuadrant/repmgr/blob/REL3_3_STABLE/FAQ.md
+    https://github.com/EnterpriseDB/repmgr/blob/REL3_3_STABLE/FAQ.md
 
 Note that repmgr 3.x is no longer supported.

HISTORY

@@ -1,4 +1,94 @@
-5.0     2019-10-??
+5.3.3   2022-10-17
+        Support for PostgreSQL added
+        repmgrd: ensure event notification script is called for event
+          "repmgrd_upstream_disconnect"; GitHub #760 (Ian)
+
+5.3.2   2022-05-25
+        standby clone: don't error out if unable to determine cluster size (Ian)
+        node check: fix --downstream --nagios output; GitHub #749 (Ian)
+        repmgrd: ensure witness node marked active (hslightdb)
+        repmgrd: improve walsender disable check (Ian)
+        general: ensure replication slots can be dropped by a
+          replication-only user (Ian)
+
+5.3.1   2022-02-15
+        repmgrd: fixes for potential connection leaks (hslightdb)
+        repmgr: fix upgrade path from repmgr 4.2 and 4.3 to repmgr 5.3 (Ian)
+
+5.3.0   2021-10-12
+        standby switchover: improve handling of node rejoin failure (Ian)
+        repmgrd: prefix all shared library functions with "repmgr_" to
+          minimize the risk of clashes with other shared libraries (Ian)
+        repmgrd: at startup, if node record is marked as "inactive", attempt
+          to set it to "active" (Ian)
+        standby clone: set "slot_name" in node record if required (Ian)
+        node rejoin: emit rejoin target note information as NOTICE (Ian)
+        repmgrd: ensure short option "-s" is accepted (Ian)
+
+5.2.1   2020-12-07
+        config: fix parsing of "replication_type"; GitHub #672 (Ian)
+        standby clone: handle missing "postgresql.auto.conf" (Ian)
+        standby clone: add option --recovery-min-apply-delay (Ian)
+        standby clone: fix data directory permissions handling for
+          PostgreSQL 11 and later (Ian)
+        repmgrd: prevent termination when local node not available and
+          standby_disconnect_on_failover; GitHub #675 (Ian)
+        repmgrd: ensure reconnect_interval" is correctly handled;
+          GitHub #673 (Ian)
+
+5.2.0   2020-10-22
+        general: add support for PostgreSQL 13 (Ian)
+        general: remove support for PostgreSQL 9.3 (Ian)
+        config: add support for file inclusion directives (Ian)
+        repmgr: "primary unregister --force" will unregister an active primary
+          with no registered standby nodes (Ian)
+        repmgr: add option --verify-backup to "standby clone" (Ian)
+        repmgr: "standby clone" honours --waldir option if set in
+          "pg_basebackup_options" (Ian)
+        repmgr: add option --db-connection to "node check" (Ian)
+        repmgr: report database connection error if the --optformat option was
+          provided to "node check" (Ian)
+        repmgr: improve "node rejoin" checks (Ian)
+        repmgr: enable "node rejoin" to join a target with a lower timeline (Ian)
+        repmgr: support pg_rewind's automatic crash recovery in Pg13 and later (Ian)
+        repmgr: improve output formatting for cluster matrix/crosscheck (Ian)
+        repmgr: improve database connection failure error checking on the
+          demotion candidate during "standby switchover" (Ian)
+        repmgr: make repmgr metadata tables dumpable (Ian)
+        repmgr: fix issue with tablespace mapping when cloning from Barman;
+          GitHub #650 (Ian)
+        repmgr: improve handling of pg_control read errors (Ian)
+        repmgrd: add additional optional parameters to "failover_validation command"
+          (spaskalev; GitHub #651)
+        repmgrd: ensure primary connection is reset if same as upstream;
+          GitHub #633 (Ian)
+
+5.1.0   2020-04-13
+        repmgr: remove BDR 2.x support
+        repmgr: don't query upstream's data directory (Ian)
+        repmgr: rename --recovery-conf-only to --replication-conf-only (Ian)
+        repmgr: ensure postgresql.auto.conf is created with correct permissions (Ian)
+        repmgr: minimize requirement to check upstream data directory location
+          during "standby clone" (Ian)
+        repmgr: warn about missing pg_rewind prerequisites when executing
+          "standby clone" (Ian)
+        repmgr: add --upstream option to "node check"
+        repmgr: report error code on follow/rejoin failure due to non-available
+          replication slot (Ian)
+        repmgr: ensure "node rejoin" checks for available replication slots (Ian)
+        repmgr: improve "standby switchover" completion checks (Ian)
+        repmgr: add replication configuration file ownership check to
+          "standby switchover" (Ian)
+        repmgr: check the demotion candidate's registered repmgr.conf file can
+          be found (laixiong; GitHub 615)
+        repmgr: consolidate replication connection code (Ian)
+        repmgr: check permissions for "pg_promote()" and fall back to pg_ctl
+          if necessary (Ian)
+        repmgr: in --dry-run mode, display promote command which will be used (Ian)
+        repmgr: enable "service_promote_command" in PostgreSQL 12 (Ian)
+        repmgr: accept option -S/--superuser for "node check"; GitHub #612 (Ian)
+
+5.0     2019-10-15
         general: add PostgreSQL 12 support (Ian)
         general: parse configuration file using flex (Ian)
         repmgr: rename "repmgr daemon ..." commands to "repmgr service ..." (Ian)

Makefile.in

@@ -11,6 +11,9 @@ EXTENSION = repmgr
 
 DATA = \
   repmgr--unpackaged--4.0.sql \
+  repmgr--unpackaged--5.1.sql \
+  repmgr--unpackaged--5.2.sql \
+  repmgr--unpackaged--5.3.sql \
   repmgr--4.0.sql \
   repmgr--4.0--4.1.sql \
   repmgr--4.1.sql \
@@ -21,7 +24,15 @@ DATA = \
   repmgr--4.3--4.4.sql \
   repmgr--4.4.sql \
   repmgr--4.4--5.0.sql \
-  repmgr--5.0.sql
+  repmgr--5.0.sql \
+  repmgr--5.0--5.1.sql \
+  repmgr--5.1.sql \
+  repmgr--5.1--5.2.sql \
+  repmgr--5.2.sql \
+  repmgr--5.2--5.3.sql \
+  repmgr--5.3.sql \
+  repmgr--5.3--5.4.sql \
+  repmgr--5.4.sql
 
 REGRESS = repmgr_extension
 
@@ -53,9 +64,12 @@ $(info Building against PostgreSQL $(MAJORVERSION))
 
 REPMGR_CLIENT_OBJS = repmgr-client.o \
 	repmgr-action-primary.o repmgr-action-standby.o repmgr-action-witness.o \
-	repmgr-action-bdr.o repmgr-action-cluster.o repmgr-action-node.o repmgr-action-service.o repmgr-action-daemon.o \
-	configfile.o configfile-scan.o log.o strutil.o controldata.o dirutil.o compat.o dbutils.o sysutils.o
-REPMGRD_OBJS = repmgrd.o repmgrd-physical.o repmgrd-bdr.o configfile.o configfile-scan.o log.o dbutils.o strutil.o controldata.o compat.o sysutils.o
+	repmgr-action-cluster.o repmgr-action-node.o repmgr-action-service.o repmgr-action-daemon.o \
+	configdata.o configfile.o configfile-scan.o log.o strutil.o controldata.o dirutil.o compat.o \
+	dbutils.o sysutils.o
+REPMGRD_OBJS = repmgrd.o repmgrd-physical.o configdata.o configfile.o configfile-scan.o log.o \
+	dbutils.o strutil.o controldata.o compat.o sysutils.o
+
 DATE=$(shell date "+%Y-%m-%d")
 
 repmgr_version.h: repmgr_version.h.in

README.md

@@ -7,32 +7,23 @@ replication capabilities with utilities to set up standby servers, monitor
 replication, and perform administrative tasks such as failover or switchover
 operations.
 
-`repmgr 4` is a complete rewrite of the existing `repmgr` codebase, allowing
-the use of all of the latest features in PostgreSQL replication.
-
-PostgreSQL 11, 10, 9.6 and 9.5 are fully supported.
-PostgreSQL 9.4 and 9.3 are supported, with some restrictions.
-
-`repmgr` is distributed under the GNU GPL 3 and maintained by 2ndQuadrant.
-
-### BDR support
-
-`repmgr 4` supports monitoring of a two-node BDR 2.0 cluster on PostgreSQL 9.6
-only. Note that BDR 2.0 is not publicly available; please contact 2ndQuadrant
-for details.
+The most recent `repmgr` version (5.3.2) supports all PostgreSQL versions from
+9.5 to 14. PostgreSQL 9.4 is also supported, with some restrictions.
 
+`repmgr` is distributed under the GNU GPL 3 and maintained by EnterpriseDB.
 
 Documentation
 -------------
 
-The main `repmgr` documentation is available here:
+The full `repmgr` documentation is available here:
 
 > [repmgr documentation](https://repmgr.org/docs/current/index.html)
 
-The `README` file for `repmgr` 3.x is available here:
-
-> https://github.com/2ndQuadrant/repmgr/blob/REL3_3_STABLE/README.md
+Versions
+--------
 
+For an overview of `repmgr` versions and PostgreSQL compatibility, see the
+[repmgr compatibility matrix](https://repmgr.org/docs/current/install-requirements.html#INSTALL-COMPATIBILITY-MATRIX).
 
 Files
 ------
@@ -56,11 +47,11 @@ Directories
 Support and Assistance
 ----------------------
 
-2ndQuadrant provides 24x7 production support for `repmgr`, including
+EnterpriseDB provides 24x7 production support for `repmgr`, including
 configuration assistance, installation verification and training for
 running a robust replication cluster. For further details see:
 
-* https://2ndquadrant.com/en/support/
+* [EDB Support Services](https://www.enterprisedb.com/support/postgresql-support-overview-get-the-most-out-of-postgresql)
 
 There is a mailing list/forum to discuss contributions or issues:
 
@@ -70,21 +61,12 @@ The IRC channel #repmgr is registered with freenode.
 
 Please report bugs and other issues to:
 
-* https://github.com/2ndQuadrant/repmgr
+* https://github.com/EnterpriseDB/repmgr
 
 Further information is available at https://repmgr.org/
 
 We'd love to hear from you about how you use repmgr. Case studies and
-news are always welcome. Send us an email at info@2ndQuadrant.com, or
-send a postcard to
-
-    repmgr
-    c/o 2ndQuadrant
-    7200 The Quorum
-    Oxford Business Park North
-    Oxford
-    OX4 2JZ
-    United Kingdom
+news are always welcome.
 
 Thanks from the repmgr core team.
 
@@ -98,7 +80,6 @@ Further reading
 ---------------
 
 * [repmgr documentation](https://repmgr.org/docs/current/index.html)
-* https://blog.2ndquadrant.com/repmgr-3-2-is-here-barman-support-brand-new-high-availability-features/
-* https://blog.2ndquadrant.com/improvements-in-repmgr-3-1-4/
-* https://blog.2ndquadrant.com/managing-useful-clusters-repmgr/
-* https://blog.2ndquadrant.com/easier_postgresql_90_clusters/
+* [How to Automate PostgreSQL 12 Replication and Failover with repmgr - Part 1](https://www.2ndquadrant.com/en/blog/how-to-automate-postgresql-12-replication-and-failover-with-repmgr-part-1/)
+* [How to Automate PostgreSQL 12 Replication and Failover with repmgr - Part 2](https://www.2ndquadrant.com/en/blog/how-to-automate-postgresql-12-replication-and-failover-with-repmgr-part-2/)
+* [How to implement repmgr for PostgreSQL automatic failover](https://www.enterprisedb.com/postgres-tutorials/how-implement-repmgr-postgresql-automatic-failover)

TODO.md

@@ -1,7 +1,7 @@
 TODO
 ====
 
-This file contains a list of improvements which are desireable and/or have
+This file contains a list of improvements which are desirable and/or have
 been requested, and which we aim to address/implement when time and resources
 permit.
 
@@ -17,4 +17,4 @@ repmgrd nodes to prevent unintended failover; this is obviously inconvenient.
 We'll need to implement some way of notifying each repmgrd to suspend automatic
 failover until further notice.
 
-Requested in GitHub #410 ( https://github.com/2ndQuadrant/repmgr/issues/410 )
+Requested in GitHub #410 ( https://github.com/EnterpriseDB/repmgr/issues/410 )

compat.c

@@ -6,7 +6,7 @@
  *    supported PostgreSQL versions. They're unlikely to change but
  *    it would be worth keeping an eye on them for any fixes/improvements.
  *
- * Copyright (c) 2ndQuadrant, 2010-2019
+ * Copyright (c) EnterpriseDB Corporation, 2010-2021
  *
  * Portions Copyright (c) 1996-2013, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California

compat.h

@@ -1,6 +1,6 @@
 /*
  * compat.h
- * Copyright (c) 2ndQuadrant, 2010-2019
+ * Copyright (c) EnterpriseDB Corporation, 2010-2021
  *
  * Portions Copyright (c) 1996-2013, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California

configdata.c

@@ -0,0 +1,946 @@
+/*
+ * configdata.c - contains structs with parsed configuration data
+ *
+ * Copyright (c) EnterpriseDB Corporation, 2010-2021
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "repmgr.h"
+#include "configfile.h"
+
+/*
+ * Parsed configuration settings are stored here
+ */
+t_configuration_options config_file_options;
+
+
+/*
+ * Configuration settings are defined here
+ */
+
+struct ConfigFileSetting config_file_settings[] =
+{
+
+	/* ================
+	 * node information
+	 * ================
+	 */
+	/* node_id */
+	{
+		"node_id",
+		CONFIG_INT,
+		{ .intptr = &config_file_options.node_id },
+		{ .intdefault = UNKNOWN_NODE_ID },
+		{ .intminval = MIN_NODE_ID },
+		{},
+		{}
+	},
+	/* node_name */
+	{
+		"node_name",
+		CONFIG_STRING,
+		{ .strptr = config_file_options.node_name },
+		{ .strdefault = "" },
+		{},
+		{ .strmaxlen = sizeof(config_file_options.node_name) },
+		{}
+	},
+	/* conninfo */
+	{
+		"conninfo",
+		CONFIG_STRING,
+		{ .strptr = config_file_options.conninfo },
+		{ .strdefault = "" },
+		{},
+		{ .strmaxlen = sizeof(config_file_options.conninfo) },
+		{}
+	},
+	/* replication_user */
+	{
+		"replication_user",
+		CONFIG_STRING,
+		{ .strptr = config_file_options.replication_user },
+		{ .strdefault = "" },
+		{},
+		{ .strmaxlen = sizeof(config_file_options.replication_user) },
+		{}
+	},
+	/* data_directory */
+	{
+		"data_directory",
+		CONFIG_STRING,
+		{ .strptr = config_file_options.data_directory },
+		{ .strdefault = "" },
+		{},
+		{ .strmaxlen = sizeof(config_file_options.data_directory) },
+		{ .postprocess_func = &repmgr_canonicalize_path }
+	},
+	/* config_directory */
+	{
+		"config_directory",
+		CONFIG_STRING,
+		{ .strptr = config_file_options.config_directory },
+		{ .strdefault = "" },
+		{},
+		{ .strmaxlen = sizeof(config_file_options.config_directory) },
+		{ .postprocess_func = &repmgr_canonicalize_path }
+	},
+	/* pg_bindir */
+	{
+		"pg_bindir",
+		CONFIG_STRING,
+		{ .strptr = config_file_options.pg_bindir },
+		{ .strdefault = "" },
+		{},
+		{ .strmaxlen = sizeof(config_file_options.pg_bindir) },
+		{ .postprocess_func = &repmgr_canonicalize_path }
+	},
+	/* repmgr_bindir */
+	{
+		"repmgr_bindir",
+		CONFIG_STRING,
+		{ .strptr = config_file_options.repmgr_bindir },
+		{ .strdefault = "" },
+		{},
+		{ .strmaxlen = sizeof(config_file_options.repmgr_bindir) },
+		{ .postprocess_func = &repmgr_canonicalize_path }
+	},
+	/* replication_type */
+	{
+		"replication_type",
+		CONFIG_REPLICATION_TYPE,
+		{ .replicationtypeptr = &config_file_options.replication_type },
+		{ .replicationtypedefault = DEFAULT_REPLICATION_TYPE },
+		{},
+		{},
+		{}
+	},
+
+	/* ================
+	 * logging settings
+	 * ================
+	 */
+
+	/*
+	 * log_level
+	 * NOTE: the default for "log_level" is set in log.c and does not need
+	 * to be initialised here
+	 */
+	{
+		"log_level",
+		CONFIG_STRING,
+		{ .strptr = config_file_options.log_level },
+		{ .strdefault = "" },
+		{},
+		{ .strmaxlen = sizeof(config_file_options.log_level) },
+		{}
+	},
+	/* log_facility */
+	{
+		"log_facility",
+		CONFIG_STRING,
+		{ .strptr = config_file_options.log_facility },
+		{ .strdefault = "" },
+		{},
+		{ .strmaxlen = sizeof(config_file_options.log_facility) },
+		{}
+	},
+	/* log_file */
+	{
+		"log_file",
+		CONFIG_STRING,
+		{ .strptr = config_file_options.log_file },
+		{ .strdefault = "" },
+		{},
+		{ .strmaxlen = sizeof(config_file_options.log_file) },
+		{ .postprocess_func = &repmgr_canonicalize_path }
+	},
+	/* log_status_interval */
+	{
+		"log_status_interval",
+		CONFIG_INT,
+		{ .intptr = &config_file_options.log_status_interval },
+		{ .intdefault = DEFAULT_LOG_STATUS_INTERVAL, },
+		{ .intminval = 0 },
+		{},
+		{}
+	},
+	/* ======================
+	 * standby clone settings
+	 * ======================
+	 */
+	/* use_replication_slots */
+	{
+		"use_replication_slots",
+		CONFIG_BOOL,
+		{ .boolptr = &config_file_options.use_replication_slots },
+		{ .booldefault = DEFAULT_USE_REPLICATION_SLOTS },
+		{},
+		{},
+		{}
+	},
+	/* pg_basebackup_options */
+	{
+		"pg_basebackup_options",
+		CONFIG_STRING,
+		{ .strptr = config_file_options.pg_basebackup_options },
+		{ .strdefault = "" },
+		{},
+		{ .strmaxlen = sizeof(config_file_options.pg_basebackup_options) },
+		{}
+	},
+	/* restore_command */
+	{
+		"restore_command",
+		CONFIG_STRING,
+		{ .strptr = config_file_options.restore_command },
+		{ .strdefault = "" },
+		{},
+		{ .strmaxlen = sizeof(config_file_options.restore_command) },
+		{}
+	},
+	/* tablespace_mapping */
+	{
+		"tablespace_mapping",
+		CONFIG_TABLESPACE_MAPPING,
+		{ .tablespacemappingptr = &config_file_options.tablespace_mapping },
+		{},
+		{},
+		{},
+		{}
+	},
+	/* recovery_min_apply_delay */
+	{
+		"recovery_min_apply_delay",
+		CONFIG_STRING,
+		{ .strptr = config_file_options.recovery_min_apply_delay },
+		{ .strdefault = "" },
+		{},
+		{ .strmaxlen = sizeof(config_file_options.recovery_min_apply_delay) },
+        {
+			.process_func = &parse_time_unit_parameter,
+			.providedptr = &config_file_options.recovery_min_apply_delay_provided
+		}
+	},
+
+	/* archive_cleanup_command */
+	{
+		"archive_cleanup_command",
+		CONFIG_STRING,
+		{ .strptr = config_file_options.archive_cleanup_command },
+		{ .strdefault = "" },
+		{},
+		{ .strmaxlen = sizeof(config_file_options.archive_cleanup_command) },
+		{}
+	},
+
+	/* use_primary_conninfo_password */
+	{
+		"use_primary_conninfo_password",
+		CONFIG_BOOL,
+		{ .boolptr = &config_file_options.use_primary_conninfo_password },
+		{ .booldefault = DEFAULT_USE_PRIMARY_CONNINFO_PASSWORD },
+		{},
+		{},
+		{}
+	},
+	/* passfile */
+	{
+		"passfile",
+		CONFIG_STRING,
+		{ .strptr = config_file_options.passfile },
+		{ .strdefault = "" },
+		{},
+		{ .strmaxlen = sizeof(config_file_options.passfile) },
+		{}
+	},
+
+	/* ======================
+	 * standby clone settings
+	 * ======================
+	 */
+	/* promote_check_timeout */
+	{
+		"promote_check_timeout",
+		CONFIG_INT,
+		{ .intptr = &config_file_options.promote_check_timeout },
+		{ .intdefault = DEFAULT_PROMOTE_CHECK_TIMEOUT },
+		{ .intminval = 1 },
+		{},
+		{}
+	},
+	/* promote_check_interval */
+	{
+		"promote_check_interval",
+		CONFIG_INT,
+		{ .intptr = &config_file_options.promote_check_interval },
+		{ .intdefault = DEFAULT_PROMOTE_CHECK_INTERVAL },
+		{ .intminval = 1 },
+		{},
+		{}
+	},
+
+	/* =======================
+	 * standby follow settings
+	 * =======================
+	 */
+	/* primary_follow_timeout */
+	{
+		"primary_follow_timeout",
+		CONFIG_INT,
+		{ .intptr = &config_file_options.primary_follow_timeout },
+		{ .intdefault = DEFAULT_PRIMARY_FOLLOW_TIMEOUT, },
+		{ .intminval = 1 },
+		{},
+		{}
+	},
+	/* standby_follow_timeout */
+	{
+		"standby_follow_timeout",
+		CONFIG_INT,
+		{ .intptr = &config_file_options.standby_follow_timeout },
+		{ .intdefault = DEFAULT_STANDBY_FOLLOW_TIMEOUT },
+		{ .intminval = 1 },
+		{},
+		{}
+	},
+	/* standby_follow_restart */
+	{
+		"standby_follow_restart",
+		CONFIG_BOOL,
+		{ .boolptr = &config_file_options.standby_follow_restart },
+		{ .booldefault = DEFAULT_STANDBY_FOLLOW_RESTART },
+		{},
+		{},
+		{}
+	},
+
+	/* ===========================
+	 * standby switchover settings
+	 * ===========================
+	 */
+	/* shutdown_check_timeout */
+	{
+		"shutdown_check_timeout",
+		CONFIG_INT,
+		{ .intptr = &config_file_options.shutdown_check_timeout },
+		{ .intdefault = DEFAULT_SHUTDOWN_CHECK_TIMEOUT },
+		{ .intminval = 1 },
+		{},
+		{}
+	},
+	/* standby_reconnect_timeout */
+	{
+		"standby_reconnect_timeout",
+		CONFIG_INT,
+		{ .intptr = &config_file_options.standby_reconnect_timeout },
+		{ .intdefault = DEFAULT_STANDBY_RECONNECT_TIMEOUT },
+		{ .intminval = 1 },
+		{},
+		{}
+	},
+	/* wal_receive_check_timeout */
+	{
+		"wal_receive_check_timeout",
+		CONFIG_INT,
+		{ .intptr = &config_file_options.wal_receive_check_timeout },
+		{ .intdefault = DEFAULT_WAL_RECEIVE_CHECK_TIMEOUT },
+		{ .intminval = 1 },
+		{},
+		{}
+	},
+
+	/* ====================
+	 * node rejoin settings
+	 * ====================
+	 */
+	/* node_rejoin_timeout */
+	{
+		"node_rejoin_timeout",
+		CONFIG_INT,
+		{ .intptr = &config_file_options.node_rejoin_timeout },
+		{ .intdefault = DEFAULT_NODE_REJOIN_TIMEOUT },
+		{ .intminval = 1 },
+		{},
+		{}
+	},
+	/* ===================
+	 * node check settings
+	 * ===================
+	 */
+	/* archive_ready_warning */
+	{
+		"archive_ready_warning",
+		CONFIG_INT,
+		{ .intptr = &config_file_options.archive_ready_warning },
+		{ .intdefault = DEFAULT_ARCHIVE_READY_WARNING },
+		{ .intminval = 1 },
+		{},
+		{}
+	},
+	/* archive_ready_critical */
+	{
+		"archive_ready_critical",
+		CONFIG_INT,
+		{ .intptr = &config_file_options.archive_ready_critical },
+		{ .intdefault = DEFAULT_ARCHIVE_READY_CRITICAL },
+		{ .intminval = 1 },
+		{},
+		{}
+	},
+	/* replication_lag_warning */
+	{
+		"replication_lag_warning",
+		CONFIG_INT,
+		{ .intptr = &config_file_options.replication_lag_warning },
+		{ .intdefault = DEFAULT_REPLICATION_LAG_WARNING },
+		{ .intminval = 1 },
+		{},
+		{}
+	},
+	/* replication_lag_critical */
+	{
+		"replication_lag_critical",
+		CONFIG_INT,
+		{ .intptr = &config_file_options.replication_lag_critical },
+		{ .intdefault = DEFAULT_REPLICATION_LAG_CRITICAL },
+		{ .intminval = 1 },
+		{},
+		{}
+	},
+
+	/* ================
+	 * witness settings
+	 * ================
+	 */
+	/* witness_sync_interval */
+	{
+		"witness_sync_interval",
+		CONFIG_INT,
+		{ .intptr = &config_file_options.witness_sync_interval },
+		{ .intdefault = DEFAULT_WITNESS_SYNC_INTERVAL },
+		{ .intminval = 1 },
+		{},
+		{}
+	},
+
+	/* ================
+	 * repmgrd settings
+	 * ================
+	 */
+	/* failover */
+	{
+		"failover",
+		CONFIG_FAILOVER_MODE,
+		{ .failovermodeptr = &config_file_options.failover },
+		{ .failovermodedefault = FAILOVER_MANUAL },
+		{},
+		{},
+		{}
+	},
+	/* location */
+	{
+		"location",
+		CONFIG_STRING,
+		{ .strptr = config_file_options.location },
+		{ .strdefault = DEFAULT_LOCATION },
+		{},
+		{ .strmaxlen = sizeof(config_file_options.location) },
+		{}
+	},
+	/* priority */
+	{
+		"priority",
+		CONFIG_INT,
+		{ .intptr = &config_file_options.priority },
+		{ .intdefault = DEFAULT_PRIORITY, },
+		{ .intminval = 0 },
+		{},
+		{}
+	},
+	/* promote_command */
+	{
+		"promote_command",
+		CONFIG_STRING,
+		{ .strptr = config_file_options.promote_command },
+		{ .strdefault = "" },
+		{},
+		{ .strmaxlen = sizeof(config_file_options.promote_command) },
+		{}
+	},
+	/* follow_command */
+	{
+		"follow_command",
+		CONFIG_STRING,
+		{ .strptr = config_file_options.follow_command },
+		{ .strdefault = "" },
+		{},
+		{ .strmaxlen = sizeof(config_file_options.follow_command) },
+		{}
+	},
+	/* monitor_interval_secs */
+	{
+		"monitor_interval_secs",
+		CONFIG_INT,
+		{ .intptr = &config_file_options.monitor_interval_secs },
+		{ .intdefault = DEFAULT_MONITORING_INTERVAL },
+		{ .intminval = 1 },
+		{},
+		{}
+	},
+	/* reconnect_attempts */
+	{
+		"reconnect_attempts",
+		CONFIG_INT,
+		{ .intptr = &config_file_options.reconnect_attempts },
+		{ .intdefault = DEFAULT_RECONNECTION_ATTEMPTS },
+		{ .intminval = 0 },
+		{},
+		{}
+	},
+	/* reconnect_interval */
+	{
+		"reconnect_interval",
+		CONFIG_INT,
+		{ .intptr = &config_file_options.reconnect_interval },
+		{ .intdefault = DEFAULT_RECONNECTION_INTERVAL },
+		{ .intminval = 0 },
+		{},
+		{}
+	},
+
+	/* monitoring_history */
+	{
+		"monitoring_history",
+		CONFIG_BOOL,
+		{ .boolptr = &config_file_options.monitoring_history },
+		{ .booldefault = DEFAULT_MONITORING_HISTORY },
+		{},
+		{},
+		{}
+	},
+	/* degraded_monitoring_timeout */
+	{
+		"degraded_monitoring_timeout",
+		CONFIG_INT,
+		{ .intptr = &config_file_options.degraded_monitoring_timeout },
+		{ .intdefault = DEFAULT_DEGRADED_MONITORING_TIMEOUT },
+		{ .intminval = -1 },
+		{},
+		{}
+	},
+	/* async_query_timeout */
+	{
+		"async_query_timeout",
+		CONFIG_INT,
+		{ .intptr = &config_file_options.async_query_timeout },
+		{ .intdefault = DEFAULT_ASYNC_QUERY_TIMEOUT },
+		{ .intminval = 0 },
+		{},
+		{}
+	},
+	/* primary_notification_timeout */
+	{
+		"primary_notification_timeout",
+		CONFIG_INT,
+		{ .intptr = &config_file_options.primary_notification_timeout },
+		{ .intdefault = DEFAULT_PRIMARY_NOTIFICATION_TIMEOUT },
+		{ .intminval = 0 },
+		{},
+		{}
+	},
+	/* repmgrd_standby_startup_timeout */
+	{
+		"repmgrd_standby_startup_timeout",
+		CONFIG_INT,
+		{ .intptr = &config_file_options.repmgrd_standby_startup_timeout },
+		{ .intdefault = DEFAULT_REPMGRD_STANDBY_STARTUP_TIMEOUT },
+		{ .intminval = 0 },
+		{},
+		{}
+	},
+	/* repmgrd_pid_file */
+	{
+		"repmgrd_pid_file",
+		CONFIG_STRING,
+		{ .strptr = config_file_options.repmgrd_pid_file },
+		{ .strdefault = "" },
+		{},
+		{ .strmaxlen = sizeof(config_file_options.repmgrd_pid_file) },
+		{ .postprocess_func = &repmgr_canonicalize_path }
+	},
+	/* repmgrd_exit_on_inactive_node */
+	{
+		"repmgrd_exit_on_inactive_node",
+		CONFIG_BOOL,
+		{ .boolptr = &config_file_options.repmgrd_exit_on_inactive_node},
+		{ .booldefault = DEFAULT_REPMGRD_EXIT_ON_INACTIVE_NODE },
+		{},
+		{},
+		{}
+	},
+	/* standby_disconnect_on_failover */
+	{
+		"standby_disconnect_on_failover",
+		CONFIG_BOOL,
+		{ .boolptr = &config_file_options.standby_disconnect_on_failover },
+		{ .booldefault = DEFAULT_STANDBY_DISCONNECT_ON_FAILOVER },
+		{},
+		{},
+		{}
+	},
+	/* sibling_nodes_disconnect_timeout */
+	{
+		"sibling_nodes_disconnect_timeout",
+		CONFIG_INT,
+		{ .intptr = &config_file_options.sibling_nodes_disconnect_timeout },
+		{ .intdefault = DEFAULT_SIBLING_NODES_DISCONNECT_TIMEOUT },
+		{ .intminval = 0 },
+		{},
+		{}
+	},
+	/* connection_check_type */
+	{
+		"connection_check_type",
+		CONFIG_CONNECTION_CHECK_TYPE,
+		{ .checktypeptr = &config_file_options.connection_check_type },
+		{ .checktypedefault = DEFAULT_CONNECTION_CHECK_TYPE },
+		{},
+		{},
+		{}
+	},
+	/* primary_visibility_consensus */
+	{
+		"primary_visibility_consensus",
+		CONFIG_BOOL,
+		{ .boolptr = &config_file_options.primary_visibility_consensus },
+		{ .booldefault = DEFAULT_PRIMARY_VISIBILITY_CONSENSUS },
+		{},
+		{},
+		{}
+	},
+	/* always_promote */
+	{
+		"always_promote",
+		CONFIG_BOOL,
+		{ .boolptr = &config_file_options.always_promote },
+		{ .booldefault = DEFAULT_ALWAYS_PROMOTE },
+		{},
+		{},
+		{}
+	},
+	/* failover_validation_command */
+	{
+		"failover_validation_command",
+		CONFIG_STRING,
+		{ .strptr = config_file_options.failover_validation_command },
+		{ .strdefault = "" },
+		{},
+		{ .strmaxlen = sizeof(config_file_options.failover_validation_command) },
+		{}
+	},
+	/* election_rerun_interval */
+	{
+		"election_rerun_interval",
+		CONFIG_INT,
+		{ .intptr = &config_file_options.election_rerun_interval },
+		{ .intdefault = DEFAULT_ELECTION_RERUN_INTERVAL },
+		{ .intminval = 1 },
+		{},
+		{}
+	},
+	/* child_nodes_check_interval */
+	{
+		"child_nodes_check_interval",
+		CONFIG_INT,
+		{ .intptr = &config_file_options.child_nodes_check_interval },
+		{ .intdefault = DEFAULT_CHILD_NODES_CHECK_INTERVAL },
+		{ .intminval = 1 },
+		{},
+		{}
+	},
+	/* child_nodes_disconnect_min_count */
+	{
+		"child_nodes_disconnect_min_count",
+		CONFIG_INT,
+		{ .intptr = &config_file_options.child_nodes_disconnect_min_count },
+		{ .intdefault = DEFAULT_CHILD_NODES_DISCONNECT_MIN_COUNT },
+		{ .intminval = -1 },
+		{},
+		{}
+	},
+	/* child_nodes_connected_min_count */
+	{
+		"child_nodes_connected_min_count",
+		CONFIG_INT,
+		{ .intptr = &config_file_options.child_nodes_connected_min_count },
+		{ .intdefault = DEFAULT_CHILD_NODES_CONNECTED_MIN_COUNT},
+		{ .intminval = -1 },
+		{},
+		{}
+	},
+	/* child_nodes_connected_include_witness */
+	{
+		"child_nodes_connected_include_witness",
+		CONFIG_BOOL,
+		{ .boolptr = &config_file_options.child_nodes_connected_include_witness },
+		{ .booldefault = DEFAULT_CHILD_NODES_CONNECTED_INCLUDE_WITNESS },
+		{},
+		{},
+		{}
+	},
+	/* child_nodes_disconnect_timeout */
+	{
+		"child_nodes_disconnect_timeout",
+		CONFIG_INT,
+		{ .intptr = &config_file_options.child_nodes_disconnect_timeout },
+		{ .intdefault = DEFAULT_CHILD_NODES_DISCONNECT_TIMEOUT },
+		{ .intminval = 0 },
+		{},
+		{}
+	},
+	/* child_nodes_disconnect_command */
+	{
+		"child_nodes_disconnect_command",
+		CONFIG_STRING,
+		{ .strptr = config_file_options.child_nodes_disconnect_command },
+		{ .strdefault = "" },
+		{},
+		{ .strmaxlen = sizeof(config_file_options.child_nodes_disconnect_command) },
+		{}
+	},
+	/* ================
+	 * service settings
+	 * ================
+	 */
+	/* pg_ctl_options */
+	{
+		"pg_ctl_options",
+		CONFIG_STRING,
+		{ .strptr = config_file_options.pg_ctl_options },
+		{ .strdefault = "" },
+		{},
+		{ .strmaxlen = sizeof(config_file_options.pg_ctl_options) },
+		{}
+	},
+	/* service_start_command */
+	{
+		"service_start_command",
+		CONFIG_STRING,
+		{ .strptr = config_file_options.service_start_command },
+		{ .strdefault = "" },
+		{},
+		{ .strmaxlen = sizeof(config_file_options.service_start_command) },
+		{}
+	},
+	/* service_stop_command */
+	{
+		"service_stop_command",
+		CONFIG_STRING,
+		{ .strptr = config_file_options.service_stop_command },
+		{ .strdefault = "" },
+		{},
+		{ .strmaxlen = sizeof(config_file_options.service_stop_command) },
+		{}
+	},
+	/* service_restart_command */
+	{
+		"service_restart_command",
+		CONFIG_STRING,
+		{ .strptr = config_file_options.service_restart_command },
+		{ .strdefault = "" },
+		{},
+		{ .strmaxlen = sizeof(config_file_options.service_restart_command) },
+		{}
+	},
+	/* service_reload_command */
+	{
+		"service_reload_command",
+		CONFIG_STRING,
+		{ .strptr = config_file_options.service_reload_command },
+		{ .strdefault = "" },
+		{},
+		{ .strmaxlen = sizeof(config_file_options.service_reload_command) },
+		{}
+	},
+	/* service_promote_command */
+	{
+		"service_promote_command",
+		CONFIG_STRING,
+		{ .strptr = config_file_options.service_promote_command },
+		{ .strdefault = "" },
+		{},
+		{ .strmaxlen = sizeof(config_file_options.service_promote_command) },
+		{}
+	},
+
+	/* ========================
+	 * repmgrd service settings
+	 * ========================
+	 */
+	/* repmgrd_service_start_command */
+	{
+		"repmgrd_service_start_command",
+		CONFIG_STRING,
+		{ .strptr = config_file_options.repmgrd_service_start_command },
+		{ .strdefault = "" },
+		{},
+		{ .strmaxlen = sizeof(config_file_options.repmgrd_service_start_command) },
+		{}
+	},
+	/* repmgrd_service_stop_command */
+	{
+		"repmgrd_service_stop_command",
+		CONFIG_STRING,
+		{ .strptr = config_file_options.repmgrd_service_stop_command },
+		{ .strdefault = "" },
+		{},
+		{ .strmaxlen = sizeof(config_file_options.repmgrd_service_stop_command) },
+		{}
+	},
+	/* ===========================
+	 * event notification settings
+	 * ===========================
+	 */
+	/* event_notification_command */
+	{
+		"event_notification_command",
+		CONFIG_STRING,
+		{ .strptr = config_file_options.event_notification_command },
+		{ .strdefault = "" },
+		{},
+		{ .strmaxlen = sizeof(config_file_options.event_notification_command) },
+		{}
+	},
+	{
+		"event_notifications",
+		CONFIG_EVENT_NOTIFICATION_LIST,
+		{ .notificationlistptr = &config_file_options.event_notifications },
+		{},
+		{},
+		{},
+		{}
+	},
+	/* ===============
+	 * barman settings
+	 * ===============
+	 */
+	/* barman_host */
+	{
+		"barman_host",
+		CONFIG_STRING,
+		{ .strptr = config_file_options.barman_host },
+		{ .strdefault = "" },
+		{},
+		{ .strmaxlen = sizeof(config_file_options.barman_host) },
+		{}
+	},
+	/* barman_server */
+	{
+		"barman_server",
+		CONFIG_STRING,
+		{ .strptr = config_file_options.barman_server },
+		{ .strdefault = "" },
+		{},
+		{ .strmaxlen = sizeof(config_file_options.barman_server) },
+		{}
+	},
+	/* barman_config */
+	{
+		"barman_config",
+		CONFIG_STRING,
+		{ .strptr = config_file_options.barman_config },
+		{ .strdefault = "" },
+		{},
+		{ .strmaxlen = sizeof(config_file_options.barman_config) },
+		{}
+	},
+	/* ==================
+	 * rsync/ssh settings
+	 * ==================
+	 */
+	/* rsync_options */
+	{
+		"rsync_options",
+		CONFIG_STRING,
+		{ .strptr = config_file_options.rsync_options },
+		{ .strdefault = "" },
+		{},
+		{ .strmaxlen = sizeof(config_file_options.rsync_options) },
+		{}
+	},
+	/* ssh_options */
+	{
+		"ssh_options",
+		CONFIG_STRING,
+		{ .strptr = config_file_options.ssh_options },
+		{ .strdefault = DEFAULT_SSH_OPTIONS },
+		{},
+		{ .strmaxlen = sizeof(config_file_options.ssh_options) },
+		{}
+	},
+	/* ==================================
+	 * undocumented experimental settings
+	 * ==================================
+	 */
+	/* reconnect_loop_sync */
+	{
+		"reconnect_loop_sync",
+		CONFIG_BOOL,
+		{ .boolptr = &config_file_options.reconnect_loop_sync },
+		{ .booldefault = false },
+		{},
+		{},
+		{}
+	},
+	/* ==========================
+	 * undocumented test settings
+	 * ==========================
+	 */
+	/* promote_delay */
+	{
+		"promote_delay",
+		CONFIG_INT,
+		{ .intptr = &config_file_options.promote_delay },
+		{ .intdefault = 0 },
+		{ .intminval = 1 },
+		{},
+		{}
+	},
+	/* failover_delay */
+	{
+		"failover_delay",
+		CONFIG_INT,
+		{ .intptr = &config_file_options.failover_delay },
+		{ .intdefault = 0 },
+		{ .intminval = 1 },
+		{},
+		{}
+	},
+	{
+		"connection_check_query",
+		CONFIG_STRING,
+		{ .strptr = config_file_options.connection_check_query },
+		{ .strdefault = "SELECT 1" },
+		{},
+		{ .strmaxlen = sizeof(config_file_options.connection_check_query) },
+		{}
+	},
+	/* End-of-list marker */
+	{
+		NULL, CONFIG_INT, {}, {}, {}, {}, {}
+	}
+};
+

configfile-scan.l

@@ -5,6 +5,8 @@
 %{
 
 #include <setjmp.h>
+#include <sys/stat.h>
+#include <dirent.h>
 
 #include "repmgr.h"
 #include "configfile.h"
@@ -38,7 +40,13 @@ static sigjmp_buf *CONF_flex_fatal_jmp;
 static char *CONF_scanstr(const char *s);
 static int	CONF_flex_fatal(const char *msg);
 
-static bool ProcessConfigFile(FILE *fp, const char *config_file, KeyValueList *contents, t_configuration_options *options, ItemList *error_list, ItemList *warning_list);
+static bool ProcessConfigFile(const char *base_dir, const char *config_file, const char *calling_file, bool strict, int depth, KeyValueList *contents, ItemList *error_list, ItemList *warning_list);
+
+static bool ProcessConfigFp(FILE *fp, const char *config_file, const char *calling_file, int depth, const char *base_dir, KeyValueList *contents, ItemList *error_list, ItemList *warning_list);
+
+static bool ProcessConfigDirectory(const char *base_dir, const char *includedir, const char *calling_file, int depth, KeyValueList *contents, ItemList *error_list, ItemList *warning_list);
+
+static char *AbsoluteConfigLocation(const char *base_dir, const char *location, const char *calling_file);
 
 %}
 
@@ -90,20 +98,91 @@ STRING			\'([^'\\\n]|\\.|\'\')*\'
 
 %%
 
-extern bool
-ProcessRepmgrConfigFile(FILE *fp, const char *config_file, t_configuration_options *options, ItemList *error_list, ItemList *warning_list)
-{
-	return ProcessConfigFile(fp, config_file, NULL, options, error_list, warning_list);
-}
 
 extern bool
-ProcessPostgresConfigFile(FILE *fp, const char *config_file, KeyValueList *contents, ItemList *error_list, ItemList *warning_list)
+ProcessRepmgrConfigFile(const char *config_file, const char *base_dir, ItemList *error_list, ItemList *warning_list)
 {
-	return ProcessConfigFile(fp, config_file, contents, NULL, error_list, warning_list);
+	return ProcessConfigFile(base_dir, config_file, NULL, true, 0, NULL, error_list, warning_list);
+}
+
+
+extern bool
+ProcessPostgresConfigFile(const char *config_file, const char *base_dir, bool strict, KeyValueList *contents, ItemList *error_list, ItemList *warning_list)
+{
+	return ProcessConfigFile(base_dir, config_file, NULL, strict, 0, contents, error_list, warning_list);
 }
 
 static bool
-ProcessConfigFile(FILE *fp, const char *config_file, KeyValueList *contents, t_configuration_options *options, ItemList *error_list, ItemList *warning_list)
+ProcessConfigFile(const char *base_dir, const char *config_file, const char *calling_file, bool strict, int depth, KeyValueList *contents, ItemList *error_list, ItemList *warning_list)
+{
+	char	   *abs_path;
+	bool		success = true;
+	FILE	   *fp;
+
+	/*
+	 * Reject file name that is all-blank (including empty), as that leads to
+	 * confusion --- we'd try to read the containing directory as a file.
+	 */
+	if (strspn(config_file, " \t\r\n") == strlen(config_file))
+	{
+		return false;
+	}
+
+	/*
+	 * Reject too-deep include nesting depth.  This is just a safety check to
+	 * avoid dumping core due to stack overflow if an include file loops back
+	 * to itself.  The maximum nesting depth is pretty arbitrary.
+	 */
+	if (depth > 10)
+	{
+		item_list_append_format(error_list,
+								_("could not open configuration file \"%s\": maximum nesting depth exceeded"),
+								config_file);
+		return false;
+	}
+
+	abs_path = AbsoluteConfigLocation(base_dir, config_file, calling_file);
+
+	/* Reject direct recursion */
+	if (calling_file && strcmp(abs_path, calling_file) == 0)
+	{
+		item_list_append_format(error_list,
+								_("configuration file recursion in \"%s\""),
+								calling_file);
+		pfree(abs_path);
+		return false;
+	}
+
+	fp = fopen(abs_path, "r");
+	if (!fp)
+	{
+		if (strict == false)
+		{
+			item_list_append_format(error_list,
+									"skipping configuration file \"%s\"",
+									abs_path);
+		}
+		else
+		{
+			item_list_append_format(error_list,
+									"could not open configuration file \"%s\": %s",
+									abs_path,
+									strerror(errno));
+			success = false;
+		}
+	}
+	else
+	{
+		success = ProcessConfigFp(fp, abs_path, calling_file, depth + 1, base_dir, contents, error_list, warning_list);
+	}
+
+	free(abs_path);
+
+	return success;
+}
+
+static bool
+ProcessConfigFp(FILE *fp, const char *config_file, const char *calling_file, int depth, const char *base_dir, KeyValueList *contents, ItemList *error_list, ItemList *warning_list)
 {
 	volatile bool OK = true;
 	volatile YY_BUFFER_STATE lex_buffer = NULL;
@@ -179,22 +258,62 @@ ProcessConfigFile(FILE *fp, const char *config_file, KeyValueList *contents, t_c
 			ConfigFileLineno++;
 		}
 
-		/* OK, process the option name and value */
-		if (contents != NULL)
+		/* Handle include files */
+		if (base_dir != NULL && strcasecmp(opt_name, "include_dir") == 0)
 		{
-			key_value_list_replace_or_set(contents,
-										  opt_name,
-										  opt_value);
+			/*
+			 * An include_dir directive isn't a variable and should be
+			 * processed immediately.
+			 */
+			if (!ProcessConfigDirectory(base_dir, opt_value, config_file,
+										depth + 1, contents,
+									    error_list, warning_list))
+				OK = false;
+			yy_switch_to_buffer(lex_buffer);
+			pfree(opt_name);
+			pfree(opt_value);
+		}
+		else if (base_dir != NULL && strcasecmp(opt_name, "include_if_exists") == 0)
+		{
+			if (!ProcessConfigFile(base_dir, opt_value, config_file,
+								   false, depth + 1, contents,
+								   error_list, warning_list))
+				OK = false;
+
+			yy_switch_to_buffer(lex_buffer);
+			pfree(opt_name);
+			pfree(opt_value);
+		}
+		else if (base_dir != NULL && strcasecmp(opt_name, "include") == 0)
+		{
+			if (!ProcessConfigFile(base_dir, opt_value, config_file,
+								   true, depth + 1, contents,
+								   error_list, warning_list))
+				OK = false;
+
+			yy_switch_to_buffer(lex_buffer);
+			pfree(opt_name);
+			pfree(opt_value);
+		}
+		else
+		{
+			/* OK, process the option name and value */
+			if (contents != NULL)
+			{
+				key_value_list_replace_or_set(contents,
+											  opt_name,
+											  opt_value);
+			}
+			else
+			{
+				parse_configuration_item(error_list,
+										 warning_list,
+										 opt_name,
+										 opt_value);
+			}
+
 		}
 
-		if (options != NULL)
-		{
-			parse_configuration_item(options,
-									 error_list,
-									 warning_list,
-									 opt_name,
-									 opt_value);
-		}
 
 		/* break out of loop if read EOF, else loop for next line */
 		if (token == 0)
@@ -253,6 +372,132 @@ cleanup:
 	return OK;
 }
 
+/*
+ * Read and parse all config files in a subdirectory in alphabetical order
+ *
+ * includedir is the absolute or relative path to the subdirectory to scan.
+ *
+ * See ProcessConfigFp for further details.
+ */
+static bool
+ProcessConfigDirectory(const char *base_dir, const char *includedir, const char *calling_file, int depth, KeyValueList *contents, ItemList *error_list, ItemList *warning_list)
+{
+	char	   *directory;
+	DIR		   *d;
+	struct dirent *de;
+	char	  **filenames;
+	int			num_filenames;
+	int			size_filenames;
+	bool		status;
+
+	/*
+	 * Reject directory name that is all-blank (including empty), as that
+	 * leads to confusion --- we'd read the containing directory, typically
+	 * resulting in recursive inclusion of the same file(s).
+	 */
+	if (strspn(includedir, " \t\r\n") == strlen(includedir))
+	{
+		item_list_append_format(error_list,
+								_("empty configuration directory name: \"%s\""),
+								includedir);
+
+		return false;
+	}
+
+	directory = AbsoluteConfigLocation(base_dir, includedir, calling_file);
+	d = opendir(directory);
+	if (d == NULL)
+	{
+		item_list_append_format(error_list,
+								_("could not open configuration directory \"%s\": %s"),
+								directory,
+								strerror(errno));
+		status = false;
+		goto cleanup;
+	}
+
+	/*
+	 * Read the directory and put the filenames in an array, so we can sort
+	 * them prior to processing the contents.
+	 */
+	size_filenames = 32;
+	filenames = (char **) palloc(size_filenames * sizeof(char *));
+	num_filenames = 0;
+
+	while ((de = readdir(d)) != NULL)
+	{
+		struct stat st;
+		char		filename[MAXPGPATH];
+
+		/*
+		 * Only parse files with names ending in ".conf".  Explicitly reject
+		 * files starting with ".".  This excludes things like "." and "..",
+		 * as well as typical hidden files, backup files, and editor debris.
+		 */
+		if (strlen(de->d_name) < 6)
+			continue;
+		if (de->d_name[0] == '.')
+			continue;
+		if (strcmp(de->d_name + strlen(de->d_name) - 5, ".conf") != 0)
+			continue;
+
+		join_path_components(filename, directory, de->d_name);
+		canonicalize_path(filename);
+		if (stat(filename, &st) == 0)
+		{
+			if (!S_ISDIR(st.st_mode))
+			{
+				/* Add file to array, increasing its size in blocks of 32 */
+				if (num_filenames >= size_filenames)
+				{
+					size_filenames += 32;
+					filenames = (char **) repalloc(filenames,
+											size_filenames * sizeof(char *));
+				}
+				filenames[num_filenames] = pstrdup(filename);
+				num_filenames++;
+			}
+		}
+		else
+		{
+			/*
+			 * stat does not care about permissions, so the most likely reason
+			 * a file can't be accessed now is if it was removed between the
+			 * directory listing and now.
+			 */
+			item_list_append_format(error_list,
+									_("could not stat file \"%s\": %s"),
+									filename, strerror(errno));
+			status = false;
+			goto cleanup;
+		}
+	}
+
+	if (num_filenames > 0)
+	{
+		int			i;
+
+		qsort(filenames, num_filenames, sizeof(char *), pg_qsort_strcmp);
+		for (i = 0; i < num_filenames; i++)
+		{
+			if (!ProcessConfigFile(base_dir, filenames[i], calling_file,
+								   true, depth, contents,
+								   error_list, warning_list))
+			{
+				status = false;
+				goto cleanup;
+			}
+		}
+	}
+	status = true;
+
+
+cleanup:
+	if (d)
+		closedir(d);
+	pfree(directory);
+	return status;
+}
 
 /*
  *		scanstr
@@ -348,6 +593,39 @@ CONF_scanstr(const char *s)
 	return newStr;
 }
 
+/*
+ * Given a configuration file or directory location that may be a relative
+ * path, return an absolute one.  We consider the location to be relative to
+ * the directory holding the calling file, or to DataDir if no calling file.
+ */
+static char *
+AbsoluteConfigLocation(const char *base_dir, const char *location, const char *calling_file)
+{
+	char		abs_path[MAXPGPATH];
+
+	if (is_absolute_path(location))
+		return strdup(location);
+
+    if (calling_file != NULL)
+	{
+		strlcpy(abs_path, calling_file, sizeof(abs_path));
+		get_parent_directory(abs_path);
+		join_path_components(abs_path, abs_path, location);
+		canonicalize_path(abs_path);
+	}
+	else if (base_dir != NULL)
+	{
+		join_path_components(abs_path, base_dir, location);
+		canonicalize_path(abs_path);
+	}
+	else
+	{
+		strlcpy(abs_path, location, sizeof(abs_path));
+	}
+
+	return strdup(abs_path);
+}
+
 
 /*
  * Flex fatal errors bring us here.  Stash the error message and jump back to

configfile.h

@@ -1,7 +1,7 @@
 /*
  * configfile.h
  *
- * Copyright (c) 2ndQuadrant, 2010-2019
+ * Copyright (c) EnterpriseDB Corporation, 2010-2021
  *
  *
  * This program is free software: you can redistribute it and/or modify
@@ -29,7 +29,7 @@
 #define TARGET_TIMELINE_LATEST 0
 
 /*
- * This is defined src/include/utils.h, however it's not practical
+ * This is defined in src/include/utils.h, however it's not practical
  * to include that from a frontend application.
  */
 #define PG_AUTOCONF_FILENAME "postgresql.auto.conf"
@@ -50,6 +50,11 @@ typedef enum
 	CHECK_CONNECTION
 } ConnectionCheckType;
 
+typedef enum
+{
+	REPLICATION_TYPE_PHYSICAL
+} ReplicationType;
+
 typedef struct EventNotificationListCell
 {
 	struct EventNotificationListCell *next;
@@ -78,6 +83,58 @@ typedef struct TablespaceList
 } TablespaceList;
 
 
+typedef enum
+{
+	CONFIG_BOOL,
+	CONFIG_INT,
+	CONFIG_STRING,
+	CONFIG_FAILOVER_MODE,
+	CONFIG_CONNECTION_CHECK_TYPE,
+	CONFIG_EVENT_NOTIFICATION_LIST,
+	CONFIG_TABLESPACE_MAPPING,
+    CONFIG_REPLICATION_TYPE
+} ConfigItemType;
+
+
+typedef struct ConfigFileSetting
+{
+	const char	   *name;
+	ConfigItemType  type;
+    union
+    {
+        int		   *intptr;
+        char	   *strptr;
+		bool	   *boolptr;
+		failover_mode_opt *failovermodeptr;
+		ConnectionCheckType *checktypeptr;
+		EventNotificationList *notificationlistptr;
+		TablespaceList *tablespacemappingptr;
+		ReplicationType *replicationtypeptr;
+	} val;
+	union {
+		int			intdefault;
+		const char *strdefault;
+		bool		booldefault;
+		failover_mode_opt failovermodedefault;
+		ConnectionCheckType checktypedefault;
+		ReplicationType replicationtypedefault;
+	} defval;
+	union {
+		int				intminval;
+	} minval;
+	union {
+		int				strmaxlen;
+	} maxval;
+	struct {
+		void (*process_func)(const char *, const char *, char *, ItemList *errors);
+		void (*postprocess_func)(const char *, const char *, char *, ItemList *errors);
+		bool	   *providedptr;
+	} process;
+} ConfigFileSetting;
+
+/* Declare the main configfile structure for client applications */
+extern ConfigFileSetting config_file_settings[];
+
 typedef struct
 {
 	/* node information */
@@ -89,7 +146,7 @@ typedef struct
 	char		config_directory[MAXPGPATH];
 	char		pg_bindir[MAXPGPATH];
 	char		repmgr_bindir[MAXPGPATH];
-	int			replication_type;
+	ReplicationType	replication_type;
 
 	/* log settings */
 	char		log_level[MAXLEN];
@@ -115,6 +172,7 @@ typedef struct
 	/* standby follow settings */
 	int			primary_follow_timeout;
 	int			standby_follow_timeout;
+	bool		standby_follow_restart;
 
 	/* standby switchover settings */
 	int			shutdown_check_timeout;
@@ -148,10 +206,12 @@ typedef struct
 	int			primary_notification_timeout;
 	int			repmgrd_standby_startup_timeout;
 	char		repmgrd_pid_file[MAXPGPATH];
+	bool		repmgrd_exit_on_inactive_node;
 	bool		standby_disconnect_on_failover;
 	int			sibling_nodes_disconnect_timeout;
 	ConnectionCheckType connection_check_type;
 	bool		primary_visibility_consensus;
+	bool		always_promote;
 	char		failover_validation_command[MAXPGPATH];
 	int			election_rerun_interval;
 	int			child_nodes_check_interval;
@@ -161,10 +221,6 @@ typedef struct
 	int			child_nodes_disconnect_timeout;
 	char		child_nodes_disconnect_command[MAXPGPATH];
 
-	/* BDR settings */
-	bool		bdr_local_monitoring_only;
-	bool		bdr_recovery_timeout;
-
 	/* service settings */
 	char		pg_ctl_options[MAXLEN];
 	char		service_start_command[MAXPGPATH];
@@ -191,79 +247,35 @@ typedef struct
 	char		rsync_options[MAXLEN];
 	char		ssh_options[MAXLEN];
 
-	/* undocumented test settings */
+	/*
+	 * undocumented settings
+	 *
+	 * These settings are for testing or experimental features
+	 * and may be changed without notice.
+	 */
+
+	/* experimental settings */
+	bool		reconnect_loop_sync;
+
+	/* test settings */
 	int			promote_delay;
+	int			failover_delay;
+	char		connection_check_query[MAXLEN];
 } t_configuration_options;
 
-/*
- * The following will initialize the structure with a minimal set of options;
- * actual defaults are set in parse_config() before parsing the configuration file
- */
-
-#define T_CONFIGURATION_OPTIONS_INITIALIZER { \
-		/* node information */ \
-		UNKNOWN_NODE_ID, "", "", "", "", "", "", "", REPLICATION_TYPE_PHYSICAL,	\
-		/* log settings */ \
-		"", "", "", DEFAULT_LOG_STATUS_INTERVAL, \
-		/* standby clone settings */ \
-		false, "", "", { NULL, NULL }, "", false, "", false, "", \
-		/* standby promote settings */ \
-		DEFAULT_PROMOTE_CHECK_TIMEOUT, DEFAULT_PROMOTE_CHECK_INTERVAL, \
-		/* standby follow settings */ \
-		DEFAULT_PRIMARY_FOLLOW_TIMEOUT,	\
-		DEFAULT_STANDBY_FOLLOW_TIMEOUT,	\
-		/* standby switchover settings */ \
-		DEFAULT_SHUTDOWN_CHECK_TIMEOUT, \
-		DEFAULT_STANDBY_RECONNECT_TIMEOUT, \
-		DEFAULT_WAL_RECEIVE_CHECK_TIMEOUT, \
-		/* node rejoin settings */ \
-		DEFAULT_NODE_REJOIN_TIMEOUT, \
-		/* node check settings */ \
-		DEFAULT_ARCHIVE_READY_WARNING, DEFAULT_ARCHIVE_READY_CRITICAL, \
-		DEFAULT_REPLICATION_LAG_WARNING, DEFAULT_REPLICATION_LAG_CRITICAL, \
-		/* witness settings */ \
-		DEFAULT_WITNESS_SYNC_INTERVAL, \
-		/* repmgrd settings */ \
-		FAILOVER_MANUAL, DEFAULT_LOCATION, DEFAULT_PRIORITY, "", "", \
-		DEFAULT_MONITORING_INTERVAL, \
-		DEFAULT_RECONNECTION_ATTEMPTS, \
-        DEFAULT_RECONNECTION_INTERVAL, \
-        false, -1, \
-		DEFAULT_ASYNC_QUERY_TIMEOUT, \
-		DEFAULT_PRIMARY_NOTIFICATION_TIMEOUT, \
-		-1, "", false, DEFAULT_SIBLING_NODES_DISCONNECT_TIMEOUT, \
-		CHECK_PING, true, "", DEFAULT_ELECTION_RERUN_INTERVAL, \
-		DEFAULT_CHILD_NODES_CHECK_INTERVAL, \
-		DEFAULT_CHILD_NODES_DISCONNECT_MIN_COUNT, \
-		DEFAULT_CHILD_NODES_CONNECTED_MIN_COUNT, \
-		DEFAULT_CHILD_NODES_CONNECTED_INCLUDE_WITNESS, \
-		DEFAULT_CHILD_NODES_DISCONNECT_TIMEOUT, "", \
-		/* BDR settings */ \
-		false, DEFAULT_BDR_RECOVERY_TIMEOUT, \
-		/* service settings */ \
-		"", "", "", "", "", "", \
-		/* repmgrd service settings */ \
-		"", "",  \
-		/* event notification settings */ \
-		"", "", { NULL, NULL }, \
-		/* barman settings */ \
-		"", "", "",	 \
-		/* rsync/ssh settings */ \
-		 "", "", \
-		/* undocumented test settings */ \
-		0 \
- }
-
 
+/* Declare the main configfile structure for client applications */
+extern t_configuration_options config_file_options;
 
 typedef struct
 {
 	char		slot[MAXLEN];
 	char		wal_method[MAXLEN];
+	char		waldir[MAXPGPATH];
 	bool		no_slot;		/* from PostgreSQL 10 */
 } t_basebackup_options;
 
-#define T_BASEBACKUP_OPTIONS_INITIALIZER { "", "", false }
+#define T_BASEBACKUP_OPTIONS_INITIALIZER { "", "", "", false }
 
 
 typedef enum
@@ -320,10 +332,11 @@ typedef struct
 void		set_progname(const char *argv0);
 const char *progname(void);
 
-void		load_config(const char *config_file, bool verbose, bool terse, t_configuration_options *options, char *argv0);
-bool		reload_config(t_configuration_options *orig_options, t_server_type server_type);
+void		load_config(const char *config_file, bool verbose, bool terse, char *argv0);
+bool		reload_config(t_server_type server_type);
+void		dump_config(void);
 
-void		parse_configuration_item(t_configuration_options *options, ItemList *error_list, ItemList *warning_list, const char *name, const char *value);
+void		parse_configuration_item(ItemList *error_list, ItemList *warning_list, const char *name, const char *value);
 
 bool		parse_recovery_conf(const char *data_dir, t_recovery_conf *conf);
 
@@ -336,6 +349,9 @@ int repmgr_atoi(const char *s,
 			ItemList *error_list,
 			int minval);
 
+void parse_time_unit_parameter(const char *name, const char *value, char *dest, ItemList *errors);
+void repmgr_canonicalize_path(const char *name, const char *value, char *config_item, ItemList *errors);
+
 bool parse_pg_basebackup_options(const char *pg_basebackup_options,
 							t_basebackup_options *backup_options,
 							int server_version_num,
@@ -343,17 +359,21 @@ bool parse_pg_basebackup_options(const char *pg_basebackup_options,
 
 int parse_output_to_argv(const char *string, char ***argv_array);
 void free_parsed_argv(char ***argv_array);
-
+const char *format_failover_mode(failover_mode_opt failover);
 
 /* called by repmgr-client and repmgrd */
 void		exit_with_cli_errors(ItemList *error_list, const char *repmgr_command);
+
 void		print_item_list(ItemList *item_list);
+const char *print_replication_type(ReplicationType type);
 const char *print_connection_check_type(ConnectionCheckType type);
+char 	   *print_event_notification_list(EventNotificationList *list);
+char 	   *print_tablespace_mapping(TablespaceList *tablespacemappingptr);
 
 extern bool modify_auto_conf(const char *data_dir, KeyValueList *items);
 
-extern bool ProcessRepmgrConfigFile(FILE *fp, const char *config_file, t_configuration_options *options, ItemList *error_list, ItemList *warning_list);
+extern bool ProcessRepmgrConfigFile(const char *config_file, const char *base_dir, ItemList *error_list, ItemList *warning_list);
 
-extern bool ProcessPostgresConfigFile(FILE *fp, const char *config_file, KeyValueList *contents, ItemList *error_list, ItemList *warning_list);
+extern bool ProcessPostgresConfigFile(const char *config_file, const char *base_dir, bool strict, KeyValueList *contents, ItemList *error_list, ItemList *warning_list);
 
 #endif							/* _REPMGR_CONFIGFILE_H_ */

configure

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for repmgr 5.0.
+# Generated by GNU Autoconf 2.69 for repmgr 5.4.0.
 #
 # Report bugs to <repmgr@googlegroups.com>.
 #
@@ -11,7 +11,7 @@
 # This configure script is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
 #
-# Copyright (c) 2010-2019, 2ndQuadrant Ltd.
+# Copyright (c) 2010-2021, EnterpriseDB Corporation
 ## -------------------- ##
 ## M4sh Initialization. ##
 ## -------------------- ##
@@ -582,8 +582,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='repmgr'
 PACKAGE_TARNAME='repmgr'
-PACKAGE_VERSION='5.0'
-PACKAGE_STRING='repmgr 5.0'
+PACKAGE_VERSION='5.4.0'
+PACKAGE_STRING='repmgr 5.4.0'
 PACKAGE_BUGREPORT='repmgr@googlegroups.com'
 PACKAGE_URL='https://repmgr.org/'
 
@@ -1181,7 +1181,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures repmgr 5.0 to adapt to many kinds of systems.
+\`configure' configures repmgr 5.4.0 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1242,7 +1242,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of repmgr 5.0:";;
+     short | recursive ) echo "Configuration of repmgr 5.4.0:";;
    esac
   cat <<\_ACEOF
 
@@ -1316,14 +1316,14 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-repmgr configure 5.0
+repmgr configure 5.4.0
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 
-Copyright (c) 2010-2019, 2ndQuadrant Ltd.
+Copyright (c) 2010-2021, EnterpriseDB Corporation
 _ACEOF
   exit
 fi
@@ -1335,7 +1335,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by repmgr $as_me 5.0, which was
+It was created by repmgr $as_me 5.4.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -1811,11 +1811,11 @@ fi
 pgac_pg_config_version=$($PG_CONFIG --version 2>/dev/null)
 
 major_version_num=$(echo "$pgac_pg_config_version"|
-              $SED -e 's/^PostgreSQL \([0-9]\{1,2\}\).*$/\1/')
+              $SED -e 's/^[^0-9]\+ \([0-9]\{1,2\}\).*$/\1/')
 
 if test "$major_version_num" -lt '10'; then
     version_num=$(echo "$pgac_pg_config_version"|
-                $SED -e 's/^PostgreSQL \([0-9]*\)\.\([0-9]*\)\([a-zA-Z0-9.]*\)$/\1.\2/')
+                $SED -e 's/^[^0-9]\+ \([0-9]*\)\.\([0-9]*\)\([a-zA-Z0-9.]*\)$/\1.\2/')
 
     if test -z "$version_num"; then
         as_fn_error $? "could not detect the PostgreSQL version, wrong or broken pg_config?" "$LINENO" 5
@@ -1824,12 +1824,12 @@ if test "$major_version_num" -lt '10'; then
     version_num_int=$(echo "$version_num"|
                     $SED -e 's/^\([0-9]*\)\.\([0-9]*\)$/\1\2/')
 
-    if test "$version_num_int" -lt '93'; then
+    if test "$version_num_int" -lt '94'; then
         as_fn_error $? "repmgr is not compatible with detected PostgreSQL version: $version_num" "$LINENO" 5
     fi
 else
     version_num=$(echo "$pgac_pg_config_version"|
-                $SED -e 's/^PostgreSQL \(.\+\)$/\1/')
+                $SED -e 's/^[^0-9]\+ \(.\+\)$/\1/')
 
     if test -z "$version_num"; then
         as_fn_error $? "could not detect the PostgreSQL version, wrong or broken pg_config?" "$LINENO" 5
@@ -2487,7 +2487,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by repmgr $as_me 5.0, which was
+This file was extended by repmgr $as_me 5.4.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -2550,7 +2550,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-repmgr config.status 5.0
+repmgr config.status 5.4.0
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 

configure.in

@@ -1,6 +1,6 @@
-AC_INIT([repmgr], [5.0], [repmgr@googlegroups.com], [repmgr], [https://repmgr.org/])
+AC_INIT([repmgr], [5.4.0], [repmgr@googlegroups.com], [repmgr], [https://repmgr.org/])
 
-AC_COPYRIGHT([Copyright (c) 2010-2019, 2ndQuadrant Ltd.])
+AC_COPYRIGHT([Copyright (c) 2010-2021, EnterpriseDB Corporation])
 
 AC_CONFIG_HEADER(config.h)
 
@@ -19,11 +19,11 @@ fi
 pgac_pg_config_version=$($PG_CONFIG --version 2>/dev/null)
 
 major_version_num=$(echo "$pgac_pg_config_version"|
-              $SED -e 's/^PostgreSQL \([[0-9]]\{1,2\}\).*$/\1/')
+              $SED -e 's/^[[^0-9]]\+ \([[0-9]]\{1,2\}\).*$/\1/')
 
 if test "$major_version_num" -lt '10'; then
     version_num=$(echo "$pgac_pg_config_version"|
-                $SED -e 's/^PostgreSQL \([[0-9]]*\)\.\([[0-9]]*\)\([[a-zA-Z0-9.]]*\)$/\1.\2/')
+                $SED -e 's/^[[^0-9]]\+ \([[0-9]]*\)\.\([[0-9]]*\)\([[a-zA-Z0-9.]]*\)$/\1.\2/')
 
     if test -z "$version_num"; then
         AC_MSG_ERROR([could not detect the PostgreSQL version, wrong or broken pg_config?])
@@ -32,12 +32,12 @@ if test "$major_version_num" -lt '10'; then
     version_num_int=$(echo "$version_num"|
                     $SED -e 's/^\([[0-9]]*\)\.\([[0-9]]*\)$/\1\2/')
 
-    if test "$version_num_int" -lt '93'; then
+    if test "$version_num_int" -lt '94'; then
         AC_MSG_ERROR([repmgr is not compatible with detected PostgreSQL version: $version_num])
     fi
 else
     version_num=$(echo "$pgac_pg_config_version"|
-                $SED -e 's/^PostgreSQL \(.\+\)$/\1/')
+                $SED -e 's/^[[^0-9]]\+ \(.\+\)$/\1/')
 
     if test -z "$version_num"; then
         AC_MSG_ERROR([could not detect the PostgreSQL version, wrong or broken pg_config?])

controldata.c

@@ -2,11 +2,11 @@
  * controldata.c - functions for reading the pg_control file
  *
  * The functions provided here enable repmgr to read a pg_control file
- * in a version-indepent way, even if the PostgreSQL instance is not
+ * in a version-independent way, even if the PostgreSQL instance is not
  * running. For that reason we can't use on the pg_control_*() functions
  * provided in PostgreSQL 9.6 and later.
  *
- * Copyright (c) 2ndQuadrant, 2010-2019
+ * Copyright (c) EnterpriseDB Corporation, 2010-2021
  *
  * Portions Copyright (c) 1996-2016, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
@@ -90,7 +90,9 @@ get_system_identifier(const char *data_directory)
 	uint64		system_identifier = UNKNOWN_SYSTEM_IDENTIFIER;
 
 	control_file_info = get_controlfile(data_directory);
-	system_identifier = control_file_info->system_identifier;
+
+	if (control_file_info->control_file_processed == true)
+		system_identifier = control_file_info->system_identifier;
 
 	pfree(control_file_info);
 
@@ -98,19 +100,21 @@ get_system_identifier(const char *data_directory)
 }
 
 
-DBState
-get_db_state(const char *data_directory)
+bool
+get_db_state(const char *data_directory, DBState *state)
 {
 	ControlFileInfo *control_file_info = NULL;
-	DBState		state;
+	bool control_file_processed;
 
 	control_file_info = get_controlfile(data_directory);
+	control_file_processed = control_file_info->control_file_processed;
 
-	state = control_file_info->state;
+	if (control_file_processed == true)
+		*state = control_file_info->state;
 
 	pfree(control_file_info);
 
-	return state;
+	return control_file_processed;
 }
 
 
@@ -122,7 +126,8 @@ get_latest_checkpoint_location(const char *data_directory)
 
 	control_file_info = get_controlfile(data_directory);
 
-	checkPoint = control_file_info->checkPoint;
+	if (control_file_info->control_file_processed == true)
+		checkPoint = control_file_info->checkPoint;
 
 	pfree(control_file_info);
 
@@ -134,11 +139,12 @@ int
 get_data_checksum_version(const char *data_directory)
 {
 	ControlFileInfo *control_file_info = NULL;
-	int			data_checksum_version = -1;
+	int			data_checksum_version = UNKNOWN_DATA_CHECKSUM_VERSION;
 
 	control_file_info = get_controlfile(data_directory);
 
-	data_checksum_version = (int) control_file_info->data_checksum_version;
+	if (control_file_info->control_file_processed == true)
+		data_checksum_version = (int) control_file_info->data_checksum_version;
 
 	pfree(control_file_info);
 
@@ -277,8 +283,19 @@ get_controlfile(const char *DataDir)
 		return control_file_info;
 	}
 
-
-	if (version_num >= 90500)
+	if (version_num >= 120000)
+	{
+#if PG_ACTUAL_VERSION_NUM >= 120000
+		expected_size = sizeof(ControlFileData12);
+		ControlFileDataPtr = palloc0(expected_size);
+#endif
+	}
+	else if (version_num >= 110000)
+	{
+		expected_size = sizeof(ControlFileData11);
+		ControlFileDataPtr = palloc0(expected_size);
+	}
+	else if (version_num >= 90500)
 	{
 		expected_size = sizeof(ControlFileData95);
 		ControlFileDataPtr = palloc0(expected_size);
@@ -288,12 +305,6 @@ get_controlfile(const char *DataDir)
 		expected_size = sizeof(ControlFileData94);
 		ControlFileDataPtr = palloc0(expected_size);
 	}
-	else if (version_num >= 90300)
-	{
-		expected_size = sizeof(ControlFileData93);
-		ControlFileDataPtr = palloc0(expected_size);
-	}
-
 
 	if (read(fd, ControlFileDataPtr, expected_size) != expected_size)
 	{
@@ -322,7 +333,7 @@ get_controlfile(const char *DataDir)
 		control_file_info->minRecoveryPointTLI = ptr->minRecoveryPointTLI;
 		control_file_info->minRecoveryPoint = ptr->minRecoveryPoint;
 #else
-		fprintf(stderr, "ERROR: please use a repmgr version built for PostgreSQL 12\n");
+		fprintf(stderr, "ERROR: please use a repmgr version built for PostgreSQL 12 or later\n");
 		exit(ERR_BAD_CONFIG);
 #endif
 	}
@@ -359,17 +370,6 @@ get_controlfile(const char *DataDir)
 		control_file_info->minRecoveryPointTLI = ptr->minRecoveryPointTLI;
 		control_file_info->minRecoveryPoint = ptr->minRecoveryPoint;
 	}
-	else if (version_num >= 90300)
-	{
-		ControlFileData93 *ptr = (struct ControlFileData93 *)ControlFileDataPtr;
-		control_file_info->system_identifier = ptr->system_identifier;
-		control_file_info->state = ptr->state;
-		control_file_info->checkPoint = ptr->checkPoint;
-		control_file_info->data_checksum_version = ptr->data_checksum_version;
-		control_file_info->timeline = ptr->checkPointCopy.ThisTimeLineID;
-		control_file_info->minRecoveryPointTLI = ptr->minRecoveryPointTLI;
-		control_file_info->minRecoveryPoint = ptr->minRecoveryPoint;
-	}
 
 	pfree(ControlFileDataPtr);
 

controldata.h

@@ -1,6 +1,6 @@
 /*
  * controldata.h
- * Copyright (c) 2ndQuadrant, 2010-2019
+ * Copyright (c) EnterpriseDB Corporation, 2010-2021
  *
  * Portions Copyright (c) 1996-2016, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
@@ -31,9 +31,7 @@ typedef struct
 } ControlFileInfo;
 
 
-
-/* Same for 9.3, 9.4 */
-typedef struct CheckPoint93
+typedef struct CheckPoint94
 {
 	XLogRecPtr	redo;			/* next RecPtr available when we began to
 								 * create CheckPoint (i.e. REDO start point) */
@@ -53,7 +51,7 @@ typedef struct CheckPoint93
 	pg_time_t	time;			/* time stamp of checkpoint */
 
 	TransactionId oldestActiveXid;
-} CheckPoint93;
+} CheckPoint94;
 
 
 /* Same for 9.5, 9.6, 10, 11 */
@@ -128,65 +126,6 @@ typedef struct CheckPoint12
 } CheckPoint12;
 #endif
 
-typedef struct ControlFileData93
-{
-	uint64		system_identifier;
-
-	uint32		pg_control_version;		/* PG_CONTROL_VERSION */
-	uint32		catalog_version_no;		/* see catversion.h */
-
-	DBState		state;			/* see enum above */
-	pg_time_t	time;			/* time stamp of last pg_control update */
-	XLogRecPtr	checkPoint;		/* last check point record ptr */
-	XLogRecPtr	prevCheckPoint; /* previous check point record ptr */
-
-	CheckPoint93	checkPointCopy; /* copy of last check point record */
-
-	XLogRecPtr	unloggedLSN;	/* current fake LSN value, for unlogged rels */
-
-	XLogRecPtr	minRecoveryPoint;
-	TimeLineID	minRecoveryPointTLI;
-	XLogRecPtr	backupStartPoint;
-	XLogRecPtr	backupEndPoint;
-	bool		backupEndRequired;
-
-	int			wal_level;
-	int			MaxConnections;
-	int			max_prepared_xacts;
-	int			max_locks_per_xact;
-
-	uint32		maxAlign;		/* alignment requirement for tuples */
-	double		floatFormat;	/* constant 1234567.0 */
-
-	uint32		blcksz;			/* data block size for this DB */
-	uint32		relseg_size;	/* blocks per segment of large relation */
-
-	uint32		xlog_blcksz;	/* block size within WAL files */
-	uint32		xlog_seg_size;	/* size of each WAL segment */
-
-	uint32		nameDataLen;	/* catalog name field width */
-	uint32		indexMaxKeys;	/* max number of columns in an index */
-
-	uint32		toast_max_chunk_size;	/* chunk size in TOAST tables */
-
-	/* flag indicating internal format of timestamp, interval, time */
-	bool		enableIntTimes; /* int64 storage enabled? */
-
-	/* flags indicating pass-by-value status of various types */
-	bool		float4ByVal;	/* float4 pass-by-value? */
-	bool		float8ByVal;	/* float8, int8, etc pass-by-value? */
-
-	/* Are data pages protected by checksums? Zero if no checksum version */
-	uint32		data_checksum_version;
-
-} ControlFileData93;
-
-
-/*
- * Following field added since 9.3:
- *
- * 	int			max_worker_processes;
- */
 
 typedef struct ControlFileData94
 {
@@ -200,7 +139,7 @@ typedef struct ControlFileData94
 	XLogRecPtr	checkPoint;		/* last check point record ptr */
 	XLogRecPtr	prevCheckPoint; /* previous check point record ptr */
 
-	CheckPoint93	checkPointCopy; /* copy of last check point record */
+	CheckPoint94	checkPointCopy; /* copy of last check point record */
 
 	XLogRecPtr	unloggedLSN;	/* current fake LSN value, for unlogged rels */
 
@@ -438,7 +377,7 @@ typedef struct ControlFileData12
 #endif
 
 extern int get_pg_version(const char *data_directory, char *version_string);
-extern DBState get_db_state(const char *data_directory);
+extern bool get_db_state(const char *data_directory, DBState *state);
 extern const char *describe_db_state(DBState state);
 extern int	get_data_checksum_version(const char *data_directory);
 extern uint64 get_system_identifier(const char *data_directory);

dbutils.h

@@ -1,7 +1,7 @@
 /*
  * dbutils.h
  *
- * Copyright (c) 2ndQuadrant, 2010-2019
+ * Copyright (c) EnterpriseDB Corporation, 2010-2021
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -60,11 +60,6 @@
 	"NULL AS attached "
 
 
-
-#define BDR2_NODES_COLUMNS "node_sysid, node_timeline, node_dboid, node_name, node_local_dsn, ''"
-#define BDR3_NODES_COLUMNS "ns.node_id, 0, 0, ns.node_name, ns.interface_connstr, ns.peer_state_name"
-
-
 #define ERRBUFF_SIZE 512
 
 typedef enum
@@ -72,8 +67,7 @@ typedef enum
 	UNKNOWN = 0,
 	PRIMARY,
 	STANDBY,
-	WITNESS,
-	BDR
+	WITNESS
 } t_server_type;
 
 typedef enum
@@ -125,14 +119,21 @@ typedef enum
 
 typedef enum
 {
+	/* unable to query "pg_stat_replication" or other error */
 	NODE_ATTACHED_UNKNOWN = -1,
-	NODE_DETACHED,
-	NODE_ATTACHED
+	/* node has record in "pg_stat_replication" and state is not "streaming" */
+	NODE_ATTACHED,
+	/* node has record in "pg_stat_replication" but state is not "streaming" */
+	NODE_NOT_ATTACHED,
+	/* node has no record in "pg_stat_replication" */
+	NODE_DETACHED
 } NodeAttached;
 
 typedef enum
 {
 	SLOT_UNKNOWN = -1,
+	SLOT_NOT_FOUND,
+	SLOT_NOT_PHYSICAL,
 	SLOT_INACTIVE,
 	SLOT_ACTIVE
 } ReplSlotStatus;
@@ -170,6 +171,7 @@ typedef struct
 	char		current_timestamp[MAXLEN];
 	bool		in_recovery;
 	TimeLineID	timeline_id;
+	char		timeline_id_str[MAXLEN];
 	XLogRecPtr	last_wal_receive_lsn;
 	XLogRecPtr	last_wal_replay_lsn;
 	char		last_xact_replay_timestamp[MAXLEN];
@@ -324,45 +326,6 @@ typedef struct s_connection_user
 #define T_CONNECTION_USER_INITIALIZER { "", false }
 
 
-/* represents an entry in bdr.bdr_nodes */
-typedef struct s_bdr_node_info
-{
-	char		node_sysid[MAXLEN];
-	uint32		node_timeline;
-	uint32		node_dboid;
-	char		node_name[MAXLEN];
-	char		node_local_dsn[MAXLEN];
-	char		peer_state_name[MAXLEN];
-} t_bdr_node_info;
-
-#define T_BDR_NODE_INFO_INITIALIZER { \
-	"", InvalidOid, InvalidOid, \
-    "", "", "" \
-}
-
-
-/* structs to store a list of BDR node records */
-typedef struct BdrNodeInfoListCell
-{
-	struct BdrNodeInfoListCell *next;
-	t_bdr_node_info *node_info;
-} BdrNodeInfoListCell;
-
-typedef struct BdrNodeInfoList
-{
-	BdrNodeInfoListCell *head;
-	BdrNodeInfoListCell *tail;
-	int			node_count;
-} BdrNodeInfoList;
-
-#define T_BDR_NODE_INFO_LIST_INITIALIZER { \
-	NULL, \
-	NULL, \
-	0 \
-}
-
-
-
 typedef struct
 {
 	char		filepath[MAXPGPATH];
@@ -372,6 +335,7 @@ typedef struct
 
 #define T_CONFIGFILE_INFO_INITIALIZER { "", "", false }
 
+
 typedef struct
 {
 	int			size;
@@ -381,6 +345,7 @@ typedef struct
 
 #define T_CONFIGFILE_LIST_INITIALIZER { 0, 0, NULL }
 
+
 typedef struct
 {
 	uint64		system_identifier;
@@ -420,10 +385,6 @@ typedef struct RepmgrdInfo {
 /* utility functions */
 
 XLogRecPtr	parse_lsn(const char *str);
-
-extern void
-wrap_ddl_query(PQExpBufferData *query_buf, int replication_type, const char *fmt,...)
-__attribute__((format(PG_PRINTF_ATTRIBUTE, 3, 4)));
 bool		atobool(const char *value);
 
 /* connection functions */
@@ -432,13 +393,19 @@ PGconn	   *establish_db_connection(const char *conninfo,
 PGconn	   *establish_db_connection_quiet(const char *conninfo);
 PGconn	   *establish_db_connection_by_params(t_conninfo_param_list *param_list,
 								  const bool exit_on_error);
+PGconn	   *establish_db_connection_with_replacement_param(const char *conninfo,
+														   const char *param,
+														   const char *value,
+														   const bool exit_on_error);
+PGconn	   *establish_replication_connection_from_conn(PGconn *conn, const char *repluser);
+PGconn	   *establish_replication_connection_from_conninfo(const char *conninfo, const char *repluser);
+
 PGconn	   *establish_primary_db_connection(PGconn *conn,
 								const bool exit_on_error);
 PGconn	   *get_primary_connection(PGconn *standby_conn, int *primary_id, char *primary_conninfo_out);
 PGconn	   *get_primary_connection_quiet(PGconn *standby_conn, int *primary_id, char *primary_conninfo_out);
+PGconn	   *duplicate_connection(PGconn *conn, const char *user, bool replication);
 
-bool		is_superuser_connection(PGconn *conn, t_connection_user *userinfo);
-bool		connection_has_pg_settings(PGconn *conn);
 void		close_connection(PGconn **conn);
 
 /* conninfo manipulation functions */
@@ -451,6 +418,7 @@ void		conn_to_param_list(PGconn *conn, t_conninfo_param_list *param_list);
 void		param_set(t_conninfo_param_list *param_list, const char *param, const char *value);
 void		param_set_ine(t_conninfo_param_list *param_list, const char *param, const char *value);
 char	   *param_get(t_conninfo_param_list *param_list, const char *param);
+bool		validate_conninfo_string(const char *conninfo_str, char **errmsg);
 bool		parse_conninfo_string(const char *conninfo_str, t_conninfo_param_list *param_list, char **errmsg, bool ignore_local_params);
 char	   *param_list_to_string(t_conninfo_param_list *param_list);
 char	   *normalize_conninfo_string(const char *conninfo_str);
@@ -467,6 +435,7 @@ bool		set_config(PGconn *conn, const char *config_param, const char *config_valu
 bool		set_config_bool(PGconn *conn, const char *config_param, bool state);
 int		    guc_set(PGconn *conn, const char *parameter, const char *op, const char *value);
 bool		get_pg_setting(PGconn *conn, const char *setting, char *output);
+bool		get_pg_setting_bool(PGconn *conn, const char *setting, bool *output);
 bool		get_pg_setting_int(PGconn *conn, const char *setting, int *output);
 bool		alter_system_int(PGconn *conn, const char *name, int value);
 bool		pg_reload_conf(PGconn *conn);
@@ -481,6 +450,14 @@ int			get_ready_archive_files(PGconn *conn, const char *data_directory);
 bool		identify_system(PGconn *repl_conn, t_system_identification *identification);
 uint64		system_identifier(PGconn *conn);
 TimeLineHistoryEntry *get_timeline_history(PGconn *repl_conn, TimeLineID tli);
+pid_t		get_wal_receiver_pid(PGconn *conn);
+
+/* user/role information functions */
+bool		can_execute_pg_promote(PGconn *conn);
+bool		can_disable_walsender(PGconn *conn);
+bool		connection_has_pg_monitor_role(PGconn *conn, const char *subrole);
+bool		is_replication_role(PGconn *conn, char *rolname);
+bool		is_superuser_connection(PGconn *conn, t_connection_user *userinfo);
 
 /* repmgrd shared memory functions */
 bool		repmgrd_set_local_node_id(PGconn *conn, int local_node_id);
@@ -492,7 +469,6 @@ pid_t		repmgrd_get_pid(PGconn *conn);
 bool		repmgrd_is_running(PGconn *conn);
 bool		repmgrd_is_paused(PGconn *conn);
 bool		repmgrd_pause(PGconn *conn, bool pause);
-pid_t		get_wal_receiver_pid(PGconn *conn);
 int			repmgrd_get_upstream_node_id(PGconn *conn);
 bool		repmgrd_set_upstream_node_id(PGconn *conn, int node_id);
 
@@ -521,6 +497,7 @@ bool		get_local_node_record(PGconn *conn, int node_id, t_node_info *node_info);
 bool		get_primary_node_record(PGconn *conn, t_node_info *node_info);
 
 bool		get_all_node_records(PGconn *conn, NodeInfoList *node_list);
+bool		get_all_nodes_count(PGconn *conn, int *count);
 void		get_downstream_node_records(PGconn *conn, int node_id, NodeInfoList *nodes);
 void		get_active_sibling_node_records(PGconn *conn, int node_id, int upstream_node_id, NodeInfoList *node_list);
 bool		get_child_nodes(PGconn *conn, int node_id, NodeInfoList *node_list);
@@ -559,10 +536,14 @@ PGresult   *get_event_records(PGconn *conn, int node_id, const char *node_name,
 
 /* replication slot functions */
 void		create_slot_name(char *slot_name, int node_id);
-bool		create_replication_slot(PGconn *conn, char *slot_name, PQExpBufferData *error_msg);
-bool		drop_replication_slot(PGconn *conn, char *slot_name);
+
+bool		create_replication_slot_sql(PGconn *conn, char *slot_name, PQExpBufferData *error_msg);
+bool		create_replication_slot_replprot(PGconn *conn, PGconn *repl_conn, char *slot_name, PQExpBufferData *error_msg);
+bool		drop_replication_slot_sql(PGconn *conn, char *slot_name);
+bool		drop_replication_slot_replprot(PGconn *repl_conn, char *slot_name);
+
 RecordStatus get_slot_record(PGconn *conn, char *slot_name, t_replication_slot *record);
-int			get_free_replication_slot_count(PGconn *conn);
+int			get_free_replication_slot_count(PGconn *conn, int *max_replication_slots);
 int			get_inactive_replication_slots(PGconn *conn, KeyValueList *list);
 
 /* tablespace functions */
@@ -614,34 +595,17 @@ XLogRecPtr	get_last_wal_receive_location(PGconn *conn);
 void		init_replication_info(ReplInfo *replication_info);
 bool		get_replication_info(PGconn *conn, t_server_type node_type, ReplInfo *replication_info);
 int			get_replication_lag_seconds(PGconn *conn);
-TimeLineID	get_node_timeline(PGconn *conn);
+TimeLineID	get_node_timeline(PGconn *conn, char *timeline_id_str);
 void		get_node_replication_stats(PGconn *conn, t_node_info *node_info);
-NodeAttached is_downstream_node_attached(PGconn *conn, char *node_name);
+NodeAttached is_downstream_node_attached(PGconn *conn, char *node_name, char **node_state);
+NodeAttached is_downstream_node_attached_quiet(PGconn *conn, char *node_name, char **node_state);
 void		set_upstream_last_seen(PGconn *conn, int upstream_node_id);
 int			get_upstream_last_seen(PGconn *conn, t_server_type node_type);
 
 bool		is_wal_replay_paused(PGconn *conn, bool check_pending_wal);
 
-/* BDR functions */
-int			get_bdr_version_num(void);
-void		get_all_bdr_node_records(PGconn *conn, BdrNodeInfoList *node_list);
-RecordStatus get_bdr_node_record_by_name(PGconn *conn, const char *node_name, t_bdr_node_info *node_info);
-bool		is_bdr_db(PGconn *conn, PQExpBufferData *output);
-bool		is_bdr_db_quiet(PGconn *conn);
-bool		is_active_bdr_node(PGconn *conn, const char *node_name);
-bool		is_bdr_repmgr(PGconn *conn);
-char	   *get_default_bdr_replication_set(PGconn *conn);
-bool		is_table_in_bdr_replication_set(PGconn *conn, const char *tablename, const char *set);
-bool		add_table_to_bdr_replication_set(PGconn *conn, const char *tablename, const char *set);
-void		add_extension_tables_to_bdr_replication_set(PGconn *conn);
-bool		bdr_node_name_matches(PGconn *conn, const char *node_name, PQExpBufferData *bdr_local_node_name);
-ReplSlotStatus get_bdr_node_replication_slot_status(PGconn *conn, const char *node_name);
-void		get_bdr_other_node_name(PGconn *conn, int node_id, char *name_buf);
-
-bool		am_bdr_failover_handler(PGconn *conn, int node_id);
-void		unset_bdr_failover_handler(PGconn *conn);
-bool		bdr_node_has_repmgr_set(PGconn *conn, const char *node_name);
-bool		bdr_node_set_repmgr_set(PGconn *conn, const char *node_name);
+/* repmgrd status functions */
+CheckStatus	get_repmgrd_status(PGconn *conn);
 
 /* miscellaneous debugging functions */
 const char *print_node_status(NodeStatus node_status);

dirutil.c

@@ -3,7 +3,7 @@
  * dirmod.c
  *	  directory handling functions
  *
- * Copyright (c) 2ndQuadrant, 2010-2019
+ * Copyright (c) EnterpriseDB Corporation, 2010-2021
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -109,9 +109,56 @@ create_dir(const char *path)
 
 
 bool
-set_dir_permissions(const char *path)
+set_dir_permissions(const char *path, int server_version_num)
 {
-	return (chmod(path, 0700) != 0) ? false : true;
+	struct stat stat_buf;
+	bool no_group_access =
+		(server_version_num != UNKNOWN_SERVER_VERSION_NUM) &&
+		(server_version_num < 110000);
+	/*
+	 * At this point the path should exist, so this check is very
+	 * much just-in-case.
+	 */
+	if (stat(path, &stat_buf) != 0)
+	{
+		if (errno == ENOENT)
+		{
+			log_warning(_("directory \"%s\" does not exist"), path);
+		}
+		else
+		{
+			log_warning(_("could not read permissions of directory \"%s\""),
+						path);
+			log_detail("%s", strerror(errno));
+		}
+
+		return false;
+	}
+
+	/*
+	 * If mode is not 0700 or 0750, attempt to change.
+	 */
+	if ((no_group_access == true  && (stat_buf.st_mode & (S_IRWXG | S_IRWXO)))
+	 || (no_group_access == false && (stat_buf.st_mode & (S_IWGRP | S_IRWXO))))
+	{
+		/*
+		 * Currently we default to 0700.
+		 * There is no facility to override this directly,
+		 * but the user can manually create the directory with
+		 * the desired permissions.
+		 */
+
+		if (chmod(path, 0700) != 0) {
+			log_error(_("unable to change permissions of directory \"%s\""), path);
+			log_detail("%s", strerror(errno));
+			return false;
+		}
+
+		return true;
+	}
+
+	/* Leave as-is */
+	return true;
 }
 
 
@@ -158,7 +205,7 @@ mkdir_p(char *path, mode_t omode)
 			/*
 			 * POSIX 1003.2: For each dir operand that does not name an
 			 * existing directory, effects equivalent to those caused by the
-			 * following command shall occcur:
+			 * following command shall occur:
 			 *
 			 * mkdir -p -m $(umask -S),u+wx $(dirname dir) && mkdir [-m mode]
 			 * dir
@@ -242,7 +289,7 @@ is_pg_running(const char *path)
 	{
 		/*
 		 * No PID file - PostgreSQL shouldn't be running. From 9.3 (the
-		 * earliesty version we care about) removal of the PID file will
+		 * earliest version we care about) removal of the PID file will
 		 * cause the postmaster to shut down, so it's highly unlikely
 		 * that PostgreSQL will still be running.
 		 */
@@ -303,7 +350,7 @@ create_pg_dir(const char *path, bool force)
 	switch (check_dir(path))
 	{
 		case DIR_NOENT:
-			/* directory does not exist, attempt to create it */
+			/* Directory does not exist, attempt to create it. */
 			log_info(_("creating directory \"%s\"..."), path);
 
 			if (!create_dir(path))
@@ -314,14 +361,23 @@ create_pg_dir(const char *path, bool force)
 			}
 			break;
 		case DIR_EMPTY:
-			/* exists but empty, fix permissions and use it */
+			/*
+			 * Directory exists but empty, fix permissions and use it.
+			 *
+			 * Note that at this point the caller might not know the server
+			 * version number, so in this case "set_dir_permissions()" will
+			 * accept 0750 as a valid setting. As this is invalid in Pg10 and
+			 * earlier,  the caller should call "set_dir_permissions()" again
+			 * when it has the number.
+			 *
+			 * We need to do the permissions check here in any case to catch
+			 * fatal permissions early.
+			 */
 			log_info(_("checking and correcting permissions on existing directory \"%s\""),
 					 path);
 
-			if (!set_dir_permissions(path))
+			if (!set_dir_permissions(path, UNKNOWN_SERVER_VERSION_NUM))
 			{
-				log_error(_("unable to change permissions of directory \"%s\""), path);
-				log_detail("%s", strerror(errno));
 				return false;
 			}
 			break;

dirutil.h

@@ -1,6 +1,6 @@
 /*
  * dirutil.h
- * Copyright (c) 2ndQuadrant, 2010-2019
+ * Copyright (c) EnterpriseDB Corporation, 2010-2021
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -35,7 +35,7 @@ typedef enum
 } PgDirState;
 
 extern int	mkdir_p(char *path, mode_t omode);
-extern bool set_dir_permissions(const char *path);
+extern bool set_dir_permissions(const char *path, int server_version_num);
 
 extern DataDirState	check_dir(const char *path);
 extern bool create_dir(const char *path);

doc/Makefile

@@ -95,6 +95,8 @@ clean:
 	rm -f repmgr.html
 	rm -f repmgr-A4.pdf
 	rm -f repmgr-US.pdf
+	rm -f *.fo
+	rm -f html/*
 
 maintainer-clean:
 	rm -rf html

doc/appendix-faq.xml

@@ -22,6 +22,9 @@
           &repmgr; 5 is fundamentally the same code base as &repmgr; 4, but provides
           support for the revised replication configuration mechanism in PostgreSQL 12.
         </para>
+        <para>
+          Support for PostgreSQL 9.3 is no longer available from &repmgr; 5.2.
+        </para>
       </note>
       <para>
         &repmgr; 3.x builds on the improved replication facilities added
@@ -59,7 +62,7 @@
 
       <tip>
         <para>
-          2ndQuadrant's recommended configuration is to configure
+          Our recommended configuration is to configure
           <ulink url="https://www.pgbarman.org/">Barman</ulink> as a fallback
           source of WAL files, rather than maintain replication slots for
           each standby. See also: <link linkend="cloning-from-barman-restore-command">Using Barman as a WAL file source</link>.
@@ -124,7 +127,7 @@
         filesystem layouts.
       </para>
       <para>
-        Either use PostgreSQL packages provided by the community or 2ndQuadrant; if this
+        Either use PostgreSQL packages provided by the community or EnterpriseDB; if this
         is not possible, contact your vendor for assistance.
       </para>
     </sect2>
@@ -167,7 +170,7 @@
       <para>
         If different &quot;minor&quot; &repmgr; versions (e.g. 4.1.1 and 4.1.6) are installed,
         &repmgr; will function, but we strongly recommend always running the same version
-        to ensure there are no unexpected suprises, e.g. a newer version behaving slightly
+        to ensure there are no unexpected surprises, e.g. a newer version behaving slightly
         differently to the older version.
       </para>
       <para>
@@ -209,11 +212,11 @@
       </para>
     </sect2>
 
-    <sect2 id="faq-third-party-packages" xreflabel="Compatability with third party vendor packages">
+    <sect2 id="faq-third-party-packages" xreflabel="Compatibility with third party vendor packages">
       <title>Are &repmgr; packages compatible with <literal>$third_party_vendor</literal>'s packages?</title>
       <para>
-        &repmgr; packages provided by 2ndQuadrant are compatible with the community-provided PostgreSQL
-        packages and any software provided by 2ndQuadrant.
+        &repmgr; packages provided by EnterpriseDB are compatible with the community-provided PostgreSQL
+        packages and specified software provided by EnterpriseDB.
       </para>
       <para>
         A number of other vendors provide their own versions of PostgreSQL packages, often with different
@@ -245,17 +248,17 @@
       <para>
         For a standby which has been manually cloned or recovered from an external
         backup manager such as Barman, the command
-        <command><link linkend="repmgr-standby-clone">repmgr standby clone --recovery-conf-only</link></command>
-        can be used to create the correct <filename>recovery.conf</filename> file for
+        <command><link linkend="repmgr-standby-clone">repmgr standby clone --replication-conf-only</link></command>
+        can be used to create the correct replication configuration file for
         use with &repmgr; (and will create a replication slot if required). Once this has been done,
         <link linkend="repmgr-standby-register">register the node</link> as usual.
       </para>
     </sect2>
 
     <sect2 id="faq-repmgr-recovery-conf" >
-      <title>What does &repmgr; write in <filename>recovery.conf</filename>, and what options can be set there?</title>
+      <title>What does &repmgr; write in the replication configuration, and what options can be set there?</title>
       <para>
-        See section <link linkend="repmgr-standby-clone-recovery-conf">Customising recovery.conf</link>.
+        See section <link linkend="repmgr-standby-clone-recovery-conf">Customising replication configuration</link>.
       </para>
     </sect2>
 
@@ -308,7 +311,7 @@
       </para>
     </sect2>
 
-    <sect2 id="faq-repmgr-shared-preload-libaries-no-repmgrd" xreflabel="shared_preload_libraries without repmgrd">
+    <sect2 id="faq-repmgr-shared-preload-libraries-no-repmgrd" xreflabel="shared_preload_libraries without repmgrd">
       <title>Do I need to include <literal>shared_preload_libraries = 'repmgr'</literal>
         in <filename>postgresql.conf</filename> if I'm not using &repmgrd;?</title>
       <para>
@@ -347,6 +350,9 @@
         and earlier) with the absolute path to the WAL directory in <varname>pg_basebackup_options</varname>.
         For more details see <xref linkend="cloning-advanced-pg-basebackup-options"/>.
       </para>
+      <para>
+        In &repmgr; 5.2 and later, this setting will also be honoured when cloning from Barman.
+      </para>
     </sect2>
 
     <sect2 id="faq-repmgr-events-no-fkey" xreflabel="No foreign key on node_id in repmgr.events">
@@ -360,11 +366,11 @@
       </para>
     </sect2>
 
-    <sect2 id="faq-repmgr-recovery-conf-quoted-values" xreflabel="Quoted values in recovery.conf">
-      <title>Why are some values in <filename>recovery.conf</filename> surrounded by pairs of single quotes?</title>
+    <sect2 id="faq-repmgr-recovery-conf-quoted-values" xreflabel="Quoted values in replication.conf">
+      <title>Why are some values in <filename>recovery.conf</filename> (PostgreSQL 11 and earlier) surrounded by pairs of single quotes?</title>
       <para>
         This is to ensure that user-supplied values which are written as parameter values in <filename>recovery.conf</filename>
-        are escaped correctly and do not cause errors when <filename>recovery.conf</filename> is parsed.
+        are escaped correctly and do not cause errors when the file is parsed.
       </para>
       <para>
         The escaping is performed by an internal PostgreSQL routine, which leaves strings consisting
@@ -373,6 +379,22 @@
       </para>
     </sect2>
 
+    <sect2 id="faq-repmgr-exclude-metadata-from-dump" xreflabel="Excluding repmgr metadata from pg_dump output">
+      <title>How can I exclude &repmgr; metadata from <application>pg_dump</application> output?</title>
+      <para>
+        Beginning with &repmgr; 5.2, the metadata tables associated with the &repmgr; extension
+        (<literal>repmgr.nodes</literal>, <literal>repmgr.events</literal> and <literal>repmgr.monitoring_history</literal>)
+        have been marked as dumpable as they contain configuration and user-generated data.
+      </para>
+      <para>
+        To exclude these from <application>pg_dump</application> output, add the flag <option>--exclude-schema=repmgr</option>.
+      </para>
+      <para>
+        To exclude individual &repmgr; metadata tables from <application>pg_dump</application> output, add the flag
+        e.g. <option>--exclude-table=repmgr.monitoring_history</option>. This flag can be provided multiple times
+        to exclude individual tables,
+      </para>
+    </sect2>
 
   </sect1>
 
@@ -397,9 +419,9 @@
       <para>
         &repmgrd; can monitor delayed standbys - those set up with
         <varname>recovery_min_apply_delay</varname> set to a non-zero value
-        in <filename>recovery.conf</filename> - but as it's not currently possible
-        to directly examine the value applied to the standby, &repmgrd;
-        may not be able to properly evaluate the node as a promotion candidate.
+        in the replication configuration. However &repmgrd; does not currently
+        consider this setting, and therefore may not be able to properly evaluate
+        the node as a promotion candidate.
       </para>
       <para>
         We recommend that delayed standbys are explicitly excluded from promotion
@@ -437,7 +459,7 @@
       </title>
       <para>
         <varname>promote_command</varname> or <varname>follow_command</varname> can be user-defined scripts,
-        so &repmgr; will not apply <option>pg_bindir</option> even if excuting &repmgr;. Always provide the full
+        so &repmgr; will not apply <option>pg_bindir</option> even if executing &repmgr;. Always provide the full
         path; see <xref linkend="repmgrd-automatic-failover-configuration"/> for more details.
       </para>
     </sect2>
@@ -457,7 +479,7 @@
         is out-of-date, which may lead to incorrect failover behaviour.
       </para>
       <para>
-        The onus is therefore on the adminstrator to manually set the cluster to a stable, healthy state before
+        The onus is therefore on the administrator to manually set the cluster to a stable, healthy state before
         starting &repmgrd;.
       </para>
     </sect2>

doc/appendix-packages.xml

@@ -50,19 +50,18 @@
       <title>CentOS repositories</title>
 
       <para>
-        &repmgr; packages are available from the public 2ndQuadrant repository, and also the
-        PostgreSQL community repository. The 2ndQuadrant repository is updated immediately
-        after each
-        &repmgr; release.
+        &repmgr; packages are available from the public EDB repository, and also the
+        PostgreSQL community repository. The EDB repository is updated immediately
+        after each &repmgr; release.
       </para>
 
       <table id="centos-2ndquadrant-repository">
-        <title>2ndQuadrant public repository</title>
+        <title>EDB public repository</title>
         <tgroup cols="2">
           <tbody>
             <row>
               <entry>Repository URL:</entry>
-              <entry><ulink url="https://dl.2ndquadrant.com/">https://dl.2ndquadrant.com/</ulink></entry>
+              <entry><ulink url="https://dl.enterprisedb.com/">https://dl.enterprisedb.com/</ulink></entry>
             </row>
             <row>
               <entry>Repository documentation:</entry>
@@ -253,28 +252,22 @@
     </indexterm>
 
     <para>
-      &repmgr; <literal>.deb</literal> packages are provided via the
+      &repmgr; <literal>.deb</literal> packages are provided by EDB as well as the
       PostgreSQL Community APT repository, and are available for each community-supported
       PostgreSQL version, currently supported Debian releases, and currently supported
       Ubuntu LTS releases.
     </para>
 
     <sect2 id="packages-apt-repository">
-      <title>APT repository</title>
-
-      <para>
-        &repmgr; packages are available from the  PostgreSQL Community APT repository,
-        which is updated immediately after each &repmgr; release.
-      </para>
-
+      <title>APT repositories</title>
 
       <table id="apt-2ndquadrant-repository">
-        <title>2ndQuadrant public repository</title>
+        <title>EDB public repository</title>
         <tgroup cols="2">
           <tbody>
             <row>
               <entry>Repository URL:</entry>
-              <entry><ulink url="https://dl.2ndquadrant.com/">https://dl.2ndquadrant.com/</ulink></entry>
+              <entry><ulink url="https://dl.enterprisedb.com/">https://dl.enterprisedb.com/</ulink></entry>
             </row>
             <row>
               <entry>Repository documentation:</entry>
@@ -291,7 +284,7 @@
           <tbody>
             <row>
               <entry>Repository URL:</entry>
-              <entry><ulink url="http://apt.postgresql.org/">http://apt.postgresql.org/</ulink></entry>
+              <entry><ulink url="https://apt.postgresql.org/">https://apt.postgresql.org/</ulink></entry>
             </row>
             <row>
               <entry>Repository documentation:</entry>
@@ -382,9 +375,9 @@
       </table>
       <note>
         <para>
-          Instead of using the <application>systemd</application> service command directly,
-          it's recommended to execute <command>pg_ctlcluster</command> (as <literal>root</literal>,
-          either directly or via <command>sudo</command>), e.g.:
+          When using Debian packages, instead of using the <application>systemd</application> service
+          command directly,  it's recommended to execute <command>pg_ctlcluster</command>
+          (as <literal>root</literal>, either directly or via <command>sudo</command>), e.g.:
           <programlisting>
             <command>pg_ctlcluster 11 main [start|stop|restart|reload]</command></programlisting>
         </para>
@@ -404,11 +397,11 @@
     </indexterm>
     <indexterm>
       <primary>packages</primary>
-      <secondary>snaphots</secondary>
+      <secondary>snapshots</secondary>
     </indexterm>
 
     <para>
-      For testing new features and bug fixes, from time to time 2ndQuadrant provides
+      For testing new features and bug fixes, from time to time EDB provides
       so-called &quot;snapshot packages&quot; via its public repository. These packages
       are built from the &repmgr; source at a particular point in time, and are not formal
       releases.
@@ -420,22 +413,22 @@
       </para>
     </note>
     <para>
-      To install a snapshot package, it's necessary to install the 2ndQuadrant public snapshot repository,
-      following the instructions here: <ulink url="https://dl.2ndquadrant.com/default/release/site/">https://dl.2ndquadrant.com/default/release/site/</ulink> but replace <literal>release</literal> with <literal>snapshot</literal>
+      To install a snapshot package, it's necessary to install the EDB public snapshot repository,
+      following the instructions here: <ulink url="https://dl.enterprisedb.com/default/release/site/">https://dl.enterprisedb.com/default/release/site/</ulink> but replace <literal>release</literal> with <literal>snapshot</literal>
       in the appropriate URL.
     </para>
     <para>
       For example, to install the snapshot RPM repository for PostgreSQL 9.6, execute (as <literal>root</literal>):
       <programlisting>
-curl https://dl.2ndquadrant.com/default/snapshot/get/9.6/rpm | bash</programlisting>
+curl https://dl.enterprisedb.com/default/snapshot/get/9.6/rpm | bash</programlisting>
 
       or as a normal user with root sudo access:
       <programlisting>
-curl https://dl.2ndquadrant.com/default/snapshot/get/9.6/rpm | sudo bash</programlisting>
+curl https://dl.enterprisedb.com/default/snapshot/get/9.6/rpm | sudo bash</programlisting>
     </para>
     <para>
       Alternatively you can browse the repository here:
-      <ulink url="https://dl.2ndquadrant.com/default/snapshot/browse/">https://dl.2ndquadrant.com/default/snapshot/browse/</ulink>.
+      <ulink url="https://dl.enterprisedb.com/default/snapshot/browse/">https://dl.enterprisedb.com/default/snapshot/browse/</ulink>.
     </para>
     <para>
       Once the repository is installed, installing or updating &repmgr; will result in the latest snapshot
@@ -445,7 +438,7 @@ curl https://dl.2ndquadrant.com/default/snapshot/get/9.6/rpm | sudo bash</progra
       The package name will be formatted like this:
       <programlisting>
 repmgr96-4.1.1-0.0git320.g5113ab0.1.el7.x86_64.rpm</programlisting>
-      containg the snapshot build number (here: <literal>320</literal>) and the hash
+      containing the snapshot build number (here: <literal>320</literal>) and the hash
       of the <application>git</application> commit it was built from (here: <literal>g5113ab0</literal>).
     </para>
 
@@ -477,7 +470,7 @@ repmgr96-4.1.1-0.0git320.g5113ab0.1.el7.x86_64.rpm</programlisting>
       <title>Debian/Ubuntu</title>
       <para>
         An archive of old packages (<literal>3.3.2</literal> and later) for Debian/Ubuntu-based systems is available here:
-        <ulink url="http://atalia.postgresql.org/morgue/r/repmgr/">http://atalia.postgresql.org/morgue/r/repmgr/</ulink>
+        <ulink url="https://apt-archive.postgresql.org/">https://apt-archive.postgresql.org/</ulink>
       </para>
     </sect2>
 
@@ -500,32 +493,6 @@ repmgr96-4.1.1-0.0git320.g5113ab0.1.el7.x86_64.rpm</programlisting>
           yum install repmgr96-4.0.6-1.rhel6</programlisting>
       </para>
 
-      <sect3 id="packages-old-versions-rhel-centos-repmgr3">
-        <title>repmgr 3 packages</title>
-        <para>
-          Old &repmgr; 3 RPM packages (<literal>3.2</literal> and later) can be retrieved from the
-          (deprecated) 2ndQuadrant repository at
-          <ulink url="http://packages.2ndquadrant.com/repmgr/yum/">http://packages.2ndquadrant.com/repmgr/yum/</ulink>
-          by installing the appropriate repository RPM:
-        </para>
-
-        <itemizedlist spacing="compact" mark="bullet">
-
-          <listitem>
-            <simpara>
-              <ulink url="http://packages.2ndquadrant.com/repmgr/yum-repo-rpms/repmgr-fedora-1.0-1.noarch.rpm">http://packages.2ndquadrant.com/repmgr/yum-repo-rpms/repmgr-fedora-1.0-1.noarch.rpm</ulink>
-            </simpara>
-          </listitem>
-
-          <listitem>
-            <simpara>
-              <ulink url="http://packages.2ndquadrant.com/repmgr/yum-repo-rpms/repmgr-rhel-1.0-1.noarch.rpm">http://packages.2ndquadrant.com/repmgr/yum-repo-rpms/repmgr-rhel-1.0-1.noarch.rpm</ulink>
-            </simpara>
-          </listitem>
-
-        </itemizedlist>
-      </sect3>
-
     </sect2>
   </sect1>
 

doc/appendix-release-notes.xml

@@ -15,11 +15,722 @@
     See also: <xref linkend="upgrading-repmgr"/>
   </para>
 
-<!-- remember to update the release date in ../repmgr_version.h.in -->
+  <!-- remember to update the release date in ../repmgr_version.h.in -->
+  <sect1 id="release-5.3.3">
+    <title id="release-current">Release 5.3.3</title>
+    <para><emphasis>Mon 17 October, 2022</emphasis></para>
+    <para>
+      &repmgr; 5.3.3 is a minor release providing support for
+      <ulink url="https://www.postgresql.org/docs/15/release-15.html">PostgreSQL 15</ulink>
+      and a &repmgrd; bug fix.
+    </para>
+    <para>
+      If upgrading from an earlier &repmgr; version, any running &repmgrd; instances should be restarted.
+    </para>
+    <para>
+      If upgrading from &repmgr; 5.2.1 or earlier, a PostgreSQL restart <emphasis>is</emphasis> required.
+    </para>
+
+    <sect2>
+      <title>Bug fixes</title>
+      <para>
+        <itemizedlist>
+          <listitem>
+            <para>
+              &repmgrd;: ensure <link linkend="event-notifications">event notification</link> script is called for event
+              <literal>repmgrd_upstream_disconnect</literal>.  GitHub #760.
+            </para>
+          </listitem>
+        </itemizedlist>
+      </para>
+    </sect2>
+  </sect1>
+
+  <sect1 id="release-5.3.2">
+    <title>Release 5.3.2</title>
+    <para><emphasis>Wed 25 May, 2022</emphasis></para>
+    <para>
+      &repmgr; 5.3.2 is a minor release.
+    </para>
+    <para>
+      Any running &repmgrd; instances should be restarted following this upgrade.
+    </para>
+    <para>
+      If upgrading from &repmgr; 5.2.1 or earlier, a PostgreSQL restart <emphasis>is</emphasis> required.
+    </para>
+
+    <sect2>
+      <title>Bug fixes</title>
+      <para>
+        <itemizedlist>
+          <listitem>
+            <para>
+              <command><link linkend="repmgr-node-status">repmgr node status</link></command>:
+              fix output with <option>--downstream</option> <option>--nagios</option> option combination.
+              GitHub #749.
+            </para>
+          </listitem>
+          <listitem>
+            <para>
+              <command><link linkend="repmgr-standby-clone">repmgr standby clone</link></command>:
+              don't treat inability to determine the cluster size as a fatal error.
+            </para>
+            <para>
+              The cluster size is displayed for informational purposes and is not essential
+              for execution of the clone operation. As the &repmgr; user may not have permissions
+              for all databases in the cluster, ignore the cluster size query if it fails.
+            </para>
+          </listitem>
+          <listitem>
+            <para>
+              &repmgrd;: ensure the witness node record on the primary is always marked
+              as <literal>active</literal> if previously marked <literal>inactive</literal>.
+              GitHub #754.
+            </para>
+          </listitem>
+          <listitem>
+            <para>
+              &repmgrd;: if <varname>standby_disconnect_on_failover</varname> is set, verify
+              &repmgr; is a superuser before attempting to disable the WAL receiver.
+            </para>
+          </listitem>
+          <listitem>
+            <para>
+              If the &repmgr; user is a non-superuser, and a replication-only user exists,
+              ensure redundant replication slots are dropped correctly even
+              if the <option>-S/--superuser</option> option is not provided.
+            </para>
+          </listitem>
+        </itemizedlist>
+      </para>
+    </sect2>
+  </sect1>
+
+  <sect1 id="release-5.3.1">
+    <title>Release 5.3.1</title>
+    <para><emphasis>Tue 15 February, 2022</emphasis></para>
+    <para>
+      &repmgr; 5.3.1 is a minor release.
+    </para>
+    <para>
+      If &repmgrd; is in use, it should be restarted on all nodes where it is running.
+    </para>
+    <para>
+      If upgrading from &repmgr; 5.2.1 or earlier, a PostgreSQL restart <emphasis>is</emphasis> required.
+    </para>
+    <sect2>
+      <title>Bug fixes</title>
+      <para>
+        <itemizedlist>
+           <listitem>
+             <para>
+               Fix upgrade path from &repmgr; 4.2 and 4.3 to &repmgr; 5.3.
+             </para>
+           </listitem>
+           <listitem>
+             <para>
+               &repmgrd;: ensure potentially open connections are closed.
+             </para>
+             <para>
+                In some cases, when recovering from degraded state in local node monitoring,
+                new connection was opened to the local node without closing
+                the old one, which will result in memory leakage.
+             </para>
+           </listitem>
+        </itemizedlist>
+      </para>
+    </sect2>
+  </sect1>
+
+  <sect1 id="release-5.3.0">
+    <title>Release 5.3.0</title>
+    <para><emphasis>Tue 12 October, 2021</emphasis></para>
+    <para>
+      &repmgr; 5.3.0 is a major release.
+    </para>
+    <para>
+      This release provides support for <ulink url="https://www.postgresql.org/docs/14/release-14.html">PostgreSQL 14</ulink>,
+      released in September 2021.
+    </para>
+    <para>
+      Note that this release includes changes to the &repmgr; shared library module, meaning a
+      PostgreSQL restart <emphasis>is</emphasis> required on all nodes where &repmgr; is installed.
+    </para>
+
+    <sect2>
+      <title>Improvements</title>
+      <para>
+        <itemizedlist>
+          <listitem>
+            <para>
+              <link linkend="repmgr-standby-switchover"><command>repmgr standby switchover</command></link>:
+              Improve handling of node rejoin failure on the demotion candidate.
+            </para>
+            <para>
+              Previously &repmgr; did not check whether <command>repmgr node rejoin</command> actually
+              succeeded on the demotion candidate, and would always wait up to <varname>node_rejoin_timeout</varname>
+              seconds for it to attach to the promotion candidate, even if this would never happen.
+            </para>
+            <para>
+              This makes it easier to identify unexpected events during a switchover operation, such as
+              the demotion candidate being unexpectedly restarted by an external process.
+            </para>
+            <para>
+              Note that the output of the <link linkend="repmgr-node-rejoin"><command>repmgr node rejoin</command></link>
+              operation on the demotion candidate will now be logged to a temporary file on that node;
+              the location of the file will be reported in the error message, if one is emitted.
+            </para>
+          </listitem>
+          <listitem>
+            <para>
+              &repmgrd;: at startup, if node record is marked as "inactive", attempt
+              to set it to "active".
+            </para>
+            <para>
+              This behaviour can be overridden by setting the configuration parameter
+              <varname>repmgrd_exit_on_inactive_node</varname> to <literal>true</literal>.
+            </para>
+          </listitem>
+           <listitem>
+             <para>
+               <command><link linkend="repmgr-node-rejoin">repmgr node rejoin</link></command>:
+               emit rejoin target note information as <literal>NOTICE</literal>.
+             </para>
+             <para>
+               This makes it clearer what &repmgr; is trying to do.
+             </para>
+           </listitem>
+
+          <listitem>
+            <para>
+              <link linkend="repmgr-node-check">repmgr node check</link>:
+              option <option>--repmgrd</option> added to check &repmgrd;
+              status.
+            </para>
+          </listitem>
+
+          <listitem>
+            <para>
+              Add <literal>%p</literal> <link linkend="event-notifications">event notification parameter</link>
+              providing the node ID of the former primary for the <literal>repmgrd_failover_promote</literal> event.
+            </para>
+          </listitem>
+
+        </itemizedlist>
+
+      </para>
+    </sect2>
+
+    <sect2>
+      <title>Bug fixes</title>
+      <para>
+        <itemizedlist>
+           <listitem>
+            <para>
+              <command><link linkend="repmgr-standby-clone">repmgr standby clone</link></command>:
+              if using <option>--replication-conf-only</option> on a node
+              which was set up without replication slots, but the &repmgr; configuration
+              was since changed to <option>use_replication_slots=1</option>,
+              &repmgr; will now set <varname>slot_name</varname> in the
+              node record, if it was previously empty.
+            </para>
+           </listitem>
+
+
+           <listitem>
+            <para>
+              &repmgrd;: rename internal shared library functions to minimize the
+              risk of clashes with other shared libraries.
+            </para>
+            <para>
+              This does not affect user-facing SQL functions. Howe
+            </para>
+          </listitem>
+
+          <listitem>
+            <para>
+              &repmgrd;: ensure short option <option>-s</option> is accepted.
+            </para>
+          </listitem>
+        </itemizedlist>
+      </para>
+    </sect2>
+  </sect1>
+
+  <sect1 id="release-5.2.1">
+    <title>Release 5.2.1</title>
+    <para><emphasis>Mon 7 December, 2020</emphasis></para>
+
+    <para>
+      &repmgr; 5.2.1 is a minor release.
+    </para>
+    <sect2>
+      <title>Improvements</title>
+      <para>
+        <itemizedlist>
+          <listitem>
+            <para>
+              <link linkend="repmgr-standby-clone">repmgr standby clone</link>:
+              option <option>--recovery-min-apply-delay</option> added, overriding any
+              setting present in <filename>repmgr.conf</filename>.
+            </para>
+          </listitem>
+        </itemizedlist>
+      </para>
+    </sect2>
+
+    <sect2>
+      <title>Bug fixes</title>
+      <para>
+
+         <itemizedlist>
+          <listitem>
+            <para>
+              Configuration: fix parsing of <option>replication_type</option> configuration parameter.  GitHub #672.
+            </para>
+          </listitem>
+
+          <listitem>
+            <para>
+              <link linkend="repmgr-standby-clone">repmgr standby clone</link>:
+              handle case where <filename>postgresql.auto.conf</filename> is absent on the
+              source node.
+            </para>
+          </listitem>
+
+          <listitem>
+            <para>
+              <link linkend="repmgr-standby-clone">repmgr standby clone</link>:
+              in PostgreSQL 11 and later, an existing data directory's permissions
+              will not be changed to <option>0700</option> if they are already set to
+              <option>0750</option>.
+            </para>
+          </listitem>
+
+          <listitem>
+            <para>
+              &repmgrd;: prevent termination when local node not available and
+              <option>standby_disconnect_on_failover</option> is set.  GitHub #675.
+            </para>
+          </listitem>
+          <listitem>
+            <para>
+              &repmgrd;: ensure <option>reconnect_interval</option> is correctly handled.
+              GitHub #673.
+            </para>
+          </listitem>
+
+          <listitem>
+            <para>
+              <command>repmgr witness --help</command>: fix <command>witness unregister</command>
+              description.  GitHub #676.
+            </para>
+          </listitem>
+
+       </itemizedlist>
+      </para>
+    </sect2>
+  </sect1>
+
+
+  <sect1 id="release-5.2.0">
+    <title>Release 5.2.0</title>
+    <para><emphasis>Thu 22 October, 2020</emphasis></para>
+
+    <para>
+      &repmgr; 5.2.0 is a major release.
+    </para>
+    <para>
+      This release provides support for <ulink url="https://www.postgresql.org/docs/13/release-13.html">PostgreSQL 13</ulink>, released in September 2020.
+    </para>
+    <para>
+      This release removes support for PostgreSQL 9.3, which was
+      <ulink url="https://www.postgresql.org/docs/9.3/release-9-3-25.html">designated EOL in November 2018</ulink>.
+    </para>
+
+    <sect2>
+      <title>General improvements</title>
+      <para>
+        <itemizedlist>
+          <listitem>
+            <para>
+              Configuration: support <command>include</command>, <command>include_dir</command> and
+              <command>include_if_exists</command> directives (see <xref linkend="configuration-file-include-directives"/>).
+            </para>
+          </listitem>
+          <listitem>
+            <para>
+              <link linkend="repmgr-standby-switchover"><command>repmgr standby switchover</command></link>:
+              Improve sanity check failure log output from the demotion candidate.
+            </para>
+            <para>
+              If database connection configuration is not consistent across all nodes, it's
+              possible remote &repmgr; invocations (e.g. during switchover, from the promotion candidate
+              to the demotion candidate) will not be able to connect to the database. This will
+              now be explicitly reported as a database connection failure, rather than as a failure
+              of the respective sanity check.
+            </para>
+          </listitem>
+          <listitem>
+            <para>
+              <link linkend="repmgr-cluster-crosscheck">repmgr cluster crosscheck</link> /
+              <link linkend="repmgr-cluster-matrix">repmgr cluster matrix</link>:
+              improve text mode output format, in particular so that node identifiers of arbitrary length are
+              displayed correctly.
+            </para>
+          </listitem>
+
+          <listitem>
+            <para>
+              <link linkend="repmgr-primary-unregister">repmgr primary unregister</link>:
+              the <option>--force</option> can be provided to unregister an active primary node, provided
+              it has no registered standby nodes.
+            </para>
+          </listitem>
+
+          <listitem>
+            <para>
+              <link linkend="repmgr-standby-clone">repmgr standby clone</link>: new option
+              <option>--verify-backup</option> to run PostgreSQL's
+              <ulink url="https://www.postgresql.org/docs/13/app-pgverifybackup.html">pg_verifybackup</ulink>
+              utility after cloning a standby to verify the integrity of the copied data
+              (PostgreSQL 13 and later).
+            </para>
+          </listitem>
+
+          <listitem>
+            <para>
+              <link linkend="repmgr-standby-clone">repmgr standby clone</link>:
+              when cloning from Barman, setting <option>--waldir</option>
+              (PostgreSQL 9.6 and earlier: <option>--xlogdir</option>) in
+              <option>pg_basebackup_options</option> will cause &repmgr; to create
+              a WAL directory outside of the main data directory and symlink
+              it from there, in the same way as would happen when cloning
+              using <application>pg_basebackup</application>.
+            </para>
+          </listitem>
+
+          <listitem>
+            <para>
+              <link linkend="repmgr-standby-follow">repmgr standby follow</link>:
+              In PostgreSQL 13 and later, a standby no longer requires a restart to
+              follow a new upstream node.
+            </para>
+            <para>
+              The old behaviour (always restarting the standby to follow a new node)
+              can be restored by setting the configuration file parameter
+              <varname>standby_follow_restart</varname> to <literal>true</literal>.
+            </para>
+          </listitem>
+
+          <listitem>
+            <para>
+              <link linkend="repmgr-node-rejoin">repmgr node rejoin</link>:
+              enable a node to attach to a target node even the target node
+              has a lower timeline (PostgreSQL 9.6 and later).
+            </para>
+          </listitem>
+
+          <listitem>
+            <para>
+              <link linkend="repmgr-node-rejoin">repmgr node rejoin</link>:
+              in PostgreSQL 13 and later, support <application>pg_rewind</application>'s
+              ability to automatically run crash recovery on a PostgreSQL instance
+              which was not shut down cleanly.
+            </para>
+          </listitem>
+
+          <listitem>
+            <para>
+              <link linkend="repmgr-node-check">repmgr node check</link>:
+              option <option>--db-connection</option> added to check if &repmgr;
+              can connect to the database on the local node.
+            </para>
+          </listitem>
+          <listitem>
+            <para>
+              <link linkend="repmgr-node-check">repmgr node check</link>:
+              report database connection error if the <option>--optformat</option> was provided.
+            </para>
+          </listitem>
+          <listitem>
+            <para>
+              Improve handling of pg_control read errors.
+            </para>
+          </listitem>
+          <listitem>
+            <para>
+              It is now possible to dump the contents of &repmgr; metadata tables with
+              <application>pg_dump</application>.
+            </para>
+          </listitem>
+        </itemizedlist>
+      </para>
+    </sect2>
+    <sect2>
+      <title>repmgrd enhancements</title>
+      <para>
+        <itemizedlist>
+
+          <listitem>
+            <para>
+              Following additional parameters can be provided to <varname>failover_validation_command</varname>:
+              <itemizedlist spacing="compact" mark="bullet">
+                <listitem>
+                  <simpara><literal>%n</literal>: node ID</simpara>
+                </listitem>
+                <listitem>
+                  <simpara><literal>%a</literal>: node name</simpara>
+                </listitem>
+                <listitem>
+                  <simpara><literal>%v</literal>: number of visible nodes</simpara>
+                </listitem>
+                <listitem>
+                  <simpara><literal>%u</literal>: number of shared upstream nodes</simpara>
+                </listitem>
+                <listitem>
+                  <simpara><literal>%t</literal>: total number of nodes</simpara>
+                </listitem>
+              </itemizedlist>
+            </para>
+          </listitem>
+
+          <listitem>
+            <para>
+              Configuration option <varname>always_promote</varname> (default: <literal>false</literal>)
+              to control whether a node should be promoted if the &repmgr; metadata is not up-to-date
+              on that node.
+            </para>
+          </listitem>
+        </itemizedlist>
+      </para>
+    </sect2>
+
+    <sect2>
+      <title>Bug fixes</title>
+      <para>
+       <itemizedlist>
+          <listitem>
+            <para>
+              <link linkend="repmgr-standby-clone">repmgr standby clone</link>:
+              fix issue with cloning from Barman where the tablespace mapping file was
+              not flushed to disk before attempting to retrieve files from Barman. GitHub #650.
+            </para>
+          </listitem>
+          <listitem>
+            <para>
+              <link linkend="repmgr-node-rejoin">repmgr node rejoin</link>:
+              ensure that when verifying a standby node has attached to its upstream, the
+              node has started streaming before confirming the success of the rejoin operation.
+            </para>
+          </listitem>
+          <listitem>
+            <para>
+              &repmgrd;: ensure primary connection is reset if same as upstream. GitHub #633.
+            </para>
+          </listitem>
+       </itemizedlist>
+      </para>
+    </sect2>
+
+  </sect1>
+
+  <sect1 id="release-5.1.0">
+    <title>Release 5.1.0</title>
+    <para><emphasis>Mon 13 April, 2020</emphasis></para>
+
+    <para>
+      &repmgr; 5.1.0 is a major release.
+    </para>
+    <para>
+      For details on how to upgrade an existing &repmgr; installation, see
+      documentation section <link linkend="upgrading-major-version">Upgrading a major version release</link>.
+    </para>
+    <para>
+      If &repmgrd; is in use, a PostgreSQL restart <emphasis>is</emphasis> required;
+      in that case we suggest combining this &repmgr; upgrade with the next PostgreSQL
+      minor release, which will require a PostgreSQL restart in any case.
+    </para>
+
+
+    <sect2>
+      <title>Compatibility changes</title>
+      <para>
+        The <link linkend="repmgr-standby-clone"><command>repmgr standby clone</command></link>
+        <option>--recovery-conf-only</option> option has been renamed to
+        <option>--replication-conf-only</option>. <option>--recovery-conf-only</option> will
+        still be accepted as an alias.
+      </para>
+    </sect2>
+
+    <sect2>
+      <title>General improvements</title>
+      <para>
+        <itemizedlist>
+
+          <listitem>
+            <para>
+              The requirement that the &repmgr; user is a database superuser has been
+              removed as far as possible.
+            </para>
+            <para>
+              In theory, &repmgr; can be operated with a normal database user for managing
+              the &repmgr; database, and a separate replication user for managing replication
+              connections (and replication slots, if these are in use).
+            </para>
+            <para>
+              Some operations will still require superuser permissions, e.g. for issuing
+              a <command>CHECKPOINT</command> as par of a switchover operation; in this case
+              a valid superuser should be provided with the <option>-S</option>/<option>--superuser</option>
+              option.
+            </para>
+          </listitem>
+
+          <listitem>
+            <para>
+              <link linkend="repmgr-standby-clone"><command>repmgr standby clone</command></link>:
+              Warn if neither of data page checksums or <option>wal_log_hints</option> are active,
+              as this will preclude later usage of <command>pg_rewind</command>.
+            </para>
+          </listitem>
+
+          <listitem>
+            <para>
+              <link linkend="repmgr-standby-promote"><command>repmgr standby promote</command></link>:
+              when executed with <option>--dry-run</option>, the method which would be used to promote the node
+              will be displayed.
+            </para>
+          </listitem>
+
+          <listitem>
+            <para>
+              <link linkend="repmgr-standby-follow"><command>repmgr standby follow</command></link>:
+              Improve logging and checking of potential failure situations.
+            </para>
+          </listitem>
+
+          <listitem>
+            <para>
+              <link linkend="repmgr-standby-switchover"><command>repmgr standby switchover</command></link>:
+              Replication configuration files (PostgreSQL 11 and earlier:
+              <filename>recovery.conf</filename>; PostgreSQL 12 and later: <filename>postgresql.auto.conf</filename>)
+              will be checked to ensure they are owned by the same user who owns the PostgreSQL
+              data directory.
+            </para>
+          </listitem>
+
+          <listitem>
+            <para>
+              <link linkend="repmgr-standby-switchover"><command>repmgr standby switchover</command></link>:
+              Provide additional information in <option>--dry-run mode</option> output.
+            </para>
+          </listitem>
+
+          <listitem>
+            <para>
+              <link linkend="repmgr-standby-switchover"><command>repmgr standby switchover</command></link>:
+              Checks that the demotion candidate's registered repmgr.conf file can be found, to
+              prevent confusing references to an incorrectly configured data directory. GitHub 615.
+            </para>
+          </listitem>
+
+          <listitem>
+            <para>
+              <link linkend="repmgr-node-check"><command>repmgr node check</command></link>:
+              accept option <option>-S</option>/<option>--superuser</option>. GitHub #621.
+            </para>
+          </listitem>
+
+          <listitem>
+            <para>
+              <link linkend="repmgr-node-check"><command>repmgr node check</command></link>:
+              add  <option>--upstream</option> option to check whether the node is attached
+              to the expected upstream node.
+            </para>
+          </listitem>
+
+        </itemizedlist>
+      </para>
+    </sect2>
+
+    <sect2>
+      <title>Bug fixes</title>
+      <para>
+       <itemizedlist>
+          <listitem>
+            <para>
+              Ensure <link linkend="repmgr-node-rejoin"><command>repmgr node rejoin</command></link>
+              checks for available replication slots on the rejoin target.
+            </para>
+          </listitem>
+
+          <listitem>
+            <para>
+              <link linkend="repmgr-standby-follow"><command>repmgr standby follow</command></link> and
+              <link linkend="repmgr-node-rejoin"><command>repmgr node rejoin</command></link> will now return
+              an error code if the operation fails if a replication slot is not available or cannot
+              be created on the follow/rejoin target.
+            </para>
+          </listitem>
+
+
+          <listitem>
+            <para>
+              <link linkend="repmgr-standby-promote"><command>repmgr standby promote</command></link>:
+              in <option>--dry-run mode</option>, display promote command which will be executed.
+            </para>
+          </listitem>
+
+
+          <listitem>
+            <para>
+              <link linkend="repmgr-standby-promote"><command>repmgr standby promote</command></link>
+              will check if the <literal>repmgr</literal> user has permission to execute
+              <function>pg_promote()</function> and fall back to <command>pg_ctl promote</command> if
+              necessary.
+            </para>
+          </listitem>
+
+          <listitem>
+            <para>
+              <link linkend="repmgr-standby-switchover"><command>repmgr standby switchover</command></link>:
+              check for demotion candidate reattachment as late as possible to avoid spurious failure
+              reports.
+            </para>
+          </listitem>
+
+
+          <listitem>
+            <para>
+              &repmgrd;: check for presence of <option>promote_command</option> and
+              <option>follow_command</option> on receipt of <literal>SIGHUP</literal>. GitHub 614.
+            </para>
+          </listitem>
+
+          <listitem>
+            <para>
+              Fix situation where replication connections were not created correctly, which
+              could lead to spurious replication connection failures in some situations, e.g.
+              where password files are used.
+            </para>
+          </listitem>
+
+          <listitem>
+            <para>
+              Ensure <filename>postgresql.auto.conf</filename> is created with
+              correct permissions (PostgreSQL 12 and later).
+            </para>
+          </listitem>
+
+        </itemizedlist>
+      </para>
+    </sect2>
+
+  </sect1>
 
   <sect1 id="release-5.0">
-    <title id="release-current">Release 5.0</title>
-    <para><emphasis>?? September ??, 2019</emphasis></para>
+    <title>Release 5.0</title>
+    <para><emphasis>Tue 15 October, 2019</emphasis></para>
 
     <para>
       &repmgr; 5.0 is a major release.
@@ -167,6 +878,10 @@ conninfo='host=node1 user=repmgr dbname=repmgr connect_timeout=2'</programlistin
               function, which enables a standby to be promoted to primary using an SQL
               command.
             </para>
+            <para>
+              For an overview of general changes to replication configuration, see this blog entry:
+              <ulink url="https://www.2ndquadrant.com/en/blog/replication-configuration-changes-in-postgresql-12/">Replication configuration changes in PostgreSQL 12</ulink>
+            </para>
           </listitem>
 
 
@@ -261,7 +976,7 @@ conninfo='host=node1 user=repmgr dbname=repmgr connect_timeout=2'</programlistin
 
   <sect1 id="release-4.4">
     <title>Release 4.4</title>
-    <para><emphasis>27 June, 2019</emphasis></para>
+    <para><emphasis>Thu 27 June, 2019</emphasis></para>
 
     <para>
       &repmgr; 4.4 is a major release.
@@ -724,7 +1439,7 @@ REPMGRD_OPTS="--daemonize=false"</programlisting>
             </para>
             <para>
               Possible values are <literal>ping</literal> (default; uses <command>PQping()</command> to
-              determine server availability), <literal>connection</literal> (attempst to make a new connection to
+              determine server availability), <literal>connection</literal> (attempts to make a new connection to
               the upstream node), and <literal>query</literal> (determines server availability
               by executing an SQL statement on the node via the existing connection).
             </para>

doc/appendix-support.xml

@@ -7,20 +7,20 @@
   </indexterm>
 
   <para>
-    <ulink url="https://2ndquadrant.com/">2ndQuadrant</ulink> provides 24x7
+    <ulink url="https://www.enterprisedb.com/">EDB</ulink> provides 24x7
     production support for &repmgr; and other PostgreSQL
     products, including configuration assistance, installation
     verification and training for running a robust replication cluster.
   </para>
   <para>
-    For further details see: <ulink url="https://2ndquadrant.com/en/support/">https://2ndquadrant.com/en/support/</ulink>
+    For further details see: <ulink url="https://www.enterprisedb.com/support/postgresql-support-overview-get-the-most-out-of-postgresql">Support Center</ulink>
   </para>
 
   <para>
     A mailing list/forum is provided via Google groups to discuss contributions or issues: <ulink url="https://groups.google.com/group/repmgr">https://groups.google.com/group/repmgr</ulink>.
   </para>
   <para>
-    Please report bugs and other issues to: <ulink url="https://github.com/2ndQuadrant/repmgr">https://github.com/2ndQuadrant/repmgr</ulink>.
+    Please report bugs and other issues to: <ulink url="https://github.com/EnterpriseDB/repmgr">https://github.com/EnterpriseDB/repmgr</ulink>.
   </para>
 
   <important>
@@ -43,6 +43,12 @@
 
     <itemizedlist spacing="compact" mark="bullet">
 
+     <listitem>
+      <simpara>
+        PostgreSQL version
+      </simpara>
+     </listitem>
+
      <listitem>
       <simpara>
         &repmgr; version
@@ -58,7 +64,7 @@
 
      <listitem>
       <simpara>
-        <filename>repmpgr.conf</filename> files (suitably anonymized if necessary)
+        <filename>repmgr.conf</filename> files (suitably anonymized if necessary)
       </simpara>
      </listitem>
 
@@ -68,9 +74,18 @@
       </simpara>
      </listitem>
 
+
      <listitem>
       <simpara>
-        PostgreSQL version
+        PostgreSQL 11 and earlier: contents of the <filename>recovery.conf</filename> file
+        (suitably anonymized if necessary).
+      </simpara>
+     </listitem>
+     <listitem>
+      <simpara>
+        PostgreSQL 12 and later: contents of the <filename>postgresql.auto.conf</filename> file
+        (suitably anonymized if necessary), and whether or not the PostgreSQL data directory
+        contains the files <filename>standby.signal</filename> and/or <filename>recovery.signal</filename>.
       </simpara>
      </listitem>
 
@@ -90,8 +105,8 @@
     </para>
     <para>
       In all cases it is <emphasis>extremely</emphasis> useful to receive
-      information on how to reliably reproduce an issue with as much detail as
-      possible.
+      as much detail as possible on how to reliably reproduce
+      an issue.
     </para>
 
   </sect1>

doc/bdr-failover.md

@@ -1,8 +0,0 @@
-BDR failover with repmgrd
-=========================
-
-This document has been integrated into the main `repmgr` documentation
-and is now located here:
-
-> [BDR failover with repmgrd](https://repmgr.org/docs/current/repmgrd-bdr.html)
-

doc/cloning-standbys.xml

@@ -15,7 +15,7 @@
 
    <para>
     <xref linkend="repmgr-standby-clone"/> can use
-    <ulink url="https://www.2ndquadrant.com/">2ndQuadrant</ulink>'s
+    <ulink url="https://www.enterprisedb.com/">EDB</ulink>'s
     <ulink url="https://www.pgbarman.org/">Barman</ulink> application
     to clone a standby (and also as a fallback source for WAL files).
    </para>
@@ -46,6 +46,7 @@
       <para>
        WAL management on the primary becomes much easier as there's no need
        to use replication slots, and <varname>wal_keep_segments</varname>
+       (PostgreSQL 13 and later: <varname>wal_keep_size</varname>)
        does not need to be set.
      </para>
     </listitem>
@@ -64,8 +65,9 @@
     </para>
     <para>
       Barman's parallel restore facility can be used by executing it manually on
-      the Barman server and integrating the resulting cloned standby using
-      <command><link linkend="repmgr-standby-clone">repmgr standby clone --recovery-conf-only</link></command>.
+      the Barman server and configuring replication on the resulting cloned
+      standby using
+      <command><link linkend="repmgr-standby-clone">repmgr standby clone --replication-conf-only</link></command>.
     </para>
    </note>
 
@@ -103,15 +105,28 @@
      <filename>repmgr.conf</filename> should contain the following entries:
     <programlisting>
     barman_host='barman@barmansrv'
-    barman_server='somedb'</programlisting>
+    barman_server='pg'</programlisting>
+   </para>
+   <para>
+     Here <literal>pg</literal> corresponds to a section in Barman's configuration file for a specific
+     server backup configuration, which would look something like:
+     <programlisting>
+[pg]
+description = "Main cluster"
+...
+     </programlisting>
+   </para>
+   <para>
+     More details on Barman configuration can be found in the
+     <ulink url="https://docs.pgbarman.org/">Barman documentation</ulink>'s
+     <ulink url="https://docs.pgbarman.org/#configuration">configuration section</ulink>.
    </para>
-
    <note>
     <para>
      To use a non-default Barman configuration file on the Barman server,
      specify this in <filename>repmgr.conf</filename> with <filename>barman_config</filename>:
      <programlisting>
-      barman_config=/path/to/barman.conf</programlisting>
+      barman_config='/path/to/barman.conf'</programlisting>
     </para>
    </note>
 
@@ -133,6 +148,15 @@
       section in <command>man 5 ssh_config</command> for more details.
     </simpara>
    </tip>
+   <para>
+     If you wish to place WAL files in a location outside the main
+     PostgreSQL data directory, set <option>--waldir</option>
+     (PostgreSQL 9.6 and earlier: <option>--xlogdir</option>) in
+     <option>pg_basebackup_options</option> to the target directory
+     (must be an absolute filepath). &repmgr; will create and
+     symlink to this directory in exactly the same way
+     <application>pg_basebackup</application> would.
+   </para>
    <para>
     It's now possible to clone a standby from Barman, e.g.:
     <programlisting>
@@ -173,7 +197,7 @@
    <para>
     As a fallback in case streaming replication is interrupted, PostgreSQL can optionally
     retrieve WAL files from an archive, such as that provided by Barman. This is done by
-    setting <varname>restore_command</varname> in <filename>recovery.conf</filename> to
+    setting <varname>restore_command</varname> in the replication configuration to
     a valid shell command which can retrieve a specified WAL file from the archive.
    </para>
    <para>
@@ -189,8 +213,8 @@
     <filename>repmgr.conf</filename> should include the following lines:
     <programlisting>
     barman_host='barman@barmansrv'
-    barman_server='somedb'
-    restore_command='/usr/bin/barman-wal-restore barmansrv somedb %f %p'</programlisting>
+    barman_server='pg'
+    restore_command='/usr/bin/barman-wal-restore barmansrv pg %f %p'</programlisting>
    </para>
    <note>
     <simpara>
@@ -220,7 +244,8 @@
     that any standby connected to the primary using a replication slot will always
     be able to retrieve the required WAL files. This removes the need to manually
     manage WAL file retention by estimating the number of WAL files that need to
-    be maintained on the primary using <varname>wal_keep_segments</varname>.
+    be maintained on the primary using <varname>wal_keep_segments</varname>
+    (PostgreSQL 13 and later: <varname>wal_keep_size</varname>).
     Do however be aware that if a standby is disconnected, WAL will continue to
     accumulate on the primary until either the standby reconnects or the replication
     slot is dropped.
@@ -274,7 +299,7 @@
      build up indefinitely, possibly leading to server failure.
     </simpara>
     <simpara>
-     As an alternative we recommend using 2ndQuadrant's <ulink url="https://www.pgbarman.org/">Barman</ulink>,
+     As an alternative we recommend using EDB's <ulink url="https://www.pgbarman.org/">Barman</ulink>,
      which offloads WAL management to a separate server, removing the requirement to use a replication
      slot for each individual standby to reserve WAL. See section <xref linkend="cloning-from-barman"/>
      for more details on using &repmgr; together with Barman.
@@ -294,7 +319,7 @@
     Cascading replication, introduced with PostgreSQL 9.2, enables a standby server
     to replicate from another standby server rather than directly from the primary,
     meaning replication changes "cascade" down through a hierarchy of servers. This
-    can be used to reduce load on the primary and minimize bandwith usage between
+    can be used to reduce load on the primary and minimize bandwidth usage between
     sites. For more details, see the
     <ulink url="https://www.postgresql.org/docs/current/warm-standby.html#CASCADING-REPLICATION">
     PostgreSQL cascading replication documentation</ulink>.
@@ -303,9 +328,9 @@
     &repmgr; supports cascading replication. When cloning a standby,
     set the command-line parameter <literal>--upstream-node-id</literal> to the
     <varname>node_id</varname> of the server the standby should connect to, and
-    &repmgr; will create <filename>recovery.conf</filename> to point to it. Note
+    &repmgr; will create a replication configuration file to point to it. Note
     that if <literal>--upstream-node-id</literal> is not explicitly provided,
-    &repmgr; will set the standby's <filename>recovery.conf</filename> to
+    &repmgr; will set the standby's replication configuration to
     point to the primary node.
    </para>
    <para>
@@ -366,8 +391,8 @@
      cluster, you may wish to clone a downstream standby whose upstream node
      does not yet exist. In this case you can clone from the primary (or
      another upstream node); provide the parameter <literal>--upstream-conninfo</literal>
-     to explictly set the upstream's <varname>primary_conninfo</varname> string
-     in <filename>recovery.conf</filename>.
+     to explicitly set the upstream's <varname>primary_conninfo</varname> string
+     in the replication configuration.
     </simpara>
    </tip>
  </sect1>
@@ -424,6 +449,13 @@
       WAL directory. Any WALs generated during the cloning process will be copied here, and
       a symlink will automatically be created from the main data directory.
     </para>
+    <tip>
+      <para>
+        The <literal>--waldir</literal> (<literal>--xlogdir</literal>) option,
+        if present in <varname>pg_basebackup_options</varname>, will be honoured by &repmgr;
+        when cloning from Barman (&repmgr; 5.2 and later).
+      </para>
+    </tip>
     <para>
      See the <ulink url="https://www.postgresql.org/docs/current/app-pgbasebackup.html">PostgreSQL pg_basebackup documentation</ulink>
      for more details of available options.
@@ -444,10 +476,8 @@
 
     <para>
      The recommended way to do this is to store the password in the <literal>postgres</literal> system
-     user's <filename>~/.pgpass</filename> file. It's also possible to store the password in the
-     environment variable <varname>PGPASSWORD</varname>, however this is not recommended for
-     security reasons. For more details see the
-     <ulink url="https://www.postgresql.org/docs/current/libpq-pgpass.html">PostgreSQL password file documentation</ulink>.
+     user's <filename>~/.pgpass</filename> file.  For more information on using the password file, see
+     the documentation section <xref linkend="configuration-password-file"/>.
     </para>
 
     <note>
@@ -461,27 +491,14 @@
     </note>
 
     <para>
-     If, for whatever reason, you wish to include the password in <filename>recovery.conf</filename>,
+     If, for whatever reason, you wish to include the password in the replication configuration file,
      set <varname>use_primary_conninfo_password</varname> to <literal>true</literal> in
      <filename>repmgr.conf</filename>. This will read a password set in <varname>PGPASSWORD</varname>
      (but not <filename>~/.pgpass</filename>) and place it into the <varname>primary_conninfo</varname>
-     string in <filename>recovery.conf</filename>. Note that <varname>PGPASSWORD</varname>
-     will need to be set during any action which causes <filename>recovery.conf</filename> to be
+     string in the replication configuration. Note that <varname>PGPASSWORD</varname>
+     will need to be set during any action which causes the replication configuration file to be
      rewritten, e.g. <xref linkend="repmgr-standby-follow"/>.
     </para>
-    <para>
-     It is of course also possible to include the password value in the <varname>conninfo</varname>
-     string for each node, but this is obviously a security risk and should be avoided.
-    </para>
-    <para>
-      From PostgreSQL 9.6, <application>libpq</application> supports the <varname>passfile</varname>
-      parameter in connection strings, which can be used to specify a password file other than
-      the default <filename>~/.pgpass</filename>.
-    </para>
-    <para>
-      To have &repmgr; write a custom password file in <varname>primary_conninfo</varname>,
-      specify its location in <varname>passfile</varname> in <filename>repmgr.conf</filename>.
-    </para>
    </sect2>
 
    <sect2 id="cloning-advanced-replication-user" xreflabel="Separate replication user">
@@ -491,12 +508,40 @@
      user (in addition to the user who manages the &repmgr; metadata). In this case,
      the replication user should be set in <filename>repmgr.conf</filename> via the parameter
      <varname>replication_user</varname>; &repmgr; will use this value when making
-     replication connections and generating <filename>recovery.conf</filename>. This
+     replication connections and generating the replication configuration. This
      value will also be stored in the parameter <literal>repmgr.nodes</literal>
      table for each node; it no longer needs to be explicitly specified when
      cloning a node or executing <xref linkend="repmgr-standby-follow"/>.
     </para>
    </sect2>
+
+
+   <sect2 id="cloning-advanced-tablespace-mapping" xreflabel="Tablespace mapping">
+    <title>Tablespace mapping</title>
+    <indexterm>
+      <primary>tablespace mapping</primary>
+    </indexterm>
+    <para>
+      &repmgr; provides a <option>tablespace_mapping</option> configuration
+      file option, which will makes it possible to map the tablespace on the source node to
+      a different location on the local node.
+    </para>
+    <para>
+      To use this, add <option>tablespace_mapping</option> to <filename>repmgr.conf</filename>
+      like this:
+<programlisting>
+  tablespace_mapping='/var/lib/pgsql/tblspc1=/data/pgsql/tblspc1'
+</programlisting>
+    </para>
+    <para>
+      where the left-hand value represents the tablespace on the source node,
+      and the right-hand value represents  the tablespace on the standby to be cloned.
+    </para>
+    <para>
+      This parameter can be provided multiple times.
+    </para>
+   </sect2>
+
  </sect1>
 
 

doc/configuration-file-optional-settings.xml

@@ -7,6 +7,14 @@
     <secondary>optional settings</secondary>
   </indexterm>
 
+  <note>
+    <simpara>
+      This section documents a subset of optional configuration settings; for a full
+      for a full and annotated view of all configuration options see the
+      see the <ulink url="https://raw.githubusercontent.com/EnterpriseDB/repmgr/master/repmgr.conf.sample">sample repmgr.conf file</ulink>
+    </simpara>
+  </note>
+
   <variablelist>
 
 
@@ -66,17 +74,8 @@
       </term>
       <listitem>
         <para>
-          Must be one of <literal>physical</literal> (for standard streaming replication)
-          or <literal>bdr</literal>.
+          Must be <literal>physical</literal> (the default).
         </para>
-        <note>
-          <para>
-	    Replication type <literal>bdr</literal> can only be used with BDR 2.x
-          </para>
-          <para>
-            BDR 3.x users should use <literal>physical</literal>.
-          </para>
-        </note>
       </listitem>
     </varlistentry>
 
@@ -119,6 +118,72 @@
       </listitem>
     </varlistentry>
 
+    <varlistentry id="repmgr-conf-ssh-options" xreflabel="ssh_options">
+      <term><varname>ssh_options</varname> (<type>string</type>)
+        <indexterm>
+          <primary><varname>ssh_options</varname> configuration file parameter</primary>
+        </indexterm>
+      </term>
+      <listitem>
+        <para>
+          Options to append to the <command>ssh</command> command when executed
+          by &repmgr;.
+        </para>
+        <para>
+          We recommend adding <literal>-q</literal> to suppress any superfluous
+          SSH chatter such as login banners, and also an explicit
+          <option>ConnectTimeout</option> value,
+          e.g.:
+<programlisting>
+ssh_options='-q -o ConnectTimeout=10'</programlisting>
+        </para>
+      </listitem>
+    </varlistentry>
 
+    <varlistentry id="repmgr-conf-pg-bindir" xreflabel="pg_bindir">
+      <term><varname>pg_bindir</varname> (<type>string</type>)
+        <indexterm>
+          <primary><varname>pg_bindir</varname> configuration file parameter</primary>
+        </indexterm>
+      </term>
+      <listitem>
+        <para>
+          Path to the PostgreSQL binary directory (location of <application>pg_ctl</application>,
+          <application>pg_basebackup</application> etc.). Only required
+	  if these are not in the system <varname>PATH</varname>.
+        </para>
+        <tip>
+          <para>
+            When &repmgr; is executed via <application>SSH</application> (e.g. when running
+            <command><link linkend="repmgr-standby-switchover">repmgr standby switchover</link></command>,
+            <command><link linkend="repmgr-cluster-matrix">repmgr cluster matrix</link></command> or
+            <command><link linkend="repmgr-cluster-crosscheck">repmgr cluster crosscheck</link></command>,
+            or if it is executed as cronjob), a login shell will not be used and only the
+            default system <varname>PATH</varname> will be set. Therefore it's recommended to set
+            <varname>pg_bindir</varname> so &repmgr; can correctly invoke binaries on a remote
+            system and avoid potential path issues.
+          </para>
+        </tip>
+
+        <para>
+          Debian/Ubuntu users: you will probably need to  set this to the directory where
+          <application>pg_ctl</application> is located, e.g. <filename>/usr/lib/postgresql/9.6/bin/</filename>.
+        </para>
+        <para>
+          <emphasis>NOTE</emphasis>: <varname>pg_bindir</varname> is only used when &repmgr; directly
+	  executes PostgreSQL binaries; any user-defined scripts
+	  <emphasis>must</emphasis> be specified with the full path.
+        </para>
+
+      </listitem>
+    </varlistentry>
   </variablelist>
+
+  <tip>
+    <simpara>
+      See the <ulink url="https://raw.githubusercontent.com/EnterpriseDB/repmgr/master/repmgr.conf.sample">sample repmgr.conf file</ulink>
+      for a full and annotated view of all configuration options.
+    </simpara>
+  </tip>
+
 </sect1>

doc/configuration-file-required-settings.xml

@@ -96,6 +96,9 @@
   </variablelist>
  </para>
 
+ <para>
+   See <xref linkend="configuration-file-optional-settings"/> for further configuration options.
+ </para>
 
 
 </sect1>

doc/configuration-file-service-commands.xml

@@ -27,7 +27,9 @@
   <note>
     <para>
       If using <application>systemd</application>, ensure you have <varname>RemoveIPC</varname> set to <literal>off</literal>.
-      See the <ulink url="https://wiki.postgresql.org/wiki/Systemd">systemd</ulink>
+      See the <ulink url="https://www.postgresql.org/docs/current/index.html">PostgreSQL documentation</ulink> section
+      <ulink url="https://www.postgresql.org/docs/current/kernel-resources.html#SYSTEMD-REMOVEIPC">systemd RemoveIPC</ulink>
+      and also the <ulink url="https://wiki.postgresql.org/wiki/Systemd">systemd</ulink>
       entry in the <ulink url="https://wiki.postgresql.org/wiki/Main_Page">PostgreSQL wiki</ulink> for details.
     </para>
   </note>

doc/configuration-file.xml

@@ -80,6 +80,51 @@ conninfo='host=node1 user=repmgr dbname=repmgr connect_timeout=2'</programlistin
       </para>
     </note>
 
+
+    <sect3 id="configuration-file-include-directives" xreflabel="configuration file include directives">
+
+      <title>Configuration file include directives</title>
+
+      <indexterm>
+        <primary>repmgr.conf</primary>
+        <secondary>include directives</secondary>
+      </indexterm>
+      <para>
+        From &repmgr; 5.2, the configuration file can contain the following include directives:
+        <itemizedlist spacing="compact" mark="bullet">
+          <listitem>
+            <simpara>
+              <option>include</option>: include the specified file,
+              either as an absolute path or path relative to the current file
+            </simpara>
+          </listitem>
+
+          <listitem>
+            <simpara>
+              <option>include_if_exists</option>: include the specified file.
+              The file is specified as an absolute path or path relative to the current file.
+              However, if it does not exist, an error will not be raised.
+            </simpara>
+          </listitem>
+
+          <listitem>
+            <simpara>
+              <option>include_dir</option>: include files in the specified directory
+              which have the <filename>.conf</filename> suffix.
+              The directory is specified either as an absolute path or path
+              relative to the current file
+            </simpara>
+          </listitem>
+
+        </itemizedlist>
+      </para>
+      <para>
+        These behave in exactly the same way as the PostgreSQL configuration file processing;
+        see the <ulink url="https://www.postgresql.org/docs/current/config-setting.html#CONFIG-INCLUDES">PostgreSQL documentation</ulink>
+        for additional details.
+      </para>
+    </sect3>
+
   </sect2>
 
 
@@ -119,7 +164,7 @@ conninfo='host=node1 user=repmgr dbname=repmgr connect_timeout=2'</programlistin
     </para>
     <para>
       For a full list of annotated configuration items, see the file
-      <ulink url="https://raw.githubusercontent.com/2ndQuadrant/repmgr/master/repmgr.conf.sample">repmgr.conf.sample</ulink>.
+      <ulink url="https://raw.githubusercontent.com/EnterpriseDB/repmgr/master/repmgr.conf.sample">repmgr.conf.sample</ulink>.
     </para>
     <para>
       For &repmgrd;-specific settings, see <xref linkend="repmgrd-configuration"/>.
@@ -182,6 +227,14 @@ conninfo='host=node1 user=repmgr dbname=repmgr connect_timeout=2'</programlistin
    </itemizedlist>
   </para>
 
+  <para>
+    In examples provided in this documentation, it is assumed the configuration file is located
+    at <filename>/etc/repmgr.conf</filename>. If &repmgr; is installed from a package, the
+    configuration file will probably be located at another location specified by the packager;
+    see appendix <xref linkend="appendix-packages"/> for configuration file locations in
+    different packaging systems.
+  </para>
+
   <para>
    Note that if a file is explicitly specified with <literal>-f/--config-file</literal>,
    an error will be raised if it is not found or not readable, and no attempt will be made to
@@ -202,6 +255,61 @@ conninfo='host=node1 user=repmgr dbname=repmgr connect_timeout=2'</programlistin
       <filename>/path/to/repmgr.conf</filename>).
     </para>
    </note>
+  </sect2>
+
+  <sect2 id="configuration-file-postgresql-major-upgrades" xreflabel="configuration file and PostgreSQL major version upgrades">
+    <title>Configuration file and PostgreSQL major version upgrades</title>
+
+    <indexterm>
+      <primary>repmgr.conf</primary>
+      <secondary>PostgreSQL major version upgrades</secondary>
+    </indexterm>
+
+    <para>
+      When upgrading the PostgreSQL cluster to a new major version, <filename>repmgr.conf</filename>
+      will probably needed to be updated.
+    </para>
+    <para>
+      Usually <option>pg_bindir</option> and <option>data_directory</option> will need to be modified,
+      particularly if the default package locations are used, as these usually change.
+    </para>
+
+     <para>
+       It's also possible the location of <filename>repmgr.conf</filename> itself will change
+       (e.g. from <filename>/etc/repmgr/11/repmgr.conf</filename> to <filename>/etc/repmgr/12/repmgr.conf</filename>).
+       This is stored as part of the &repmgr; metadata and is used by &repmgr; to execute &repmgr; remotely
+       (e.g. during a <link linkend="performing-switchover">switchover operation</link>).
+     </para>
+     <para>
+       If the content and/or location of <filename>repmgr.conf</filename> has changed, the &repmgr; metadata
+       needs to be updated to reflect this. The &repmgr; metadata can be updated on each node with:
+       <itemizedlist spacing="compact" mark="bullet">
+         <listitem>
+           <simpara>
+             <link linkend="repmgr-primary-register">
+               <command>repmgr primary register --force -f /path/to/repmgr.conf</command>
+             </link>
+           </simpara>
+         </listitem>
+
+         <listitem>
+           <simpara>
+             <link linkend="repmgr-standby-register">
+               <command>repmgr standby register --force -f /path/to/repmgr.conf</command>
+             </link>
+           </simpara>
+         </listitem>
+
+
+         <listitem>
+           <simpara>
+             <link linkend="repmgr-witness-register">
+               <command>repmgr witness register --force -f /path/to/repmgr.conf -h primary_host</command>
+             </link>
+           </simpara>
+         </listitem>
+       </itemizedlist>
+     </para>
 
    </sect2>
  </sect1>

doc/configuration-password-management.xml

@@ -0,0 +1,175 @@
+<sect1 id="configuration-password-management" xreflabel="password management">
+
+  <title>Password Management</title>
+  <indexterm>
+    <primary>passwords</primary>
+  </indexterm>
+
+  <sect2 id="configuration-password-management-options" xreflabel="password management options">
+  <title>Password Management Options</title>
+  <indexterm>
+    <primary>passwords</primary>
+    <secondary>options for managing</secondary>
+  </indexterm>
+
+  <para>
+    For security purposes it's desirable to protect database access using a password.
+  </para>
+  <para>
+    PostgreSQL has three ways of providing a password:
+    <itemizedlist spacing="compact" mark="bullet">
+
+       <listitem>
+         <simpara>
+           including the password in the <option>conninfo</option> string
+           (e.g. &quot;<literal>host=node1 dbname=repmgr user=repmgr password=foo</literal>&quot;)
+         </simpara>
+       </listitem>
+
+       <listitem>
+         <simpara>
+           exporting the password as an environment variable (<envar>PGPASSWORD</envar>)
+         </simpara>
+       </listitem>
+
+       <listitem>
+         <simpara>
+           storing the password in a dedicated password file
+         </simpara>
+       </listitem>
+    </itemizedlist>
+  </para>
+  <para>
+    We strongly advise against including the password in the <option>conninfo</option> string, as
+    this will result in the database password being exposed in various places, including in the
+    <filename>repmgr.conf</filename> file, the <literal>repmgr.nodes</literal> table, any output
+    generated by &repmgr; which lists the node <option>conninfo</option> strings (e.g.
+    <link linkend="repmgr-cluster-show">repmgr cluster show</link>) and in the &repmgr; log file,
+    particularly at <option>log_level=DEBUG</option>.
+  </para>
+  <note>
+    <para>
+      Currently &repmgr; does not fully support use of the <option>password</option> option in the
+      <option>conninfo</option> string.
+    </para>
+  </note>
+  <para>
+    Exporting the password as an environment variable (<envar>PGPASSWORD</envar>) is considered
+    less insecure, but the PostgreSQL documentation explicitly recommends against doing this:
+   <blockquote>
+     <attribution><ulink url="https://www.postgresql.org/docs/current/libpq-envars.html">Environment Variables</ulink></attribution>
+     <para>
+       <envar>PGPASSWORD</envar> behaves the same as the <option>password</option>
+       connection parameter. Use of this environment variable
+       is not recommended for security reasons, as some operating systems
+       allow non-root users to see process environment variables via
+       <application>ps</application>; instead consider using a password file.
+     </para>
+    </blockquote>
+
+  </para>
+  <para>
+    The most secure option for managing passwords is to use a dedicated password file; see the following
+    section for more details.
+  </para>
+
+  </sect2>
+
+  <sect2 id="configuration-password-file" xreflabel="password file">
+    <title>Using a password file</title>
+    <indexterm>
+      <primary>pgpass</primary>
+    </indexterm>
+
+    <indexterm>
+      <primary>.pgpass</primary>
+    </indexterm>
+
+    <indexterm>
+      <primary>passwords</primary>
+      <secondary>using a password file</secondary>
+    </indexterm>
+
+    <para>
+      The most secure way of storing passwords is in a password file,
+      which by default is <filename>~/.pgpass</filename>. This file
+      can only be read by the system user who owns the file, and
+      PostgreSQL will refuse to use the file unless read/write
+      permissions are restricted to the file owner. The password(s)
+      contained in the file will not be directly accessed by
+      &repmgr; (or any other libpq-based client software such as <application>psql</application>).
+    </para>
+    <para>
+       For full details see the
+       <ulink url="https://www.postgresql.org/docs/current/libpq-pgpass.html">PostgreSQL password file documentation</ulink>.
+    </para>
+    <para>
+      For use with &repmgr;, the <filename>~/.pgpass</filename> must two entries for each
+      node in the replication cluster: one for the &repmgr; user who accesses the &repmgr; metadatabase,
+      and one for replication connections (regardless of whether a dedicated replication user is used).
+      The file must be present on each node in the replication cluster.
+    </para>
+    <para>
+      A <filename>~/.pgpass</filename> file for a 3-node cluster where the <literal>repmgr</literal> database user
+      is used for both for accessing the  &repmgr; metadatabase and for replication connections would look like this:
+      <programlisting>
+node1:5432:repmgr:repmgr:foo
+node1:5432:replication:repmgr:foo
+node2:5432:repmgr:repmgr:foo
+node2:5432:replication:repmgr:foo
+node3:5432:repmgr:repmgr:foo
+node3:5432:replication:repmgr:foo</programlisting>
+      If a dedicated replication user (here: <literal>repluser</literal>) is in use, the file would look like this:
+      <programlisting>
+node1:5432:repmgr:repmgr:foo
+node1:5432:replication:repluser:foo
+node2:5432:repmgr:repmgr:foo
+node2:5432:replication:repluser:foo
+node3:5432:repmgr:repmgr:foo
+node3:5432:replication:repluser:foo</programlisting>
+      If you are planning to use the <option>-S</option>/<option>--superuser</option> option,
+      there must also be an entry enabling the superuser to connect to the &repmgr; database.
+      Assuming the superuser is <literal>postgres</literal>, the file would look like this:
+        <programlisting>
+node1:5432:repmgr:repmgr:foo
+node1:5432:repmgr:postgres:foo
+node1:5432:replication:repluser:foo
+node2:5432:repmgr:repmgr:foo
+node2:5432:repmgr:postgres:foo
+node2:5432:replication:repluser:foo
+node3:5432:repmgr:repmgr:foo
+node3:5432:repmgr:postgres:foo
+node3:5432:replication:repluser:foo</programlisting>
+    </para>
+
+    <para>
+      The <filename>~/.pgpass</filename> file can be simplified with the use of wildcards if
+      there is no requirement to restrict provision of passwords to particular hosts, ports
+      or databases. The preceding file could then be formatted like this:
+        <programlisting>
+*:*:*:repmgr:foo
+*:*:*:postgres:foo
+</programlisting>
+    </para>
+
+    <note>
+      <para>
+        It's possible to specify an alternative location for the <filename>~/.pgpass</filename> file, either via
+        the environment variable <envar>PGPASSFILE</envar>, or (from PostgreSQL 9.6) using the
+        <varname>passfile</varname> parameter in connection strings.
+      </para>
+      <para>
+        If using the <varname>passfile</varname> parameter, it's essential to ensure the file is in the same
+        location on all nodes, as when connecting to a remote node, the file referenced is the one on the
+        local node.
+      </para>
+      <para>
+        Additionally, you <emphasis>must</emphasis> specify the passfile location in <filename>repmgr.conf</filename>
+        with the <option>passfile</option> option so &repmgr; can write the correct path when creating the
+        <option>primary_conninfo</option> parameter for replication configuration on standbys.
+      </para>
+    </note>
+
+  </sect2>
+
+</sect1>

doc/configuration-permissions.xml

@@ -0,0 +1,192 @@
+<sect1 id="configuration-permissions" xreflabel="Database user permissions">
+  <title>repmgr database user permissions</title>
+
+  <indexterm>
+    <primary>configuration</primary>
+    <secondary>database user permissions</secondary>
+  </indexterm>
+
+  <para>
+    If the &repmgr; database user (the PostgreSQL user defined in the
+    <varname>conninfo</varname> setting is a superuser, no further user permissions need
+    to be granted.
+  </para>
+
+  <sect2 id="configuration-permissions-no-superuser" xreflabel="Non-super user permissions">
+    <title>repmgr user as a non-superuser</title>
+    <para>
+      In principle the &repmgr; database user does not need to be a superuser.
+      In this case the &repmgr; will need to be granted execution permissions on certain
+      functions, and membership of certain roles. However be aware that &repmgr; does
+      expect to be able to execute certain commands which are restricted to superusers;
+      in this case either a superuser must be specified with the <option>-S</option>/<option>--superuser</option>
+      (where available) option, or the corresponding action should be executed manually as a superuser.
+    </para>
+    <para>
+      The following sections describe the actions needed to use &repmgr; with a non-superuser,
+      and relevant caveats.
+    </para>
+    <sect3 id="configuration-permissions-replication" xreflabel="Replication role">
+      <title>Replication role</title>
+      <para>
+        &repmgr; requires a database user with the <literal>REPLICATION</literal> role
+        to be able to create a replication connection and (if configured) to administer
+        replication slots.
+      </para>
+      <para>
+        By default this is the database user defined in the <varname>conninfo</varname>
+        setting. This user can be:
+        <itemizedlist spacing="compact" mark="bullet">
+          <listitem>
+            <simpara>
+              a superuser
+            </simpara>
+          </listitem>
+          <listitem>
+            <simpara>
+              a non-superuser with the <literal>REPLICATION</literal> role
+            </simpara>
+          </listitem>
+          <listitem>
+            <simpara>
+              another user defined in the <filename>repmgr.conf</filename> parameter <varname>replication_user</varname> with the <literal>REPLICATION</literal> role
+            </simpara>
+          </listitem>
+        </itemizedlist>
+      </para>
+    </sect3>
+
+    <sect3 id="configuration-permissions-roles" xreflabel="Database roles for non-superusers">
+      <title>Database roles</title>
+      <para>
+        A non-superuser &repmgr; database user should be a member of the following
+        <ulink url="https://www.postgresql.org/docs/current/predefined-roles.html">predefined roles</ulink>
+        (PostgreSQL 10 and later):
+        <itemizedlist spacing="compact" mark="bullet">
+          <listitem>
+            <simpara>
+              <varname>pg_read_all_stats</varname>
+              (to read the <varname>status</varname> column of <literal>pg_stat_replication</literal>
+              and execute <function>pg_database_size()</function> on all databases)
+            </simpara>
+          </listitem>
+          <listitem>
+            <simpara>
+              <varname>pg_read_all_settings</varname> (to access the <varname>data_directory</varname> setting)
+            </simpara>
+          </listitem>
+        </itemizedlist>
+        Alternatively the meta-role <varname>pg_monitor</varname> can be granted, which includes membership
+        of the above predefined roles.
+      </para>
+      <para>
+        Membership of these roles can be granted with e.g. <command>GRANT pg_read_all_stats TO repmgr</command>.
+      </para>
+      <para>
+        Users of PostgreSQL 9.6 or earlier should upgrade to a supported PostgreSQL version, or provide
+        the <option>-S</option>/<option>--superuser</option> where available.
+      </para>
+    </sect3>
+
+    <sect3 id="configuration-permissions-extension" xreflabel="Extension creation">
+      <title>Extension creation</title>
+      <para>
+        &repmgr; requires that the database defined in the <varname>conninfo</varname>
+        setting contains the <literal>repmgr</literal> extension. The database user defined in the
+        <varname>conninfo</varname> setting must be able to access this database and
+        the database objects contained within the extension.
+      </para>
+      <para>
+        The <literal>repmgr</literal> extension can only be installed by a superuser.
+        If the &repmgr; user is a superuser, &repmgr; will create the extension automatically.
+      </para>
+
+      <para>
+        Alternatively, the extension can be created manually by a superuser
+        (with &quot;<command>CREATE EXTENSION repmgr</command>&quot;) before executing
+        <link linkend="repmgr-primary-register">repmgr primary register</link>.
+      </para>
+    </sect3>
+
+
+    <sect3 id="configuration-permissions-functions" xreflabel="Function permissions for non-superusers">
+      <title>Function permissions</title>
+      <para>
+        If the &repmgr; database user is not a superuser, <literal>EXECUTE</literal> permission should be
+        granted on the following function:
+        <itemizedlist spacing="compact" mark="bullet">
+          <listitem>
+            <simpara>
+              <function>pg_wal_replay_resume()</function> (required by &repmgrd; during failover operations;
+              if permission is not granted, the failoved process may not function reliably if a node
+              has WAL replay paused)
+            </simpara>
+          </listitem>
+          <listitem>
+            <simpara>
+              <function>pg_promote()</function> (PostgreSQL 12 and later; if permission is not granted,
+              &repmgr; will fall back to <command>pg_ctl promote</command>)
+            </simpara>
+          </listitem>
+        </itemizedlist>
+      </para>
+      <para>
+        <literal>EXECUTE</literal> permission on functions can be granted with e.g.:
+        <command>GRANT EXECUTE ON FUNCTION pg_catalog.pg_wal_replay_resume() TO repmgr</command>.
+      </para>
+    </sect3>
+
+    <sect3 id="configuration-permissions-superuser-required" xreflabel="repmgr actions requiring a superuser">
+      <title>repmgr actions requiring a superuser</title>
+      <para>
+        In some circumstances, &repmgr; may need to perform an operation which cannot be delegated to a
+        non-superuser.
+        <itemizedlist spacing="compact" mark="bullet">
+          <listitem>
+            <simpara>
+              The <command>CHECKPOINT</command> command is executed by
+              <link linkend="repmgr-standby-switchover">repmgr standby switchover</link>. This can only
+              be executed by a superuser; if the &repmgr; user is not a superuser,
+              the <option>-S</option>/<option>--superuser</option> should be used.
+            </simpara>
+            <simpara>
+              If &repmgr; is not able to execute <command>CHECKPOINT</command>,
+              there is a risk that the demotion candidate may not  be able to shut down as smoothly as might otherwise
+              have been the case.
+            </simpara>
+          </listitem>
+          <listitem>
+            <simpara>
+              The <command>ALTER SYSTEM</command> is executed by &repmgrd; if
+              <varname>standby_disconnect_on_failover</varname> is set to <literal>true</literal> in
+              <filename>repmgr.conf</filename>. <command>ALTER SYSTEM</command> can only be executed by
+              a superuser; if the &repmgr; user is not a superuser, this functionality will not be available.
+            </simpara>
+          </listitem>
+        </itemizedlist>
+      </para>
+    </sect3>
+
+    <sect3 id="configuration-permissions-superuser-option" xreflabel="repmgr commands with --superuser option">
+      <title>repmgr commands with --superuser option</title>
+      <para>
+        The following repmgr commands provide the <option>-S</option>/<option>--superuser</option> option:
+        <itemizedlist spacing="compact" mark="bullet">
+          <listitem>
+            <simpara><link linkend="repmgr-standby-clone">repmgr standby clone</link> (to be able to copy configuration files outside of the data directory if <option>--copy-external-config-files</option> provided)</simpara>
+          </listitem>
+          <listitem>
+            <simpara><link linkend="repmgr-standby-switchover">repmgr standby switchover</link> (to execute <command>CHECKPOINT</command>)</simpara>
+          </listitem>
+          <listitem>
+            <simpara><link linkend="repmgr-node-check">repmgr node check</link> (to execute <command>repmgr node check --data-directory-config</command>; note this is also called by <link linkend="repmgr-standby-switchover">repmgr standby switchover</link>)</simpara>
+          </listitem>
+          <listitem>
+            <simpara><link linkend="repmgr-node-service">repmgr node service</link> (to execute <command>CHECKPOINT</command> via the <option>--checkpoint</option>; note this is also called by <link linkend="repmgr-standby-switchover">repmgr standby switchover</link>)</simpara>
+          </listitem>
+        </itemizedlist>
+      </para>
+    </sect3>
+
+  </sect2>
+</sect1>

doc/configuration.xml

@@ -270,7 +270,7 @@
 
       <varlistentry>
 
-        <term><option>wal_keep_segments</option></term>
+        <term><option>wal_keep_segments</option> / <option>wal_keep_size</option></term>
 
         <listitem>
 
@@ -279,25 +279,36 @@
             <secondary>PostgreSQL configuration</secondary>
           </indexterm>
 
+
+          <indexterm>
+            <primary>wal_keep_size</primary>
+            <secondary>PostgreSQL configuration</secondary>
+          </indexterm>
+
           <para>
-            Normally there is no need to set <option>wal_keep_segments</option> (default: <literal>0</literal>), as it
-            is <emphasis>not</emphasis> a reliable way of ensuring that all required WAL segments are available to standbys.
-            Replication slots and/or an archiving solution such as Barman are recommended to ensure standbys have a reliable
+            Normally there is no need to set <option>wal_keep_segments</option>
+            (PostgreSQL 13 and later: <varname>wal_keep_size</varname>; default: <literal>0</literal>),
+            as it is <emphasis>not</emphasis> a reliable way of ensuring that all required WAL
+            segments are available to standbys. Replication slots and/or an archiving solution
+            such as Barman are recommended to ensure standbys have a reliable
             source of WAL segments at all times.
           </para>
           <para>
-            The only reason ever to set  <option>wal_keep_segments</option> is you have
-            you have configured <option>pg_basebackup_options</option>
+            The only reason ever to set  <option>wal_keep_segments</option> / <option>wal_keep_size</option>
+            is you have you have configured <option>pg_basebackup_options</option>
             in <filename>repmgr.conf</filename> to include the setting <literal>--wal-method=fetch</literal>
             (PostgreSQL 9.6 and earlier: <literal>--xlog-method=fetch</literal>)
             <emphasis>and</emphasis> you have <emphasis>not</emphasis> set <option>restore_command</option>
             in <filename>repmgr.conf</filename> to fetch WAL files from a reliable source such as Barman,
             in which case you'll need to set <option>wal_keep_segments</option>
             to a sufficiently high number to ensure that all WAL files required by the standby
-            are retained. However we do not recommend managing replication in this way.
+            are retained. However we do not recommend WAL retention in this way.
           </para>
           <para>
             PostgreSQL documentation: <ulink url="https://www.postgresql.org/docs/current/runtime-config-replication.html#GUC-WAL-KEEP-SEGMENTS">wal_keep_segments</ulink>.
+            <!--
+             PostgreSQL documentation: <ulink url="https://www.postgresql.org/docs/current/runtime-config-replication.html#GUC-WAL-KEEP-SIZE">wal_keep_size</ulink>.
+              -->
           </para>
         </listitem>
       </varlistentry>
@@ -318,23 +329,7 @@
   &configuration-file-optional-settings;
   &configuration-file-log-settings;
   &configuration-file-service-commands;
+  &configuration-permissions;
+  &configuration-password-management;
 
-  <sect1 id="configuration-permissions" xreflabel="Database user permissions">
-    <title>repmgr database user permissions</title>
-
-    <indexterm>
-      <primary>configuration</primary>
-      <secondary>database user permissions</secondary>
-    </indexterm>
-
-    <para>
-      &repmgr; will create an extension database containing objects
-      for administering &repmgr; metadata. The user defined in the <varname>conninfo</varname>
-      setting must be able to access all objects. Additionally, superuser permissions
-      are required to install the &repmgr; extension. The easiest way to do this
-      is create the &repmgr; user as a superuser, however if this is not
-      desirable, the &repmgr; user can be created as a normal user and a
-      superuser specified with <literal>--superuser</literal> when registering a &repmgr; node.
-    </para>
-  </sect1>
 </chapter>

doc/event-notifications.xml

@@ -95,7 +95,8 @@
  </para>
 
  <para>
-   The following parameters are provided for a subset of event notifications:
+   The following parameters are provided for a subset of event notifications; their meaning may
+   change according to context:
  </para>
 
  <variablelist>
@@ -108,6 +109,9 @@
     <para>
      node ID of the demoted primary (<xref linkend="repmgr-standby-switchover"/> only)
     </para>
+    <para>
+     node ID of the former primary (<literal>repmgrd_failover_promote</literal> only)
+    </para>
    </listitem>
   </varlistentry>
   <varlistentry>
@@ -117,10 +121,6 @@
      <literal>conninfo</literal> string of the primary node
      (<xref linkend="repmgr-standby-register"/> and <xref linkend="repmgr-standby-follow"/>)
     </para>
-    <para>
-      <literal>conninfo</literal> string of the next available node
-      (<varname>bdr_failover</varname> and  <varname>bdr_recovery</varname>)
-    </para>
    </listitem>
   </varlistentry>
 
@@ -130,9 +130,6 @@
     <para>
      name of the current primary node (<xref linkend="repmgr-standby-register"/> and <xref linkend="repmgr-standby-follow"/>)
     </para>
-    <para>
-     name of the next available node (<varname>bdr_failover</varname> and  <varname>bdr_recovery</varname>)
-    </para>
    </listitem>
   </varlistentry>
 
@@ -140,7 +137,7 @@
 
  <para>
   The values provided for <literal>%c</literal> and <literal>%a</literal>
-  will probably contain spaces, so should always be quoted.
+  may contain spaces, so should always be quoted.
  </para>
 
  <para>
@@ -148,7 +145,7 @@
   the notification types can be filtered to explicitly named ones using the
   <varname>event_notifications</varname> parameter, e.g.:
     <programlisting>
-    event_notifications=primary_register,standby_register,witness_register</programlisting>
+    event_notifications='primary_register,standby_register,witness_register'</programlisting>
 
  </para>
 
@@ -273,28 +270,6 @@
    </itemizedlist>
  </para>
 
-  <para>
-   Events generated by &repmgrd; (BDR mode):
-   <itemizedlist spacing="compact" mark="bullet">
-   <listitem>
-    <simpara><literal>bdr_failover</literal></simpara>
-   </listitem>
-   <listitem>
-    <simpara><literal>bdr_reconnect</literal></simpara>
-   </listitem>
-   <listitem>
-    <simpara><literal>bdr_recovery</literal></simpara>
-   </listitem>
-   <listitem>
-    <simpara><literal>bdr_register</literal></simpara>
-   </listitem>
-   <listitem>
-    <simpara><literal>bdr_unregister</literal></simpara>
-   </listitem>
-
-  </itemizedlist>
- </para>
-
  <para>
   Note that under some circumstances (e.g. when no replication cluster primary
   could be located), it will not be possible to write an entry into the

doc/filelist.xml

@@ -21,6 +21,8 @@
 <!ENTITY configuration-file-optional-settings      SYSTEM "configuration-file-optional-settings.xml">
 <!ENTITY configuration-file-log-settings      SYSTEM "configuration-file-log-settings.xml">
 <!ENTITY configuration-file-service-commands   SYSTEM "configuration-file-service-commands.xml">
+<!ENTITY configuration-permissions   SYSTEM "configuration-permissions.xml">
+<!ENTITY configuration-password-management   SYSTEM "configuration-password-management.xml">
 <!ENTITY cloning-standbys  SYSTEM "cloning-standbys.xml">
 <!ENTITY promoting-standby  SYSTEM "promoting-standby.xml">
 <!ENTITY follow-new-primary  SYSTEM "follow-new-primary.xml">
@@ -33,7 +35,6 @@
 <!ENTITY repmgrd-automatic-failover SYSTEM "repmgrd-automatic-failover.xml">
 <!ENTITY repmgrd-configuration SYSTEM "repmgrd-configuration.xml">
 <!ENTITY repmgrd-operation SYSTEM "repmgrd-operation.xml">
-<!ENTITY repmgrd-bdr SYSTEM "repmgrd-bdr.xml">
 
 <!ENTITY repmgr-primary-register SYSTEM "repmgr-primary-register.xml">
 <!ENTITY repmgr-primary-unregister SYSTEM "repmgr-primary-unregister.xml">

doc/install-packages.xml

@@ -22,14 +22,21 @@
 
   <para>
 	&repmgr; RPM packages for RedHat/CentOS variants and Fedora are available from the
-	<ulink url="https://2ndquadrant.com">2ndQuadrant</ulink>
-	<ulink url="https://dl.2ndquadrant.com/">public repository</ulink>; see following
+	<ulink url="https://www.enterprisedb.com">EDB</ulink>
+	<ulink url="https://dl.enterprisedb.com/">public repository</ulink>; see following
 	section for details.
   </para>
+  <note>
+    <para>
+      Currently the <ulink url="https://www.enterprisedb.com">EDB</ulink>
+	  <ulink url="https://dl.enterprisedb.com/">public repository</ulink> provides
+      support for RedHat/CentOS versions 6,7 and 8.
+    </para>
+  </note>
   <para>
    RPM packages for &repmgr; are also available via Yum through
-   the PostgreSQL Global Development Group RPM repository
-   (<ulink url="https://yum.postgresql.org/">http://yum.postgresql.org/</ulink>).
+   the PostgreSQL Global Development Group (PGDG) RPM repository
+   (<ulink url="https://yum.postgresql.org/">https://yum.postgresql.org/</ulink>).
    Follow the instructions for your distribution (RedHat, CentOS,
    Fedora, etc.) and architecture as detailed there. Note that it can take some days
    for new &repmgr; packages to become available via the this repository.
@@ -37,7 +44,7 @@
   <note>
     <para>
       &repmgr; RPM packages are designed to be compatible with the community-provided PostgreSQL packages
-      and 2ndQuadrant's <ulink url="https://www.2ndquadrant.com/en/resources/2ndqpostgres/">2ndQPostgres</ulink>.
+      and EDB's PostgreSQL Extended Server (formerly 2ndQPostgres).
       They may not work with vendor-specific packages such as those provided by RedHat for RHEL
       customers, as the PostgreSQL filesystem layout may be different to the community RPMs.
       Please contact your support vendor for assistance.
@@ -56,16 +63,16 @@
 
 
   <sect3 id="installation-packages-redhat-2ndq">
-    <title>2ndQuadrant public RPM yum repository</title>
+    <title>EDB public RPM yum repository</title>
 
     <para>
-      <ulink url="https://2ndquadrant.com/">2ndQuadrant</ulink> provides a dedicated <literal>yum</literal>
-      <ulink url="https://dl.2ndquadrant.com/">public repository</ulink> for 2ndQuadrant software,
+      <ulink url="https://www.enterprisedb.com/">EDB</ulink> provides a dedicated <literal>yum</literal>
+      <ulink url="https://dl.enterprisedb.com/">public repository</ulink> for EDB software,
       including &repmgr;. We recommend using this for all future &repmgr; releases.
     </para>
     <para>
       General instructions for using this repository can be found on its
-      <ulink url="https://dl.2ndquadrant.com/">homepage</ulink>. Specific instructions
+      <ulink url="https://dl.enterprisedb.com/">homepage</ulink>. Specific instructions
       for installing &repmgr; follow below.
     </para>
     <para>
@@ -75,57 +82,46 @@
 	<listitem>
 	  <para>
 	    Locate the repository RPM for your PostgreSQL version from the list at:
-	    <ulink url="https://dl.2ndquadrant.com/">https://dl.2ndquadrant.com/</ulink>
+	    <ulink url="https://dl.enterprisedb.com/">https://dl.enterprisedb.com/</ulink>
 	  </para>
 	</listitem>
 
-        <listitem>
-          <para>
-            Install the repository definition for your distribution and PostgreSQL version
-	    (this enables the 2ndQuadrant repository as a source of &repmgr; packages).
+    <listitem>
+      <para>
+        Install the repository definition for your distribution and PostgreSQL version
+	    (this enables the EDB repository as a source of &repmgr; packages).
 	  </para>
 	  <para>
-	    For example, for PostgreSQL 11 on CentOS, execute:
+	    For example, for PostgreSQL 14 on Rocky Linux 8, execute:
 	    <programlisting>
-curl https://dl.2ndquadrant.com/default/release/get/11/rpm | sudo bash</programlisting>
+curl https://dl.enterprisedb.com/default/release/get/14/rpm | sudo bash</programlisting>
 	  </para>
 
-	  <para>
-	    For PostgreSQL 9.6 on CentOS, execute:
-	    <programlisting>
-curl https://dl.2ndquadrant.com/default/release/get/9.6/rpm | sudo bash</programlisting>
-	  </para>
-
-
 	  <para>
 	    Verify that the repository is installed with:
 	    <programlisting>
-sudo yum repolist</programlisting>
+sudo dnf repolist</programlisting>
 	    The output should contain two entries like this:
 	    <programlisting>
-2ndquadrant-dl-default-release-pg11/7/x86_64         2ndQuadrant packages (PG11) for 7 - x86_64               18
-2ndquadrant-dl-default-release-pg11-debug/7/x86_64   2ndQuadrant packages (PG11) for 7 - x86_64 - Debug        8</programlisting>
+2ndquadrant-dl-default-release-pg14                  2ndQuadrant packages (PG14) for 8 - x86_64
+2ndquadrant-dl-default-release-pg14-debug            2ndQuadrant packages (PG14) for 8 - x86_64 - Debug</programlisting>
 	  </para>
 	</listitem>
 
         <listitem>
           <para>
-            Install the &repmgr; version appropriate for your PostgreSQL version (e.g. <literal>repmgr10</literal>):
+            Install the &repmgr; version appropriate for your PostgreSQL version (e.g. <literal>repmgr14</literal>):
             <programlisting>
-sudo yum install repmgr11</programlisting>
+sudo dnf install repmgr_14</programlisting>
           </para>
-          <note>
-            <para>
-              For packages for PostgreSQL 9.6 and earlier, the package name does not contain
-              a period between major and minor version numbers, e.g.
-              <literal>repmgr96</literal>.
-            </para>
-          </note>
           <tip>
             <para>
               To determine the names of available packages, execute:
               <programlisting>
-yum search repmgr</programlisting>
+dnf search repmgr</programlisting>
+            </para>
+            <para>
+              In CentOS 7 and earlier, use <literal>yum</literal> instead of <literal>dnf</literal>.
             </para>
           </tip>
 
@@ -137,7 +133,7 @@ yum search repmgr</programlisting>
       <emphasis>Compatibility with PGDG Repositories</emphasis>
     </para>
     <para>
-      The 2ndQuadrant &repmgr; yum repository packages use the same definitions and file system layout as the
+      The EDB &repmgr; yum repository packages use the same definitions and file system layout as the
       main PGDG repository.
     </para>
     <para>
@@ -146,36 +142,42 @@ yum search repmgr</programlisting>
       the packages are installed from.
     </para>
     <para>
-      To ensure the 2ndQuadrant repository is always prioritised, install <literal>yum-plugin-priorities</literal>
-      and set the repository priorities accordingly.
+      To ensure the EDB repository is always prioritised, set the <literal>priority</literal> option
+      in the repository configuration file (e.g. <filename>/etc/yum.repos.d/2ndquadrant-dl-default-release-pg14.repo</filename>
+      accordingly.
     </para>
+    <note>
+      <para>
+        With CentOS 7 and earlier, the package <literal>yum-plugin-priorities</literal> must be installed
+        to be able to set the repository priority.
+      </para>
+    </note>
 
     <para>
       <emphasis>Installing a specific package version</emphasis>
     </para>
     <para>
-      To install a specific package version, execute <command>yum --showduplicates list</command>
+      To install a specific package version, execute <command>dnf --showduplicates list</command>
       for the package in question:
       <programlisting>
-[root@localhost ~]# yum --showduplicates list repmgr11
-Loaded plugins: fastestmirror
-Loading mirror speeds from cached hostfile
- * base: ftp.tsukuba.wide.ad.jp
- * epel: nrt.edge.kernel.org
- * extras: ftp.tsukuba.wide.ad.jp
- * updates: ftp.tsukuba.wide.ad.jp
+[root@localhost ~]# dnf --showduplicates list repmgr10
+Last metadata expiration check: 0:09:15 ago on Fri 11 Mar 2022 01:09:19 AM UTC.
 Installed Packages
-repmgr11.x86_64                        4.4.0-1.rhel7                         @pgdg11
+repmgr10.x86_64                            5.3.1-1.el8                              @2ndquadrant-dl-default-release-pg10
 Available Packages
-repmgr11.x86_64                        4.2-1.el7                             2ndquadrant-dl-default-release-pg11
-repmgr11.x86_64                        4.2-2.el7                             2ndquadrant-dl-default-release-pg11
-repmgr11.x86_64                        4.3-1.el7                             2ndquadrant-dl-default-release-pg11
-repmgr11.x86_64                        4.4-1.el7                             2ndquadrant-dl-default-release-pg11</programlisting>
+repmgr10.x86_64                            5.0.0-1.rhel8                            pgdg10
+repmgr10.x86_64                            5.1.0-1.el8                              2ndquadrant-dl-default-release-pg10
+repmgr10.x86_64                            5.1.0-1.rhel8                            pgdg10
+repmgr10.x86_64                            5.1.0-2.el8                              2ndquadrant-dl-default-release-pg10
+repmgr10.x86_64                            5.2.0-1.el8                              2ndquadrant-dl-default-release-pg10
+repmgr10.x86_64                            5.2.0-1.rhel8                            pgdg10
+repmgr10.x86_64                            5.2.1-1.el8                              2ndquadrant-dl-default-release-pg10
+repmgr10.x86_64                            5.3.0-1.el8                              2ndquadrant-dl-default-release-pg10
+repmgr10.x86_64                            5.3.1-1.el8                              2ndquadrant-dl-default-release-pg10</programlisting>
       then append the appropriate version number to the package name with a hyphen, e.g.:
       <programlisting>
-[root@localhost ~]# yum install repmgr11-4.3-1.el7</programlisting>
+[root@localhost ~]# dnf install repmgr10-5.3.0-1.el8</programlisting>
     </para>
-
     <para>
       <emphasis>Installing old packages</emphasis>
     </para>
@@ -183,7 +185,6 @@ repmgr11.x86_64                        4.4-1.el7                             2nd
       See appendix <link linkend="packages-old-versions-rhel-centos">Installing old package versions</link>
       for details on how to retrieve older package versions.
     </para>
-
   </sect3>
 
  </sect2>
@@ -198,7 +199,7 @@ repmgr11.x86_64                        4.4-1.el7                             2nd
   </indexterm>
 
   <para>.deb packages for &repmgr; are available from the
-  PostgreSQL Community APT repository (<ulink url="http://apt.postgresql.org/">http://apt.postgresql.org/</ulink>).
+  PostgreSQL Community APT repository (<ulink url="https://apt.postgresql.org/">https://apt.postgresql.org/</ulink>).
   Instructions can be found in the APT section of the PostgreSQL Wiki
   (<ulink url="https://wiki.postgresql.org/wiki/Apt">https://wiki.postgresql.org/wiki/Apt</ulink>).
   </para>
@@ -209,16 +210,16 @@ repmgr11.x86_64                        4.4-1.el7                             2nd
   </para>
 
   <sect3 id="installation-packages-debian-ubuntu-2ndq">
-    <title>2ndQuadrant public apt repository for Debian/Ubuntu</title>
+    <title>EDB public apt repository for Debian/Ubuntu</title>
 
     <para>
-      <ulink url="https://2ndquadrant.com/">2ndQuadrant</ulink> provides a
-      <ulink url="https://dl.2ndquadrant.com/">public apt repository</ulink> for 2ndQuadrant software,
+      <ulink url="https://www.enterprisedb.com/">EDB</ulink> provides a
+      <ulink url="https://dl.enterprisedb.com/">public apt repository</ulink> for EDB software,
       including &repmgr;.
     </para>
     <para>
       General instructions for using this repository can be found on its
-      <ulink url="https://dl.2ndquadrant.com/">homepage</ulink>. Specific instructions
+      <ulink url="https://dl.enterprisedb.com/">homepage</ulink>. Specific instructions
       for installing &repmgr; follow below.
     </para>
 
@@ -231,9 +232,9 @@ repmgr11.x86_64                        4.4-1.el7                             2nd
 	    <listitem>
 	      <para>
             Install the repository definition for your distribution and PostgreSQL version
-	        (this enables the 2ndQuadrant repository as a source of &repmgr; packages) by executing:
+	        (this enables the EDB repository as a source of &repmgr; packages) by executing:
             <programlisting>
-              curl https://dl.2ndquadrant.com/default/release/get/deb | sudo bash</programlisting>
+              curl https://dl.enterprisedb.com/default/release/get/deb | sudo bash</programlisting>
 	      </para>
           <note>
             <para>

doc/install-requirements.xml

@@ -14,7 +14,7 @@
   </para>
 
   <para>
-   &repmgr; &repmgrversion; is compatible with all PostgreSQL versions from 9.3. See
+   &repmgr; &repmgrversion; is compatible with all PostgreSQL versions from 9.4. See
    section <link linkend="install-compatibility-matrix">&repmgr; compatibility matrix</link>
    for an overview of version compatibility.
   </para>
@@ -93,69 +93,171 @@
     <table id="repmgr-compatibility-matrix">
       <title>&repmgr; compatibility matrix</title>
 
-      <tgroup cols="3">
+      <tgroup cols="4">
         <thead>
           <row>
             <entry>
               &repmgr; version
             </entry>
+            <entry>
+              Supported?
+            </entry>
             <entry>
               Latest release
             </entry>
             <entry>
               Supported PostgreSQL versions
             </entry>
+            <entry>
+              Notes
+            </entry>
           </row>
         </thead>
 
         <tbody>
-
           <row>
             <entry>
-              &repmgr; 5.x
+              &repmgr; 5.4
+            </entry>
+            <entry>
+              (dev)
             </entry>
             <entry>
               <link linkend="release-current">&repmgrversion;</link> (&releasedate;)
             </entry>
             <entry>
-              9.3, 9.4, 9.5, 9.6, 10, 11, 12
+              9.4, 9.5, 9.6, 10, 11, 12, 13, 15
+            </entry>
+            <entry>
+              &nbsp;
             </entry>
           </row>
 
+          <row>
+            <entry>
+              &repmgr; 5.3
+            </entry>
+            <entry>
+              YES
+            </entry>
+            <entry>
+              <link linkend="release-current">&repmgrversion;</link> (&releasedate;)
+            </entry>
+            <entry>
+              9.4, 9.5, 9.6, 10, 11, 12, 13, 14, 15
+            </entry>
+            <entry>
+              PostgreSQL 15 supported from &repmgr; 5.3.3
+            </entry>
+          </row>
+
+          <row>
+            <entry>
+              &repmgr; 5.2
+            </entry>
+            <entry>
+              NO
+            </entry>
+            <entry>
+              <link linkend="release-5.2.1">5.2.1</link> (2020-12-07)
+            </entry>
+            <entry>
+              9.4, 9.5, 9.6, 10, 11, 12, 13
+            </entry>
+            <entry>
+              &nbsp;
+            </entry>
+          </row>
+
+          <row>
+            <entry>
+              &repmgr; 5.1
+            </entry>
+            <entry>
+              NO
+            </entry>
+            <entry>
+              <link linkend="release-5.1.0">5.1.0</link> (2020-04-13)
+            </entry>
+            <entry>
+              9.3, 9.4, 9.5, 9.6, 10, 11, 12
+            </entry>
+            <entry>
+              &nbsp;
+            </entry>
+          </row>
+
+          <row>
+            <entry>
+              &repmgr; 5.0
+            </entry>
+            <entry>
+              NO
+            </entry>
+            <entry>
+              <link linkend="release-5.0">5.0</link> (2019-10-15)
+            </entry>
+            <entry>
+              9.3, 9.4, 9.5, 9.6, 10, 11, 12
+            </entry>
+            <entry>
+              &nbsp;
+            </entry>
+          </row>
+
+
           <row>
             <entry>
               &repmgr; 4.x
             </entry>
             <entry>
-              <link linkend="release-4.4">4.4</link> (27 June, 2019)
+              NO
+            </entry>
+            <entry>
+              <link linkend="release-4.4">4.4</link> (2019-06-27)
             </entry>
             <entry>
               9.3, 9.4, 9.5, 9.6, 10, 11
             </entry>
+            <entry>
+              &nbsp;
+            </entry>
           </row>
 
           <row>
             <entry>
               &repmgr; 3.x
             </entry>
+            <entry>
+              NO
+            </entry>
             <entry>
               <ulink url="https://repmgr.org/release-notes-3.3.2.html">3.3.2</ulink> (2017-05-30)
             </entry>
             <entry>
               9.3, 9.4, 9.5, 9.6
             </entry>
+            <entry>
+              &nbsp;
+            </entry>
           </row>
 
           <row>
             <entry>
               &repmgr; 2.x
             </entry>
+            <entry>
+              NO
+            </entry>
             <entry>
               <ulink url="https://repmgr.org/release-notes-2.0.3.html">2.0.3</ulink> (2015-04-16)
             </entry>
             <entry>
               9.0, 9.1, 9.2, 9.3, 9.4
             </entry>
+            <entry>
+              &nbsp;
+            </entry>
           </row>
         </tbody>
 
@@ -167,28 +269,61 @@
         The &repmgr; 2.x and 3.x series are no longer maintained or supported.
         We strongly recommend  upgrading to the latest &repmgr; version.
       </para>
+      <para>
+        Following the release of &repmgr; 5.0, there will be no further releases of
+        the &repmgr; 4.x series. Note that &repmgr; 5.x is an incremental development
+        of the 4.x series and &repmgr; 4.x users should upgrade to this as soon as possible.
+      </para>
     </important>
 
+  </sect2>
+
+  <sect2 id="install-postgresql-93-94">
+
+    <title>PostgreSQL 9.4 support</title>
+
+    <indexterm>
+      <primary>PostgreSQL 9.4</primary>
+      <secondary>repmgr support</secondary>
+    </indexterm>
 
     <para>
-      Note that some &repmgr; functionality is not available in PostgreSQL 9.3 and PostgreSQL 9.4:
+      Note that some &repmgr; functionality is not available in PostgreSQL 9.4:
     </para>
     <itemizedlist spacing="compact" mark="bullet">
 
       <listitem>
         <para>
-          PostgreSQL 9.3 does not support replication slots, so corresponding &repmgr; functionality
-          is not available.
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          In PostgreSQL 9.3 and PostgreSQL 9.4, <command>pg_rewind</command> is not part of the core
+          In PostgreSQL 9.4, <command>pg_rewind</command> is not part of the core
           distribution. <command>pg_rewind</command> will need to be compiled separately to be able
           to use any &repmgr; functionality which takes advantage of it.
         </para>
       </listitem>
     </itemizedlist>
 
+    <warning>
+      <para>
+        PostgreSQL 9.3 has reached the end of its community support period (final release was
+        <ulink url="https://www.postgresql.org/docs/9.3/release-9-3-25.html">9.3.25</ulink>
+        in November 2018) and will no longer be updated with security or bugfixes.
+      </para>
+      <para>
+        Beginning with &repmgr; 5.2, &repmgr; no longer supports PostgreSQL 9.3.
+      </para>
+      <para>
+        PostgreSQL 9.4 has reached the end of its community support period (final release was
+        <ulink url="https://www.postgresql.org/docs/9.4/release-9-4-26.html">9.4.26</ulink>
+        in February 2020) and will no longer be updated with security or bugfixes.
+      </para>
+      <para>
+        We recommend that users of these versions migrate to a supported PostgreSQL version
+        as soon as possible.
+      </para>
+      <para>
+        For further details, see the  <ulink url="https://www.postgresql.org/support/versioning/">PostgreSQL Versioning Policy</ulink>.
+      </para>
+    </warning>
+
   </sect2>
+
  </sect1>

doc/install-source.xml

@@ -24,8 +24,7 @@
     <listitem>
      <para>
       <literal>Debian</literal> and <literal>Ubuntu</literal>: First
-      add the <ulink
-      url="http://apt.postgresql.org/">apt.postgresql.org</ulink>
+      add the <ulink url="https://apt.postgresql.org/">apt.postgresql.org</ulink>
       repository to your <filename>sources.list</filename> if you
       have not already done so, and ensure the source repository is enabled.
      </para>
@@ -36,8 +35,8 @@
          line in the repository file, which is usually
          <filename>/etc/apt/sources.list.d/pgdg.list</filename>, e.g.:
          <programlisting>
-deb http://apt.postgresql.org/pub/repos/apt/ stretch-pgdg main
-deb-src http://apt.postgresql.org/pub/repos/apt/ stretch-pgdg main</programlisting>
+deb https://apt.postgresql.org/pub/repos/apt/ stretch-pgdg main
+deb-src https://apt.postgresql.org/pub/repos/apt/ stretch-pgdg main</programlisting>
        </para>
      </tip>
      <para>
@@ -179,18 +178,18 @@ deb-src http://apt.postgresql.org/pub/repos/apt/ stretch-pgdg main</programlisti
 
    <para>
     The source for &repmgr; is maintained at
-    <ulink url="https://github.com/2ndQuadrant/repmgr">https://github.com/2ndQuadrant/repmgr</ulink>.
+    <ulink url="https://github.com/EnterpriseDB/repmgr">https://github.com/EnterpriseDB/repmgr</ulink>.
    </para>
 
    <para>
-    There are also tags for each <ulink url="https://github.com/2ndQuadrant/repmgr/releases">&repmgr; release</ulink>, e.g.
-    <literal><ulink url="https://github.com/2ndQuadrant/repmgr/releases/tag/v4.4.0">v4.4.0</ulink></literal>.
+    There are also tags for each <ulink url="https://github.com/EnterpriseDB/repmgr/releases">&repmgr; release</ulink>, e.g.
+    <literal><ulink url="https://github.com/EnterpriseDB/repmgr/releases/tag/v4.4.0">v4.4.0</ulink></literal>.
    </para>
 
    <para>
     Clone the source code using <application>git</application>:
     <programlisting>
-     git clone https://github.com/2ndQuadrant/repmgr</programlisting>
+     git clone https://github.com/EnterpriseDB/repmgr</programlisting>
    </para>
 
    <para>

doc/legal.xml

@@ -1,18 +1,18 @@
 <!-- doc/legal.xml -->
 
-<date>2017</date>
+<date>2022</date>
 
 <copyright>
- <year>2010-2019</year>
- <holder>2ndQuadrant, Ltd.</holder>
+ <year>2010-2022</year>
+ <holder>EDB</holder>
 </copyright>
 
 <legalnotice id="legalnotice">
  <title>Legal Notice</title>
 
  <para>
-  <productname>repmgr</productname> is Copyright &copy; 2010-2019
-  by 2ndQuadrant, Ltd. All rights reserved.
+  <productname>repmgr</productname> is Copyright &copy; 2010-2022
+  by EDB All rights reserved.
  </para>
 
  <para>

doc/quickstart.xml

@@ -167,7 +167,7 @@
     For the sake of simplicity, the <literal>repmgr</literal> user is created
     as a superuser. If desired, it's possible to create the <literal>repmgr</literal>
     user as a normal user. However for certain operations superuser permissions
-    are requiredl; in this case the command line option <command>--superuser</command>
+    are required; in this case the command line option <command>--superuser</command>
     can be provided to specify a superuser.
    </para>
    <para>
@@ -284,7 +284,7 @@
 
   <tip>
    <simpara>
-    For Debian-based distributions we recommend explictly setting
+    For Debian-based distributions we recommend explicitly setting
     <option>pg_bindir</option> to the directory where <command>pg_ctl</command> and other binaries
     not in the standard path are located. For PostgreSQL 9.6 this would be <filename>/usr/lib/postgresql/9.6/bin/</filename>.
    </simpara>
@@ -302,7 +302,7 @@
 
   <para>
    See the file
-   <ulink url="https://raw.githubusercontent.com/2ndQuadrant/repmgr/master/repmgr.conf.sample">repmgr.conf.sample</ulink>
+   <ulink url="https://raw.githubusercontent.com/EnterpriseDB/repmgr/master/repmgr.conf.sample">repmgr.conf.sample</ulink>
     for details of all available configuration parameters.
   </para>
 
@@ -405,9 +405,10 @@
   </programlisting>
   <para>
    This has cloned the PostgreSQL data directory files from the primary <literal>node1</literal>
-   using PostgreSQL's <command>pg_basebackup</command> utility. A <filename>recovery.conf</filename>
-   file containing the correct parameters to start streaming from this primary server will be created
-   automatically.
+   using PostgreSQL's <command>pg_basebackup</command> utility. Replication configuration
+   containing the correct parameters to start streaming from this primary server will be
+   automatically appended to <filename>postgresql.auto.conf</filename>. (In PostgreSQL 11
+   and earlier the file <filename>recovery.conf</filename> will be created).
   </para>
   <note>
    <simpara>
@@ -481,9 +482,10 @@
     sender_port           | 5432
     conninfo              | user=repmgr dbname=replication host=node1 application_name=node2
    </programlisting>
-   Note that the <varname>conninfo</varname> value is that generated in <filename>recovery.conf</filename>
-   and will differ slightly from the primary's <varname>conninfo</varname> as set in <filename>repmgr.conf</filename> -
-   among others it will contain the connecting node's name as <varname>application_name</varname>.
+   Note that the <varname>conninfo</varname> value is that generated in <filename>postgresql.auto.conf</filename>
+   (PostgreSQL 11 and earlier: <filename>recovery.conf</filename>) and will differ slightly from the primary's
+   <varname>conninfo</varname> as set in <filename>repmgr.conf</filename> - among others it will contain the
+   connecting node's name as <varname>application_name</varname>.
   </para>
  </sect1>
 

doc/repmgr-cluster-show.xml

@@ -18,7 +18,7 @@
     <para>
       Displays information about each registered node in the replication cluster. This
       command polls each registered server and shows its role (<literal>primary</literal> /
-      <literal>standby</literal> / <literal>bdr</literal>) and status. It polls each server
+      <literal>standby</literal>) and status. It polls each server
       directly and can be run on any node in the cluster; this is also useful when analyzing
       connectivity from a particular node.
     </para>
@@ -53,12 +53,13 @@
     <para>
     <programlisting>
     $ repmgr -f /etc/repmgr.conf cluster show
-
      ID | Name  | Role    | Status    | Upstream | Location | Priority | Timeline | Connection string
-    ----+-------+---------+-----------+----------+----------+----------+-----------------------------------------
+    ----+-------+---------+-----------+----------+----------+----------+----------+-----------------------------------------
      1  | node1 | primary | * running |          | default  | 100      | 1        | host=db_node1 dbname=repmgr user=repmgr
      2  | node2 | standby |   running | node1    | default  | 100      | 1        | host=db_node2 dbname=repmgr user=repmgr
-     3  | node3 | standby |   running | node1    | default  | 100      | 1        | host=db_node3 dbname=repmgr user=repmgr</programlisting>
+     3  | node3 | standby |   running | node1    | default  | 100      | 1        | host=db_node3 dbname=repmgr user=repmgr
+     4  | node4 | standby |   running | node1    | default  | 100      | 1        | host=db_node4 dbname=repmgr user=repmgr
+     5  | node5 | witness | * running | node1    | default  | 0        | n/a      | host=db_node5 dbname=repmgr user=repmgr</programlisting>
   </para>
   </refsect1>
   <refsect1>
@@ -82,18 +83,22 @@
 	  (but <literal>node3</literal> is not attached to it, and its metadata has not yet been updated);
 	  <literal>node4</literal> is running but rejecting connections (from <literal>node3</literal> at least).
       <programlisting>
-	 ID | Name  | Role    | Status               | Upstream | Location | Priority | Connection string
-	----+-------+---------+----------------------+----------+----------+----------+-----------------------------------------
-	 1  | node1 | primary | ? unreachable        |          | default  | 100      | host=db_node1 dbname=repmgr user=repmgr
-	 2  | node2 | standby | ! running as primary | node1    | default  | 100      | host=db_node2 dbname=repmgr user=repmgr
-	 3  | node3 | standby |   running            | node1    | default  | 100      | host=db_node3 dbname=repmgr user=repmgr
-	 4  | node4 | standby | ? running            | node1    | default  | 100      | host=db_node4 dbname=repmgr user=repmgr
+     ID | Name  | Role    | Status               | Upstream | Location | Priority | Timeline | Connection string
+    ----+-------+---------+----------------------+----------+----------+----------+----------+----------------------------------------------------
+     1  | node1 | primary | ? unreachable        |          | default  | 100      |          | host=db_node1 dbname=repmgr user=repmgr
+     2  | node2 | standby | ! running as primary | ? node1  | default  | 100      | 2        | host=db_node2 dbname=repmgr user=repmgr
+     3  | node3 | standby |   running            | ? node1  | default  | 100      | 1        | host=db_node3 dbname=repmgr user=repmgr
+     4  | node4 | standby | ? running            | ? node1  | default  | 100      |          | host=db_node4 dbname=repmgr user=repmgr
 
-	WARNING: following issues were detected
-	  - unable to connect to node "node1" (ID: 1)
-	  - node "node1" (ID: 1) is registered as an active primary but is unreachable
-	  - node "node2" (ID: 2) is registered as standby but running as primary
-	  - unable to connect to node "node4" (ID: 4)
+    WARNING: following issues were detected
+      - unable to connect to node "node1" (ID: 1)
+      - node "node1" (ID: 1) is registered as an active primary but is unreachable
+      - node "node2" (ID: 2) is registered as standby but running as primary
+      - unable to connect to node "node2" (ID: 2)'s upstream node "node1" (ID: 1)
+      - unable to determine if node "node2" (ID: 2) is attached to its upstream node "node1" (ID: 1)
+      - unable to connect to node "node3" (ID: 3)'s upstream node "node1" (ID: 1)
+      - unable to determine if node "node3" (ID: 3) is attached to its upstream node "node1" (ID: 1)
+      - unable to connect to node "node4" (ID: 4)
     HINT: execute with --verbose option to see connection error messages</programlisting>
     </para>
 	<para>

doc/repmgr-daemon-start.xml

@@ -25,7 +25,7 @@
     </para>
     <para>
       By default, &repmgr; will wait for up to 15 seconds to confirm that &repmgrd;
-      started. This behaviour can be overridden by specifying a diffent value using the <option>--wait</option>
+      started. This behaviour can be overridden by specifying a different value using the <option>--wait</option>
       option, or disabled altogether with the <option>--no-wait</option> option.
     </para>
 

doc/repmgr-daemon-stop.xml

@@ -26,7 +26,7 @@
 
     <para>
       By default, &repmgr; will wait for up to 15 seconds to confirm that &repmgrd;
-      stopped. This behaviour can be overridden by specifying a diffent value using the <option>--wait</option>
+      stopped. This behaviour can be overridden by specifying a different value using the <option>--wait</option>
       option, or disabled altogether with the <option>--no-wait</option> option.
     </para>
     <note>

doc/repmgr-node-check.xml

@@ -31,15 +31,32 @@
   <refsect1>
     <title>Example</title>
     <para>
+      Execution on the primary server:
       <programlisting>
        $ repmgr -f /etc/repmgr.conf node check
        Node "node1":
             Server role: OK (node is primary)
             Replication lag: OK (N/A - node is primary)
             WAL archiving: OK (0 pending files)
+            Upstream connection: OK (N/A - is primary)
             Downstream servers: OK (2 of 2 downstream nodes attached)
             Replication slots: OK (node has no physical replication slots)
-            Missing replication slots: OK (node has no missing physical replication slots)</programlisting>
+            Missing replication slots: OK (node has no missing physical replication slots)
+            Configured data directory: OK (configured "data_directory" is "/var/lib/postgresql/data")</programlisting>
+    </para>
+    <para>
+      Execution on a standby server:
+      <programlisting>
+       $ repmgr -f /etc/repmgr.conf node check
+       Node "node2":
+            Server role: OK (node is standby)
+            Replication lag: OK (0 seconds)
+            WAL archiving: OK (0 pending archive ready files)
+            Upstream connection: OK (node "node2" (ID: 2) is attached to expected upstream node "node1" (ID: 1))
+            Downstream servers: OK (this node has no downstream nodes)
+            Replication slots: OK (node has no physical replication slots)
+            Missing physical replication slots: OK (node has no missing physical replication slots)
+            Configured data directory: OK (configured "data_directory" is "/var/lib/postgresql/data")</programlisting>
     </para>
   </refsect1>
   <refsect1>
@@ -57,20 +74,20 @@
 
      <listitem>
       <simpara>
-        <literal>--role</literal>: checks if the node has the expected role
+        <option>--role</option>: checks if the node has the expected role
       </simpara>
      </listitem>
 
      <listitem>
       <simpara>
-        <literal>--replication-lag</literal>: checks if the node is lagging by more than
+        <option>--replication-lag</option>: checks if the node is lagging by more than
         <varname>replication_lag_warning</varname> or <varname>replication_lag_critical</varname>
       </simpara>
      </listitem>
 
      <listitem>
       <simpara>
-        <literal>--archive-ready</literal>: checks for WAL files which have not yet been archived,
+        <option>--archive-ready</option>: checks for WAL files which have not yet been archived,
         and returns <literal>WARNING</literal> or <literal>CRITICAL</literal> if the number
         exceeds <varname>archive_ready_warning</varname> or <varname>archive_ready_critical</varname> respectively.
       </simpara>
@@ -78,36 +95,115 @@
 
      <listitem>
       <simpara>
-        <literal>--downstream</literal>: checks that the expected downstream nodes are attached
+        <option>--downstream</option>: checks that the expected downstream nodes are attached
       </simpara>
      </listitem>
 
      <listitem>
       <simpara>
-        <literal>--slots</literal>: checks there are no inactive physical replication slots
+        <option>--upstream</option>: checks that the node is attached to its expected upstream
       </simpara>
      </listitem>
 
      <listitem>
       <simpara>
-        <literal>--missing-slots</literal>: checks there are no missing physical replication slots
+        <option>--slots</option>: checks there are no inactive physical replication slots
       </simpara>
      </listitem>
 
      <listitem>
       <simpara>
-        <literal>--data-directory-config</literal>: checks the data directory configured in
+        <option>--missing-slots</option>: checks there are no missing physical replication slots
+      </simpara>
+     </listitem>
+
+     <listitem>
+      <simpara>
+        <option>--data-directory-config</option>: checks the data directory configured in
         <filename>repmgr.conf</filename> matches the actual data directory.
         This check is not directly related to replication, but is useful to verify &repmgr;
         is correctly configured.
       </simpara>
      </listitem>
-
-
     </itemizedlist>
   </para>
   </refsect1>
 
+
+  <refsect1>
+    <title>repmgrd</title>
+    <para>
+      A separate check is available to verify whether &repmgrd; is running,
+      This is not included in the general output, as this does not
+      per-se constitute a check of the node's replication status.
+    </para>
+    <itemizedlist spacing="compact" mark="bullet">
+     <listitem>
+      <simpara>
+        <option>--repmgrd</option>: checks whether &repmgrd; is running.
+        If &repmgrd; is running but paused, status <literal>1</literal>
+        (<literal>WARNING</literal>) is returned.
+      </simpara>
+     </listitem>
+    </itemizedlist>
+  </refsect1>
+
+  <refsect1>
+    <title>Additional checks</title>
+    <para>
+      Several checks are provided for diagnostic purposes and are not
+      included in the general output:
+      <itemizedlist spacing="compact" mark="bullet">
+
+        <listitem>
+          <simpara>
+            <option>--db-connection</option>: checks if &repmgr; can connect to the
+            database on the local node.
+          </simpara>
+          <simpara>
+            This option is particularly useful in combination with <command>SSH</command>, as
+            it can be used to troubleshoot connection issues encountered when &repmgr; is
+            executed remotely (e.g. during a switchover operation).
+          </simpara>
+
+        </listitem>
+
+        <listitem>
+          <simpara>
+            <option>--replication-config-owner</option>: checks if the file containing replication
+            configuration (PostgreSQL 12 and later: <filename>postgresql.auto.conf</filename>;
+            PostgreSQL 11 and earlier: <filename>recovery.conf</filename>) is
+            owned by the same user who owns the data directory.
+          </simpara>
+          <simpara>
+            Incorrect ownership of these files (e.g. if they are owned by <literal>root</literal>)
+            will cause operations which need to update the replication configuration
+            (e.g. <link linkend="repmgr-standby-follow"><command>repmgr standby follow</command></link>
+            or <link linkend="repmgr-standby-promote"><command>repmgr standby promote</command></link>)
+            to fail.
+          </simpara>
+        </listitem>
+
+      </itemizedlist>
+    </para>
+  </refsect1>
+
+  <refsect1>
+    <title>Connection options</title>
+    <para>
+      <itemizedlist spacing="compact" mark="bullet">
+
+        <listitem>
+          <simpara>
+            <option>-S</option>/<option>--superuser</option>: connect as the
+            named superuser instead of the &repmgr; user
+          </simpara>
+        </listitem>
+
+      </itemizedlist>
+    </para>
+  </refsect1>
+
   <refsect1>
     <title>Output format</title>
     <para>
@@ -115,14 +211,14 @@
 
         <listitem>
           <simpara>
-            <literal>--csv</literal>: generate output in CSV format (not available
+            <option>--csv</option>: generate output in CSV format (not available
             for individual checks)
           </simpara>
         </listitem>
 
         <listitem>
           <simpara>
-            <literal>--nagios</literal>: generate output in a Nagios-compatible format
+            <option>--nagios</option>: generate output in a Nagios-compatible format
             (for individual checks only)
           </simpara>
         </listitem>
@@ -130,13 +226,15 @@
     </para>
   </refsect1>
 
+
+
   <refsect1>
     <title>Exit codes</title>
 
     <para>
       When executing <command>repmgr node check</command> with one of the individual
       checks listed above, &repmgr; will emit one of the following Nagios-style exit codes
-      (even if <literal>--nagios</literal> is not supplied):
+      (even if <option>--nagios</option> is not supplied):
 
       <itemizedlist spacing="compact" mark="bullet">
 

doc/repmgr-node-rejoin.xml

@@ -22,6 +22,10 @@
       This can optionally use <application>pg_rewind</application> to re-integrate
       a node which has diverged from the rest of the cluster, typically a failed primary.
     </para>
+    <para>
+      Note that <command>repmgr node rejoin</command> can only be used to attach
+      a standby to the current primary, not another standby.
+    </para>
 
     <tip>
       <para>
@@ -43,7 +47,12 @@
       <programlisting>
       repmgr node rejoin -d '$conninfo'</programlisting>
 
-      where <literal>$conninfo</literal> is the conninfo string of any reachable node in the cluster.
+      where <literal>$conninfo</literal> is the PostgreSQL <literal>conninfo</literal> string of the
+      <emphasis>current</emphasis> primary node (or that of any reachable node in the cluster, but
+      <emphasis>not</emphasis> the local node). This is so that &repmgr; can fetch up-to-date information
+      about the current state of the cluster.
+    </para>
+    <para>
       <filename>repmgr.conf</filename> for the stopped node *must* be supplied explicitly if not
       otherwise available.
     </para>
@@ -64,16 +73,16 @@
       </varlistentry>
 
       <varlistentry>
-        <term><option>--force-rewind[=/path/to/pg_rewind]</option></term>
+        <term><option>--force-rewind</option></term>
         <listitem>
           <para>
             Execute <application>pg_rewind</application>.
           </para>
           <para>
-            It is only necessary to provide the <application>pg_rewind</application> path
-            if using PostgreSQL 9.3 or 9.4, and <application>pg_rewind</application>
-            is not installed in the PostgreSQL <filename>bin</filename> directory.
+            See <xref linkend="repmgr-node-rejoin-pg-rewind"/> for more details on using
+            <application>pg_rewind</application>.
           </para>
+
         </listitem>
       </varlistentry>
 
@@ -207,9 +216,18 @@
       a standby to the current primary, not another standby.
     </para>
     <para>
-      The node must have been shut down cleanly; if this was not the case, it will
-      need to be manually started (remove any existing <filename>recovery.conf</filename> file first)
-      until it has reached a consistent recovery point, then shut down cleanly.
+      The node's PostgreSQL instance  must have been shut down cleanly. If this was not the
+      case, it will need to be started up until it has reached a consistent recovery point,
+      then shut down cleanly.
+    </para>
+    <para>
+      In PostgreSQL 13 and later, this will be done automatically
+      if the <option>--force-rewind</option> is provided (even if an actual rewind
+      is not necessary).
+    </para>
+    <para>
+      With PostgreSQL 12 and earlier, PostgreSQL will need to
+      be started and shut down manually; see below for the best way to do this.
     </para>
     <tip>
       <para>
@@ -221,11 +239,14 @@
           rm -f /var/lib/pgsql/data/recovery.conf
           postgres --single -D /var/lib/pgsql/data/ &lt; /dev/null</programlisting>
       </para>
+      <para>
+        Note that  <filename>standby.signal</filename> (PostgreSQL 11 and earlier:
+        <filename>recovery.conf</filename>) <emphasis>must</emphasis> be removed
+        from the data directory for PostgreSQL to be able to start in single
+        user mode.
+      </para>
     </tip>
-    <para>
-      &repmgr; will attempt to verify whether the node can rejoin as-is, or whether
-      <command>pg_rewind</command> must be used (see following section).
-    </para>
+
   </refsect1>
 
   <refsect1 id="repmgr-node-rejoin-pg-rewind" xreflabel="Using pg_rewind">
@@ -240,8 +261,6 @@
     <para>
       <command>repmgr node rejoin</command> can optionally use <command>pg_rewind</command> to re-integrate a
       node which has diverged from the rest of the cluster, typically a failed primary.
-      <command>pg_rewind</command> is available in PostgreSQL 9.5 and later as part of the core distribution,
-      and can be installed from external sources for PostgreSQL 9.3 and 9.4.
     </para>
     <note>
       <para>
@@ -250,6 +269,10 @@
         data checksums were enabled when the cluster was initialized. See the
         <ulink url="https://www.postgresql.org/docs/current/app-pgrewind.html"><command>pg_rewind</command> documentation</ulink> for details.
       </para>
+      <para>
+        Additionally, <varname>full_page_writes</varname> must be enabled; this is the default and
+        normally should never be disabled.
+      </para>
     </note>
 
     <para>
@@ -264,6 +287,7 @@
       <programlisting>
     $ repmgr node rejoin -f /etc/repmgr.conf -d 'host=node3 dbname=repmgr user=repmgr' \
         --force-rewind --config-files=postgresql.local.conf,postgresql.conf --verbose --dry-run
+    NOTICE: rejoin target is node "node3" (node ID: 3)
     INFO: replication connection to the rejoin target node was successful
     INFO: local and rejoin target system identifiers match
     DETAIL: system identifier is 6652184002263212600
@@ -283,7 +307,15 @@
       to execute <command>pg_rewind</command> to ensure the node can be rejoined successfully.
     </para>
 
-    <important>
+    <refsect2 id="repmgr-node-rejoin-pg-rewind-config-files" xreflabel="pg_rewind and configuration files">
+
+      <title><command>pg_rewind</command> and configuration file retention</title>
+
+      <indexterm>
+        <primary>pg_rewind</primary>
+        <secondary>configuration file retention</secondary>
+      </indexterm>
+
       <para>
         Be aware that if <command>pg_rewind</command> is executed and actually performs a
         rewind operation, any configuration files in the PostgreSQL data directory will be
@@ -291,19 +323,30 @@
       </para>
       <para>
         To prevent this happening, provide a comma-separated list of files to retain
-        using the <literal>--config-file</literal> command line option; the specified files
+        using the <option>--config-file</option> command line option; the specified files
         will be archived in a temporary directory (whose parent directory can be specified with
-        <literal>--config-archive-dir</literal>) and restored once the rewind operation is
-        complete.
+        <option>--config-archive-dir</option>, default: <filename>/tmp</filename>)
+        and restored once the rewind operation is complete.
       </para>
-    </important>
+    </refsect2>
 
-    <para>
-      Example, first using <literal>--dry-run</literal>, then actually executing the
-      <literal>node rejoin command</literal>.
-    <programlisting>
+    <refsect2 id="repmgr-node-rejoin-pg-rewind-example" xreflabel="example using repmgr node rejoin and pg_rewind">
+
+      <title>Example using <command>repmgr node rejoin</command> and <command>pg_rewind</command></title>
+
+      <indexterm>
+        <primary>pg_rewind</primary>
+        <secondary>configuration file retention</secondary>
+      </indexterm>
+
+
+      <para>
+        Example, first using <option>--dry-run</option>, then actually executing the
+        <literal>node rejoin command</literal>.
+        <programlisting>
     $ repmgr node rejoin -f /etc/repmgr.conf -d 'host=node3 dbname=repmgr user=repmgr' \
         --config-files=postgresql.local.conf,postgresql.conf --verbose --force-rewind --dry-run
+    NOTICE: rejoin target is node "node3" (node ID: 3)
     INFO: replication connection to the rejoin target node was successful
     INFO: local and rejoin target system identifiers match
     DETAIL: system identifier is 6652460429293670710
@@ -317,17 +360,17 @@
       pg_rewind -D '/var/lib/postgresql/data' --source-server='host=node3 dbname=repmgr user=repmgr'
     INFO: prerequisites for executing NODE REJOIN are met</programlisting>
 
-    <note>
-      <para>
-        If <option>--force-rewind</option> is used with the <option>--dry-run</option> option,
-        this checks the prerequisites for using <application>pg_rewind</application>, but is
-        not an absolute guarantee that actually executing <application>pg_rewind</application>
-        will succeed. See also section <xref linkend="repmgr-node-rejoin-caveats"/> below.
-      </para>
+        <note>
+          <para>
+            If <option>--force-rewind</option> is used with the <option>--dry-run</option> option,
+            this checks the prerequisites for using <application>pg_rewind</application>, but is
+            not an absolute guarantee that actually executing <application>pg_rewind</application>
+            will succeed. See also section <xref linkend="repmgr-node-rejoin-caveats"/> below.
+          </para>
 
-    </note>
+        </note>
 
-    <programlisting>
+        <programlisting>
     $ repmgr node rejoin -f /etc/repmgr.conf -d 'host=node3 dbname=repmgr user=repmgr' \
         --config-files=postgresql.local.conf,postgresql.conf --verbose --force-rewind
     NOTICE: pg_rewind execution required for this node to attach to rejoin target node 3
@@ -339,8 +382,31 @@
     NOTICE: starting server using "pg_ctl -l /var/log/postgres/startup.log -w -D '/var/lib/pgsql/data' start"
     NOTICE: NODE REJOIN successful
     DETAIL: node 2 is now attached to node 3</programlisting>
-    </para>
+      </para>
+    </refsect2>
 
+    <refsect2 id="repmgr-node-rejoin-postgresql-94" xreflabel="pg_rewind and PostgreSQL 9.4">
+
+      <title><command>pg_rewind</command> and PostgreSQL 9.4</title>
+
+      <indexterm>
+        <primary>pg_rewind</primary>
+        <secondary>PostgreSQL 9.4</secondary>
+      </indexterm>
+
+      <para>
+        <application>pg_rewind</application> is available in PostgreSQL 9.5 and later as part of the core distribution.
+        Users of PostgreSQL 9.4 will need to manually install it; the source code is available here:
+        <ulink url="https://github.com/vmware/pg_rewind">https://github.com/vmware/pg_rewind</ulink>.
+        If the <application>pg_rewind</application>
+        binary is not installed in the PostgreSQL <filename>bin</filename> directory, provide
+        its full path  on the demotion candidate  with <option>--force-rewind</option>.
+      </para>
+      <para>
+        Note that building the 9.4 version of <application>pg_rewind</application> requires the PostgreSQL
+        source code.
+      </para>
+    </refsect2>
   </refsect1>
 
   <refsect1 id="repmgr-node-rejoin-caveats" xreflabel="Caveats">
@@ -369,6 +435,11 @@
      the current standby's PostgreSQL log will contain entries with the text
      &quot;<literal>record with incorrect prev-link</literal>&quot;.
    </para>
+   <para>
+     In PostgreSQL 9.5 and earlier, it is <emphasis>not</emphasis> possible to use
+     <application>pg_rewind</application> to attach to a target node with a lower
+     timeline than the local node.
+   </para>
    <para>
      We strongly recommend running <command>repmgr node rejoin</command> with the
      <option>--dry-run</option> option first. Additionally it might be a good idea
@@ -378,12 +449,57 @@
      is running in <option>--dry-run</option> mode.
    </para>
 
+   <warning>
+     <para>
+       In all PostgreSQL released before February 2021, <application>pg_rewind</application>
+       contains a corner-case bug which affects standbys in a very specific situation.
+     </para>
+     <para>
+       This situation occurs when a standby was shut down <emphasis>before</emphasis> its
+       primary node, and an attempt is made to attach this standby to another primary
+       in the same cluster (following a &quot;split brain&quot; situation where the standby
+       was connected to the wrong primary). In this case, &repmgr; will correctly determine
+       that <application>pg_rewind</application> should be executed, however
+       <application>pg_rewind</application> incorrectly decides that no action is necessary.
+     </para>
+     <para>
+       In this situation, &repmgr; will report something like:
+<programlisting>
+    NOTICE: pg_rewind execution required for this node to attach to rejoin target node 1
+    DETAIL: rejoin target server's timeline 3 forked off current database system timeline 2 before current recovery point 0/7019C10</programlisting>
+       but when executed, <application>pg_rewind</application> will report:
+<programlisting>
+    pg_rewind: servers diverged at WAL location 0/7015540 on timeline 2
+    pg_rewind: no rewind required</programlisting>
+       and if an attempt is made to attach the standby to the new primary, PostgreSQL logs on the standby
+       will contain errors like:
+<programlisting>
+    [2020-09-07 15:01:41 UTC]    LOG:  00000: replication terminated by primary server
+    [2020-09-07 15:01:41 UTC]    DETAIL:  End of WAL reached on timeline 2 at 0/7015540.
+    [2020-09-07 15:01:41 UTC]    LOG:  00000: new timeline 3 forked off current database system timeline 2 before current recovery point 0/7019C10</programlisting>
+     </para>
+     <para>
+       Currently it is not possible to resolve this situation using <application>pg_rewind</application>.
+       A <ulink url="https://git.postgresql.org/gitweb/?p=postgresql.git;a=commit;h=2b4f3130382fe2f8705863e4d38589d4d69cd695">patch</ulink>
+       was submitted and is included in all PostgreSQL versions released in February 2021 or later.
+     </para>
+     <para>
+       As a workaround, start the primary server the standby was previously attached to,
+       and ensure the standby can be attached to it. If <application>pg_rewind</application> was actually executed,
+       it will have copied in the <filename>.history</filename> file from the target primary server; this must
+       be removed. <command>repmgr node rejoin</command> can then be used to attach the standby to the original
+       primary. Ensure any changes pending on the primary have propagated to the standby. Then shut down the primary
+       server <emphasis>first</emphasis>, before shutting down the standby. It should then be possible to
+       use <command>repmgr node rejoin</command> to attach the standby to the new primary.
+     </para>
+   </warning>
+
   </refsect1>
 
   <refsect1>
     <title>See also</title>
     <para>
-     <xref linkend="repmgr-standby-follow"/>
+     <xref linkend="repmgr-standby-follow"/>, <xref linkend="repmgr-standby-switchover"/>
     </para>
   </refsect1>
 </refentry>

doc/repmgr-node-service.xml

@@ -75,8 +75,22 @@
           <para>
             Issue a <command>CHECKPOINT</command> before stopping or restarting the node.
           </para>
+          <para>
+            Note that a superuser connection is required to be able to execute the
+             <command>CHECKPOINT</command> command.
+          </para>
         </listitem>
      </varlistentry>
+
+     <varlistentry>
+        <term><option>-S</option>/<option>--superuser</option></term>
+        <listitem>
+          <para>
+           Connect as the named superuser instead of the normal &repmgr; user.
+          </para>
+        </listitem>
+     </varlistentry>
+
     </variablelist>
 
   </refsect1>

doc/repmgr-primary-register.xml

@@ -24,10 +24,15 @@
 
     <note>
       <para>
-        It's possibly to install the &repmgr; extension manually before executing
+        &repmgr; will attempt to install the &repmgr; extension as part of this command,
+        however this will fail if the <literal>repmgr</literal> user is not a superuser.
+      </para>
+      <para>
+        It's possible to install the &repmgr; extension manually before executing
         <command>repmgr primary register</command>; in this case &repmgr; will
         detect the presence of the extension and skip that step.
       </para>
+ 
     </note>
 
   </refsect1>
@@ -59,6 +64,21 @@
 
   </refsect1>
 
+  <refsect1>
+    <title>User permission requirements</title>
+    <para>
+      The <literal>repmgr</literal> user must be a superuser in order for &repmgr;
+      to be able to install the <literal>repmgr</literal> extension.
+    </para>
+    <para>
+      If this is not the case, the <literal>repmgr</literal> extension can be installed
+      manually before executing <command>repmgr primary register</command>.
+    </para>
+    <para>
+      A future &repmgr; release will enable the provision of a <option>--superuser</option>
+      name for the installation of the extension.
+    </para>
+  </refsect1>
   <refsect1>
 
     <title>Options</title>

doc/repmgr-primary-unregister.xml

@@ -60,6 +60,17 @@
         </listitem>
       </varlistentry>
 
+     <varlistentry>
+        <term><option>--force</option></term>
+        <listitem>
+          <para>
+            Forcibly unregister the node if it is registered as an active primary,
+            as long as it has no registered standbys; or if it is registered as
+            a primary but running as a standby.
+          </para>
+        </listitem>
+      </varlistentry>
+
     </variablelist>
 
   </refsect1>

doc/repmgr-standby-clone.xml

@@ -104,14 +104,6 @@
 
    <itemizedlist spacing="compact" mark="bullet">
 
-     <listitem>
-       <simpara><varname>standby_mode</varname> (always <literal>'on'</literal>)</simpara>
-     </listitem>
-
-     <listitem>
-       <simpara><varname>recovery_target_timeline</varname> (always <literal>'latest'</literal>)</simpara>
-     </listitem>
-
      <listitem>
        <simpara><varname>primary_conninfo</varname></simpara>
      </listitem>
@@ -122,6 +114,21 @@
 
    </itemizedlist>
 
+   <para>
+     For PostgreSQL 11 and earlier, these parameters will also be set:
+   </para>
+
+   <itemizedlist spacing="compact" mark="bullet">
+     <listitem>
+       <simpara><varname>standby_mode</varname> (always <literal>'on'</literal>)</simpara>
+     </listitem>
+
+     <listitem>
+       <simpara><varname>recovery_target_timeline</varname> (always <literal>'latest'</literal>)</simpara>
+     </listitem>
+   </itemizedlist>
+
+
    <para>
      The following additional parameters can be specified in <filename>repmgr.conf</filename>
      for inclusion in the replication configuration:
@@ -175,7 +182,10 @@
     <programlisting>
       pg_basebackup_options='--wal-method=fetch'</programlisting>
 
-    and ensure that <literal>wal_keep_segments</literal> is set to an appropriately high value.
+    and ensure that <literal>wal_keep_segments</literal> (PostgreSQL 13 and later:
+    <literal>wal_keep_size</literal>) is set to an appropriately high value. Note
+    however that this is not a particularly reliable way of ensuring sufficient
+    WAL is retained and is not recommended.
     See the <ulink url="https://www.postgresql.org/docs/current/app-pgbasebackup.html">
     pg_basebackup</ulink> documentation for details.
    </para>
@@ -188,18 +198,37 @@
    </note>
   </refsect1>
 
+  <refsect1 id="repmgr-standby-clone-wal-directory">
 
+   <title>Placing WAL files into a different directory</title>
+
+   <para>
+     To ensure that WAL files are placed in a directory outside of the main data
+     directory (e.g. to keep them on a separate disk for performance reasons),
+     specify the location with  <option>--waldir</option>
+     (PostgreSQL 9.6 and earlier: <option>--xlogdir</option>) in
+     the <filename>repmgr.conf</filename> parameter <option>pg_basebackup_options</option>,
+     e.g.:
+     <programlisting>
+pg_basebackup_options='--waldir=/path/to/wal-directory'</programlisting>
+     This setting will also be honored by &repmgr; when cloning from Barman
+     (&repmgr; 5.2 and later).
+   </para>
+
+  </refsect1>
+
+<!-- don't rename this id as it may be used in external links -->
   <refsect1 id="repmgr-standby-create-recovery-conf">
 
    <title>Using a standby cloned by another method</title>
 
    <indexterm>
-     <primary>recovery.conf</primary>
+     <primary>replication configuration</primary>
      <secondary>generating for a standby cloned by another method</secondary>
    </indexterm>
 
    <indexterm>
-     <primary>replication configuration</primary>
+     <primary>recovery.conf</primary>
      <secondary>generating for a standby cloned by another method</secondary>
    </indexterm>
 
@@ -224,23 +253,36 @@
      </para>
    </tip>
    <para>
-     Then execute the command <command>repmgr standby clone --recovery-conf-only</command>.
+     Then execute the command <command>repmgr standby clone --replication-conf-only</command>.
      This will create the <filename>recovery.conf</filename> file needed to attach
      the node to its upstream (in PostgreSQL 12 and later: append replication configuration
      to <filename>postgresql.auto.conf</filename>), and will also create a replication slot on the
      upstream node if required.
    </para>
    <para>
-     Note that the upstream node must be running. In PostgreSQL 11 and earlier, an existing
-     <filename>recovery.conf</filename> will not be overwritten unless the
-     <option>-F/--force</option> option is provided.
+     The upstream node must be running so the correct replication configuration can be obtained.
    </para>
    <para>
-     Execute <command>repmgr standby clone --recovery-conf-only --dry-run</command>
-     to check the prerequisites for creating the recovery configuration,
-     and display the contents of the configuration which would be added without actually
-	 making any changes.
+     If the standby is running, the replication configuration will not be written unless the
+     <option>-F/--force</option> option is provided.
    </para>
+   <tip>
+     <para>
+       Execute <command>repmgr standby clone --replication-conf-only --dry-run</command>
+       to check the prerequisites for creating the recovery configuration,
+       and display the configuration changes which would be made without actually
+	   making any changes.
+     </para>
+   </tip>
+   <para>
+     In PostgreSQL 13 and later, the PostgreSQL configuration must be reloaded for replication
+     configuration changes to take effect.
+   </para>
+   <para>
+     In PostgreSQL 12 and earlier, the PostgreSQL instance must be restarted for replication
+     configuration changes to take effect.
+   </para>
+
 
   </refsect1>
 
@@ -266,7 +308,7 @@
             Check prerequisites but don't actually clone the standby.
           </para>
           <para>
-            If <option>--recovery-conf-only</option> specified, the contents of
+            If <option>--replication-conf-only</option> specified, the contents of
             the generated recovery configuration will be displayed
             but not written.
           </para>
@@ -290,6 +332,12 @@
             node to the same path on the standby (default) or to the
             PostgreSQL data directory.
           </para>
+          <para>
+            Note that to be able to use this option, the &repmgr; user must be a superuser or
+            member of the <literal>pg_read_all_settings</literal> predefined role.
+            If this is not the case, provide a valid superuser with the
+            <option>-S</option>/<option>--superuser</option> option.
+          </para>
         </listitem>
       </varlistentry>
 
@@ -302,6 +350,25 @@
         </listitem>
       </varlistentry>
 
+
+      <varlistentry>
+        <term><option>--recovery-min-apply-delay</option></term>
+        <listitem>
+          <para>
+            Set PostgreSQL configuration <option>recovery_min_apply_delay</option> parameter
+            to the provided value.
+          </para>
+          <para>
+            This overrides any <option>recovery_min_apply_delay</option> provided via
+            <filename>repmgr.conf</filename>.
+          </para>
+          <para>
+            For more details on this parameter, see:
+            <ulink url="https://www.postgresql.org/docs/current/runtime-config-replication.html#GUC-RECOVERY-MIN-APPLY-DELAY">recovery_min_apply_delay</ulink>.
+          </para>
+        </listitem>
+      </varlistentry>
+
       <varlistentry>
         <term><option>-R, --remote-user=USERNAME</option></term>
         <listitem>
@@ -312,19 +379,19 @@
       </varlistentry>
 
       <varlistentry>
-        <term><option> --recovery-conf-only</option></term>
+        <term><option>--replication-conf-only</option></term>
         <listitem>
           <para>
             Create recovery configuration for a previously cloned instance.
           </para>
-		  <para>
-			In PostgreSQL 11 and earlier, the replication configuration will be
-			written to <filename>recovery.conf</filename>.
-		  </para>
 		  <para>
 			In PostgreSQL 12 and later, the replication configuration will be
 			written to <filename>postgresql.auto.conf</filename>.
 		  </para>
+		  <para>
+			In PostgreSQL 11 and earlier, the replication configuration will be
+			written to <filename>recovery.conf</filename>.
+		  </para>
         </listitem>
       </varlistentry>
 
@@ -338,11 +405,15 @@
       </varlistentry>
 
       <varlistentry>
-        <term><option>--superuser</option></term>
+        <term><option>-S</option>/<option>--superuser</option></term>
         <listitem>
           <para>
-            If the &repmgr; user is not a superuser, the name of a valid superuser must
-            be provided with this option.
+            The name of a valid PostgreSQL superuser can  be provided with this option.
+          </para>
+          <para>
+            This is only required if the <option>--copy-external-config-files</option> was provided
+            and the &repmgr; user is not a superuser or member of the <literal>pg_read_all_settings</literal>
+            predefined role.
           </para>
         </listitem>
       </varlistentry>
@@ -370,6 +441,23 @@
           </para>
         </listitem>
       </varlistentry>
+
+      <varlistentry>
+        <term><option>--verify-backup</option></term>
+        <listitem>
+          <para>
+            <!-- update link after Pg13 release -->
+            Verify a cloned node using the
+            <ulink url="https://www.postgresql.org/docs/13/app-pgverifybackup.html">pg_verifybackup</ulink>
+            utility (PostgreSQL 13 and later).
+          </para>
+          <para>
+            This option can currently only be used when cloning directly from an upstream
+            node.
+          </para>
+        </listitem>
+      </varlistentry>
+
       <varlistentry>
         <term><option>--without-barman </option></term>
         <listitem>

doc/repmgr-standby-follow.xml

@@ -47,7 +47,15 @@
     </para>
 
     <para>
-      This command will force a restart of PostgreSQL on the standby node.
+      In PostgreSQL 12 and earlier, this command will force a restart of PostgreSQL on the standby node.
+    </para>
+
+    <para>
+      In PostgreSQL 13 and later, by default this command will signal PostgreSQL to reload its
+      configuration, which will cause PostgreSQL to follow the new upstream without
+      a restart. If this behaviour is not desired for whatever reason, the configuration
+      file parameter <varname>standby_follow_restart</varname> can be set <literal>true</literal>
+      to always force a restart.
     </para>
 
     <para>

doc/repmgr-standby-promote.xml

@@ -66,10 +66,10 @@
       Both values can be defined in <filename>repmgr.conf</filename>.
     </para>
 
-    <note>
+    <warning>
       <para>
-        If WAL replay is paused on the standby, and not all WAL files on the standby have been
-        replayed, &repmgr; will not attempt to promote it.
+        In PostgreSQL 12 and earlier, if WAL replay is paused on the standby, and not all
+        WAL files on the standby have been replayed, &repmgr; will not attempt to promote it.
       </para>
       <para>
         This is because if WAL replay is paused, PostgreSQL itself will not react to a promote command
@@ -81,11 +81,15 @@
         Note that if the standby is in archive recovery, &repmgr; will not be able to determine
         if more WAL is pending replay, and will abort the promotion attempt if WAL replay is paused.
       </para>
-    </note>
+      <para>
+        This restriction does <emphasis>not</emphasis> apply to PostgreSQL 13 and later.
+      </para>
+    </warning>
 
   </refsect1>
 
 
+
   <refsect1>
     <title>Example</title>
     <para>
@@ -94,13 +98,46 @@
       NOTICE: promoting standby to primary
       DETAIL: promoting server "node2" (ID: 2) using "pg_ctl -l /var/log/postgres/startup.log -w -D '/var/lib/postgres/data' promote"
       server promoting
-      DEBUG: setting node 2 as primary and marking existing primary as failed
       NOTICE: STANDBY PROMOTE successful
       DETAIL: server "node2" (ID: 2) was successfully promoted to primary</programlisting>
     </para>
   </refsect1>
 
 
+  <refsect1>
+    <title>User permission requirements</title>
+    <para><emphasis>pg_promote() (PostgreSQL 12 and later)</emphasis></para>
+    <para>
+      From PostgreSQL 12, &repmgr; will attempt to use the built-in <function>pg_promote()</function>
+      function to promote a standby to primary.
+    </para>
+    <para>
+      By default, execution of <function>pg_promote()</function> is restricted to superusers.
+      If the <literal>repmgr</literal> user does not have permission to execute
+      <function>pg_promote()</function>, &repmgr; will fall back to using &quot;<command>pg_ctl promote</command>&quot;.
+    </para>
+    <tip>
+      <para>
+        Execute <command>repmgr standby promote</command> with the <option>--dry-run</option>
+        to check whether the &repmgr; user has permission to execute <function>pg_promote()</function>.
+      </para>
+      <para>
+        If the <literal>repmgr</literal> user is not a superuser, execution permission for this
+        function can be granted with e.g.:
+        <programlisting>
+    GRANT EXECUTE ON FUNCTION pg_catalog.pg_promote TO repmgr</programlisting>
+      </para>
+      <para>
+        Note that permissions are only effective for the database they are granted in, so
+        this <emphasis>must</emphasis> be executed in the &repmgr; database to be effective.
+      </para>
+    </tip>
+    <para>
+      For more details on <function>pg_promote()</function>, see the
+      <ulink url="https://www.postgresql.org/docs/current/functions-admin.html#FUNCTIONS-RECOVERY-CONTROL-TABLE">PostgreSQL documentation</ulink>.
+    </para>
+  </refsect1>
+
   <refsect1>
     <title>Options</title>
     <variablelist>
@@ -135,6 +172,42 @@
         </listitem>
       </varlistentry>
 
+      <varlistentry>
+        <term><option>-F</option></term>
+        <term><option>--force</option></term>
+        <listitem>
+          <para>
+            Ignore warnings and continue anyway.
+          </para>
+          <para>
+            This option is relevant in the following situations if <option>--siblings-follow</option> was specified:
+            <itemizedlist spacing="compact" mark="bullet">
+              <listitem>
+                <simpara>
+                  If one or more sibling nodes was not reachable via SSH, the standby will be promoted anyway.
+                </simpara>
+              </listitem>
+              <listitem>
+                <simpara>
+                  If the promotion candidate has insufficient free walsenders to accommodate the standbys which will
+                  be attached to it, the standby will be promoted anyway.
+                </simpara>
+              </listitem>
+              <listitem>
+                <simpara>
+                  If replication slots are in use but the promotion candidate has insufficient free replication slots
+                  to accommodate the standbys which will be attached to it, the standby will be promoted anyway.
+                </simpara>
+              </listitem>
+            </itemizedlist>
+          </para>
+          <para>
+            Note that if the <option>-F</option>/<option>--force</option> option is used when any of the above
+            situations is encountered, the onus is on the user to manually resolve any resulting issues.
+          </para>
+        </listitem>
+      </varlistentry>
+
     </variablelist>
   </refsect1>
 
@@ -172,6 +245,23 @@
 		 </simpara>
 	   </listitem>
 
+       <listitem>
+        <indexterm>
+          <primary>service_promote_command</primary>
+          <secondary>with &quot;repmgr standby promote &quot;</secondary>
+        </indexterm>
+         <simpara>
+           <literal>service_promote_command</literal>:
+           a command which will be executed instead of <command>pg_ctl promote</command>
+           or (in PostgreSQL 12 and later) <function>pg_promote()</function>.
+         </simpara>
+         <simpara>
+           This is intended for systems which provide a package-level promote command,
+           such as Debian's <application>pg_ctlcluster</application>, to promote the
+           PostgreSQL from standby to primary.
+         </simpara>
+       </listitem>
+
 	  </itemizedlist>
 	</para>
 

doc/repmgr-standby-register.xml

@@ -111,7 +111,7 @@
      <command><ulink url="https://docs.pgbarman.org/#recover">barman recover</ulink></command>
      command), register the node as detailed in section
      <xref linkend="repmgr-standby-register-inactive-node"/> then execute
-     <link linkend="repmgr-standby-create-recovery-conf">repmgr standby clone --recovery-conf-only</link>
+     <link linkend="repmgr-standby-create-recovery-conf">repmgr standby clone --replication-conf-only</link>
      to generate the appropriate replication configuration.
     </para>
   </refsect1>

doc/repmgr-standby-switchover.xml

@@ -63,6 +63,45 @@
   </refsect1>
 
   <refsect1>
+    <title>User permission requirements</title>
+    <para><emphasis>data_directory</emphasis></para>
+    <para>
+      &repmgr; needs to be able to determine the location of the data directory on the
+      demotion candidate. If the &repmgr; is not a superuser or member of the <varname>pg_read_all_settings</varname>
+      <ulink url="https://www.postgresql.org/docs/current/predefined-roles.html">predefined roles</ulink>,
+      the name of a superuser should be provided with the <option>-S</option>/<option>--superuser</option> option.
+    </para>
+    <para><emphasis>CHECKPOINT</emphasis></para>
+    <para>
+      &repmgr; executes <command>CHECKPOINT</command> on the demotion candidate as part of the shutdown
+      process to ensure it shuts down as smoothly as possible.
+    </para>
+    <para>
+      Note that <command>CHECKPOINT</command> requires database superuser permissions to execute.
+      If the <literal>repmgr</literal> user is not a superuser, the name of a superuser should be
+      provided with the <option>-S</option>/<option>--superuser</option> option.
+    </para>
+    <para>
+      If &repmgr; is unable to execute the <command>CHECKPOINT</command> command, the switchover
+      can still be carried out, albeit at a greater risk that the demotion candidate may not
+      be able to shut down as smoothly as might otherwise have been the case.
+    </para>
+    <para><emphasis>pg_promote() (PostgreSQL 12 and later)</emphasis></para>
+    <para>
+      From PostgreSQL 12, &repmgr; defaults to using the built-in <command>pg_promote()</command> function to
+      promote a standby to primary.
+    </para>
+    <para>
+      Note that execution of <function>pg_promote()</function> is restricted to superusers or to
+      any user who has been granted execution permission for this function. If the &repmgr; user
+      is not permitted to execute <function>pg_promote()</function>, &repmgr; will fall back to using
+      &quot;<command>pg_ctl promote</command>&quot;. For more details see
+      <link linkend="repmgr-standby-promote">repmgr standby promote</link>.
+    </para>
+  </refsect1>
+
+  <refsect1>
+
     <title>Options</title>
     <variablelist>
 
@@ -115,9 +154,12 @@
           <para>
             Use <application>pg_rewind</application> to reintegrate the old primary if necessary
             (and the prerequisites for using <application>pg_rewind</application> are met).
-            If using PostgreSQL 9.3 or 9.4, and the <application>pg_rewind</application>
+          </para>
+          <para>
+            If using PostgreSQL 9.4, and the <application>pg_rewind</application>
             binary is not installed in the PostgreSQL <filename>bin</filename> directory,
-            provide its full path. For more details see also <xref linkend="switchover-pg-rewind"/>.
+            provide its full path. For more details see also <xref linkend="switchover-pg-rewind"/>
+            and <xref linkend="repmgr-node-rejoin-pg-rewind"/>.
           </para>
         </listitem>
       </varlistentry>
@@ -184,6 +226,17 @@
           </note>
         </listitem>
       </varlistentry>
+
+     <varlistentry>
+        <term><option>-S</option>/<option>--superuser</option></term>
+        <listitem>
+          <para>
+            Use the named superuser instead of the normal &repmgr; user to perform
+            actions requiring superuser permissions.
+          </para>
+        </listitem>
+     </varlistentry>
+
     </variablelist>
 
   </refsect1>

doc/repmgr-witness-register.xml

@@ -63,6 +63,34 @@
   </refsect1>
 
 
+
+  <refsect1>
+
+    <title>Options</title>
+   <variablelist>
+
+      <varlistentry>
+        <term><option>--dry-run</option></term>
+        <listitem>
+          <para>
+            Check prerequisites but don't actually register the witness
+          </para>
+        </listitem>
+      </varlistentry>
+
+
+      <varlistentry>
+       <term><option>-F</option>/<option>--force</option></term>
+        <listitem>
+          <para>
+            Overwrite an existing node record
+          </para>
+        </listitem>
+      </varlistentry>
+
+   </variablelist>
+  </refsect1>
+
   <refsect1 id="repmgr-witness-register-events">
     <title>Event notifications</title>
     <para>

doc/repmgr.xml

@@ -18,7 +18,7 @@
  <title>repmgr &repmgrversion; Documentation</title>
 
  <bookinfo>
-  <corpauthor>2ndQuadrant Ltd</corpauthor>
+  <corpauthor>EDB</corpauthor>
   <productname>repmgr</productname>
   <productnumber>&repmgrversion;</productnumber>
   &legal;
@@ -26,7 +26,7 @@
   <abstract>
    <para>
    This is the official documentation of &repmgr; &repmgrversion; for
-   use with PostgreSQL 9.3 - PostgreSQL 12.
+   use with PostgreSQL 9.4 - PostgreSQL 15.
    </para>
    <para>
      &repmgr; is being continually developed and we strongly recommend using the
@@ -38,20 +38,19 @@
 
    <para>
     &repmgr; is developed by
-    <ulink url="https://2ndquadrant.com">2ndQuadrant</ulink>
+    <ulink url="https://www.enterprisedb.com/">EDB</ulink>
     along with contributions from other individuals and organisations.
     Contributions from the community are appreciated and welcome - get
-    in touch via <ulink url="https://github.com/2ndQuadrant/repmgr">github</ulink>
+    in touch via <ulink url="https://github.com/EnterpriseDB/repmgr">github</ulink>
     or <ulink url="https://groups.google.com/group/repmgr">the mailing list/forum</ulink>.
-    Multiple 2ndQuadrant customers contribute funding
-    to make repmgr development possible.
+    Multiple EDB customers contribute funding to make &repmgr; development possible.
    </para>
 
    <para>
-     &repmgr; is fully supported by 2ndQuadrant's
-     <ulink url="https://www.2ndquadrant.com/en/support/support-postgresql/">24/7 Production Support</ulink>.
-     2ndQuadrant, a Major Sponsor of the PostgreSQL project, continues to develop and maintain &repmgr;.
-     Other organisations as well as individual developers are welcome to participate in the efforts.
+     &repmgr; is fully supported by EDB's
+     <ulink url="https://www.enterprisedb.com/support/postgresql-support-overview-get-the-most-out-of-postgresql">24/7 Production Support</ulink>.
+     EDB, a Major Sponsor of the PostgreSQL project, continues to maintain &repmgr;.
+     We welcome participation from other organisations and individual developers.
    </para>
   </abstract>
 
@@ -91,7 +90,6 @@
   &repmgrd-automatic-failover;
   &repmgrd-configuration;
   &repmgrd-operation;
-  &repmgrd-bdr;
  </part>
 
  <part id="repmgr-command-reference">

doc/repmgrd-automatic-failover.xml

@@ -81,11 +81,15 @@
  </para>
  <note>
    <simpara>
-     &repmgr; 3.3 and earlier provided a <command>repmgr create witness</command>
-     command, which would automatically create a PostgreSQL instance. However
-     this often resulted in an unsatisfactory, hard-to-customise instance.
+     A PostgreSQL instance can only accommodate a single witness server.
+   </simpara>
+   <simpara>
+     If you are planning to use a single server to support more than one
+     witness server, a separate PostgreSQL instance is required for each
+     witness server in use.
    </simpara>
  </note>
+
  <para>
    The witness server should be configured in the same way as a normal
    &repmgr; node; see section <xref linkend="configuration"/>.
@@ -192,8 +196,8 @@
     connected. Beginning with <link linkend="release-4.4">&repmgr; 4.4</link>
     it is now possible for the affected standbys to build a consensus about whether
     the primary is still available to some standbys (&quot;primary visibility consensus&quot;).
-    This is done by polling each standby for the time it last saw the primary;
-    if any have seen the primary very recently, it's reasonable
+    This is done by polling each standby (and the witness, if present) for the time it last saw the
+    primary; if any have seen the primary very recently, it's reasonable
     to infer that the primary is still available and a failover should not be started.
   </para>
 
@@ -205,9 +209,10 @@
     <programlisting>$ repmgr -f /etc/repmgr.conf service status
  ID | Name  | Role    | Status    | Upstream | repmgrd | PID   | Paused? | Upstream last seen
 ----+-------+---------+-----------+----------+---------+-------+---------+--------------------
- 1  | node1 | primary | * running |          | running | 96563 | no      | n/a
- 2  | node2 | standby |   running | node1    | running | 96572 | no      | 1 second(s) ago
- 3  | node3 | standby |   running | node1    | running | 96584 | no      | 0 second(s) ago</programlisting>
+ 1  | node1 | primary | * running |          | running | 27259 | no      | n/a
+ 2  | node2 | standby |   running | node1    | running | 27272 | no      | 1 second(s) ago
+ 3  | node3 | standby |   running | node1    | running | 27282 | no      | 0 second(s) ago
+ 4  | node4 | witness | * running | node1    | running | 27298 | no      | 1 second(s) ago</programlisting>
 
   </para>
 
@@ -330,11 +335,12 @@
     To use this, <option>failover_validation_command</option> in <filename>repmgr.conf</filename>
     to a script executable by the <literal>postgres</literal> system user, e.g.:
     <programlisting>
-      failover_validation_command=/path/to/script.sh %n %a</programlisting>
+      failover_validation_command=/path/to/script.sh %n</programlisting>
   </para>
   <para>
-    The <literal>%n</literal> parameter will be replaced with the node ID, and the
-    <literal>%a</literal> parameter will be replaced by the node name when the script is executed.
+    The <literal>%n</literal> parameter will be replaced with the node ID when the script is
+    executed. A number of other parameters are also available, see section
+    &quot;<xref linkend="repmgrd-automatic-failover-configuration-optional"/>&quot; for details.
   </para>
   <para>
     This script must return an exit code of <literal>0</literal> to indicate the node should promote itself.
@@ -584,7 +590,7 @@ INFO:  node 3 received notification to rerun promotion candidate election
   <sect2 id="repmgrd-primary-child-disconnection-caveats">
 	<title>Standby disconnections monitoring caveats</title>
 	<para>
-	  The follwing caveats should be considered if you are intending to use this functionality.
+	  The following caveats should be considered if you are intending to use this functionality.
 	</para>
 	<para>
 	  <itemizedlist mark="bullet">

doc/repmgrd-bdr.xml

@@ -1,429 +0,0 @@
-<chapter id="repmgrd-bdr">
-  <title>BDR failover with repmgrd</title>
-
-  <indexterm>
-    <primary>repmgrd</primary>
-    <secondary>BDR</secondary>
-  </indexterm>
-
-  <indexterm>
-    <primary>BDR</primary>
-  </indexterm>
-
-  <para>
-    &repmgr; 4.x provides support for monitoring a pair of BDR 2.x nodes and taking action in
-    case one of the nodes fails.
-  </para>
-  <note>
-    <simpara>
-      Due to the nature of BDR 1.x/2.x, it's only safe to use this solution for
-      a two-node scenario. Introducing additional nodes will create an inherent
-      risk of node desynchronisation if a node goes down without being cleanly
-      removed from the cluster.
-    </simpara>
-  </note>
-  <para>
-    In contrast to streaming replication, there's no concept of "promoting" a new
-    primary node with BDR. Instead, "failover" involves monitoring both nodes
-    with &repmgrd; and redirecting queries from the failed node to the remaining
-    active node. This can be done by using an
-    <link linkend="event-notifications">event notification</link> script
-    which is called by &repmgrd; to dynamically
-    reconfigure a proxy server/connection pooler such as <application>PgBouncer</application>.
-  </para>
-
-  <note>
-    <simpara>
-      This &repmgr; functionality is for BDR 2.x only running on PostgreSQL 9.4/9.6.
-      It is <emphasis>not</emphasis> required for later BDR versions.
-    </simpara>
-  </note>
-
-  <sect1 id="bdr-prerequisites" xreflabel="BDR prequisites">
-    <title>Prerequisites</title>
-    <important>
-      <para>
-        This &repmgr; functionality is for BDR 2.x only running on PostgreSQL 9.4/9.6.
-        It is <emphasis>not</emphasis> required for later BDR versions.
-      </para>
-    </important>
-    <para>
-      &repmgr; 4 requires PostgreSQL 9.4 or 9.6 with the BDR 2 extension
-      enabled and configured for a two-node BDR network. &repmgr; 4 packages
-      must be installed on each node before attempting to configure
-      <application>repmgr</application>.
-    </para>
-    <note>
-      <simpara>
-        &repmgr; 4 will refuse to install if it detects more than two BDR nodes.
-      </simpara>
-    </note>
-    <para>
-      Application database connections *must* be passed through a proxy server/
-      connection pooler such as <application>PgBouncer</application>, and it must be possible to dynamically
-      reconfigure that from &repmgrd;. The example demonstrated in this document
-      will use <application>PgBouncer</application>
-    </para>
-    <para>
-      The proxy server / connection poolers must <emphasis>not</emphasis>
-      be installed on the database servers.
-    </para>
-    <para>
-      For this example, it's assumed password-less SSH connections are available
-      from the PostgreSQL servers to the servers where <application>PgBouncer</application>
-      runs, and that the user on those servers has permission to alter the
-      <application>PgBouncer</application> configuration files.
-    </para>
-    <para>
-      PostgreSQL connections must be possible between each node, and each node
-      must be able to connect to each PgBouncer instance.
-    </para>
-  </sect1>
-
-  <sect1 id="bdr-configuration" xreflabel="BDR configuration">
-    <title>Configuration</title>
-    <para>
-      A sample configuration for <filename>repmgr.conf</filename> on each
-      BDR node would look like this:
-      <programlisting>
-        # Node information
-        node_id=1
-        node_name='node1'
-        conninfo='host=node1 dbname=bdrtest user=repmgr connect_timeout=2'
-        data_directory='/var/lib/postgresql/data'
-        replication_type='bdr'
-
-        # Event notification configuration
-        event_notifications=bdr_failover
-        event_notification_command='/path/to/bdr-pgbouncer.sh %n %e %s "%c" "%a" >> /tmp/bdr-failover.log 2>&amp;1'
-
-        # repmgrd options
-        monitor_interval_secs=5
-        reconnect_attempts=6
-        reconnect_interval=5</programlisting>
-    </para>
-    <para>
-      Adjust settings as appropriate; copy and adjust for the second node (particularly
-      the values <varname>node_id</varname>, <varname>node_name</varname>
-      and <varname>conninfo</varname>).
-    </para>
-    <para>
-      Note that the values provided for the <varname>conninfo</varname> string
-      must be valid for connections from <emphasis>both</emphasis> nodes in the
-      replication cluster. The database must be the BDR-enabled database.
-    </para>
-    <para>
-      If defined, the <varname>event_notifications</varname> parameter will restrict
-      execution of the script defined in  <varname>event_notification_command</varname>
-      to the specified event(s).
-    </para>
-    <note>
-      <simpara>
-        <varname>event_notification_command</varname> is the script which does the actual "heavy lifting"
-        of reconfiguring the proxy server/ connection pooler. It is fully
-        user-definable; see section <xref linkend="bdr-event-notification-command"/> for a reference
-        implementation.
-      </simpara>
-    </note>
-
-  </sect1>
-
-  <sect1 id="bdr-repmgr-setup" xreflabel="repmgr setup with BDR">
-    <title>repmgr setup</title>
-    <para>
-      Register both nodes; example on <literal>node1</literal>:
-      <programlisting>
-        $ repmgr -f /etc/repmgr.conf bdr register
-        NOTICE: attempting to install extension "repmgr"
-        NOTICE: "repmgr" extension successfully installed
-        NOTICE: node record created for node 'node1' (ID: 1)
-        NOTICE: BDR node 1 registered (conninfo: host=node1 dbname=bdrtest user=repmgr)</programlisting>
-    </para>
-    <para>
-      and on <literal>node1</literal>:
-      <programlisting>
-        $ repmgr -f /etc/repmgr.conf bdr register
-        NOTICE: node record created for node 'node2' (ID: 2)
-        NOTICE: BDR node 2 registered (conninfo: host=node2 dbname=bdrtest user=repmgr)</programlisting>
-    </para>
-    <para>
-      The <literal>repmgr</literal> extension will be automatically created
-      when the first node is registered, and will be propagated to the second
-      node.
-    </para>
-    <important>
-      <simpara>
-        Ensure the &repmgr; package is available on both nodes before
-        attempting to register the first node.
-      </simpara>
-    </important>
-    <para>
-      At this point the meta data for both nodes has been created; executing
-      <xref linkend="repmgr-cluster-show"/> (on either node) should produce output like this:
-      <programlisting>
-        $ repmgr -f /etc/repmgr.conf cluster show
-        ID | Name  | Role | Status    | Upstream | Location | Connection string
-       ----+-------+------+-----------+----------+--------------------------------------------------------
-        1  | node1 | bdr  | * running |          | default  | host=node1 dbname=bdrtest user=repmgr connect_timeout=2
-        2  | node2 | bdr  | * running |          | default  | host=node2 dbname=bdrtest user=repmgr connect_timeout=2</programlisting>
-    </para>
-    <para>
-      Additionally it's possible to display log of significant events;  executing
-      <xref linkend="repmgr-cluster-event"/> (on either node) should produce output like this:
-      <programlisting>
-        $ repmgr -f /etc/repmgr.conf cluster event
-        Node ID | Event        | OK | Timestamp           | Details
-       ---------+--------------+----+---------------------+----------------------------------------------
-        2       | bdr_register | t  | 2017-07-27 17:51:48 | node record created for node 'node2' (ID: 2)
-        1       | bdr_register | t  | 2017-07-27 17:51:00 | node record created for node 'node1' (ID: 1)
-      </programlisting>
-    </para>
-    <para>
-      At this point there will only be records for the two node registrations (displayed here
-      in reverse chronological order).
-    </para>
-  </sect1>
-
-  <sect1 id="bdr-event-notification-command" xreflabel="Defining the BDR failover &quot;event_notification command&quot;">
-    <title>Defining the BDR failover "event_notification_command"</title>
-    <para>
-      Key to "failover" execution is the <literal>event_notification_command</literal>,
-      which is a user-definable script specified in <filename>repmpgr.conf</filename>
-      and which can use a &repmgr; <link linkend="event-notifications">event notification</link>
-      to reconfigure the proxy server / connection pooler so it points to the other, still-active node.
-      Details of the event will be passed as parameters to the script.
-    </para>
-    <para>
-      Following parameter placeholders are available for the script definition in <filename>repmpgr.conf</filename>;
-      these will be replaced with the appropriate value when the script is executed:
-    </para>
-
-    <variablelist>
-      <varlistentry>
-        <term><option>%n</option></term>
-        <listitem>
-          <para>
-            node ID
-          </para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><option>%e</option></term>
-        <listitem>
-          <para>
-            event type
-          </para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><option>%t</option></term>
-        <listitem>
-          <para>
-            success (1 or 0)
-          </para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>%t</option></term>
-        <listitem>
-          <para>
-            timestamp
-          </para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><option>%d</option></term>
-        <listitem>
-          <para>
-            details
-          </para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>%c</option></term>
-        <listitem>
-          <para>
-            conninfo string of the next available node (<varname>bdr_failover</varname> and <varname>bdr_recovery</varname>)
-          </para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>%a</option></term>
-        <listitem>
-          <para>
-            name of the next available node (<varname>bdr_failover</varname> and <varname>bdr_recovery</varname>)
-          </para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-
-    <para>
-      Note that <literal>%c</literal> and <literal>%a</literal> are only provided with
-      particular failover events, in this case <varname>bdr_failover</varname>.
-    </para>
-    <para>
-      The provided sample script
-     (<literal><ulink url="https://raw.githubusercontent.com/2ndQuadrant/repmgr/master/scripts/bdr-pgbouncer.sh">scripts/bdr-pgbouncer.sh</ulink></literal>)
-      is configured as follows:
-      <programlisting>
-        event_notification_command='/path/to/bdr-pgbouncer.sh %n %e %s "%c" "%a"'</programlisting>
-    </para>
-    <para>
-      and parses the placeholder parameters like this:
-      <programlisting>
-        NODE_ID=$1
-        EVENT_TYPE=$2
-        SUCCESS=$3
-        NEXT_CONNINFO=$4
-        NEXT_NODE_NAME=$5</programlisting>
-    </para>
-    <note>
-      <para>
-        The sample script also contains some hard-coded values for the <application>PgBouncer</application>
-        configuration for both nodes; these will need to be adjusted for your local environment
-        (ideally the scripts would be maintained as templates and generated by some
-        kind of provisioning system).
-      </para>
-    </note>
-
-    <para>
-      The script performs following steps:
-      <itemizedlist spacing="compact" mark="bullet">
-        <listitem>
-          <simpara>pauses <application>PgBouncer</application> on all nodes</simpara>
-        </listitem>
-        <listitem>
-          <simpara>recreates the <application>PgBouncer</application> configuration file on each
-            node using the information provided by &repmgrd;
-            (primarily the <varname>conninfo</varname> string) to configure
-            <application>PgBouncer</application></simpara>
-        </listitem>
-        <listitem>
-          <simpara>reloads the <application>PgBouncer</application> configuration</simpara>
-        </listitem>
-        <listitem>
-          <simpara>executes the <command>RESUME</command> command (in <application>PgBouncer</application>)</simpara>
-        </listitem>
-      </itemizedlist>
-    </para>
-    <para>
-      Following successful script execution, any connections to PgBouncer on the failed BDR node
-      will be redirected to the active node.
-    </para>
-  </sect1>
-
-  <sect1 id="bdr-monitoring-failover" xreflabel="Node monitoring and failover">
-    <title>Node monitoring and failover</title>
-    <para>
-      At the intervals specified by <varname>monitor_interval_secs</varname>
-      in <filename>repmgr.conf</filename>, &repmgrd;
-      will ping each node to check if it's available. If a node isn't available,
-      &repmgrd; will enter failover mode and check <varname>reconnect_attempts</varname>
-      times at intervals of <varname>reconnect_interval</varname> to confirm the node is definitely unreachable.
-      This buffer period is necessary to avoid false positives caused by transient
-      network outages.
-    </para>
-    <para>
-      If the node is still unavailable, &repmgrd; will enter failover mode and execute
-      the script defined in <varname>event_notification_command</varname>; an entry will be logged
-      in the <literal>repmgr.events</literal> table and &repmgrd; will
-      (unless otherwise configured) resume monitoring of the node in "degraded" mode until it reappears.
-    </para>
-    <para>
-      &repmgrd; logfile output during a failover event will look something like this
-      on one node (usually the node which has failed, here <literal>node2</literal>):
-      <programlisting>
-            ...
-    [2017-07-27 21:08:39] [INFO] starting continuous BDR node monitoring
-    [2017-07-27 21:08:39] [INFO] monitoring BDR replication status on node "node2" (ID: 2)
-    [2017-07-27 21:08:55] [INFO] monitoring BDR replication status on node "node2" (ID: 2)
-    [2017-07-27 21:09:11] [INFO] monitoring BDR replication status on node "node2" (ID: 2)
-    [2017-07-27 21:09:23] [WARNING] unable to connect to node node2 (ID 2)
-    [2017-07-27 21:09:23] [INFO] checking state of node 2, 0 of 5 attempts
-    [2017-07-27 21:09:23] [INFO] sleeping 1 seconds until next reconnection attempt
-    [2017-07-27 21:09:24] [INFO] checking state of node 2, 1 of 5 attempts
-    [2017-07-27 21:09:24] [INFO] sleeping 1 seconds until next reconnection attempt
-    [2017-07-27 21:09:25] [INFO] checking state of node 2, 2 of 5 attempts
-    [2017-07-27 21:09:25] [INFO] sleeping 1 seconds until next reconnection attempt
-    [2017-07-27 21:09:26] [INFO] checking state of node 2, 3 of 5 attempts
-    [2017-07-27 21:09:26] [INFO] sleeping 1 seconds until next reconnection attempt
-    [2017-07-27 21:09:27] [INFO] checking state of node 2, 4 of 5 attempts
-    [2017-07-27 21:09:27] [INFO] sleeping 1 seconds until next reconnection attempt
-    [2017-07-27 21:09:28] [WARNING] unable to reconnect to node 2 after 5 attempts
-    [2017-07-27 21:09:28] [NOTICE] setting node record for node 2 to inactive
-    [2017-07-27 21:09:28] [INFO] executing notification command for event "bdr_failover"
-    [2017-07-27 21:09:28] [DETAIL] command is:
-      /path/to/bdr-pgbouncer.sh 2 bdr_failover 1 "host=host=node1 dbname=bdrtest user=repmgr connect_timeout=2" "node1"
-    [2017-07-27 21:09:28] [INFO] node 'node2' (ID: 2) detected as failed; next available node is 'node1' (ID: 1)
-    [2017-07-27 21:09:28] [INFO] monitoring BDR replication status on node "node2" (ID: 2)
-    [2017-07-27 21:09:28] [DETAIL] monitoring node "node2" (ID: 2) in degraded mode
-    ...</programlisting>
-    </para>
-    <para>
-      Output on the other node (<literal>node1</literal>) during the same event will look like this:
-      <programlisting>
-    ...
-    [2017-07-27 21:08:35] [INFO] starting continuous BDR node monitoring
-    [2017-07-27 21:08:35] [INFO] monitoring BDR replication status on node "node1" (ID: 1)
-    [2017-07-27 21:08:51] [INFO] monitoring BDR replication status on node "node1" (ID: 1)
-    [2017-07-27 21:09:07] [INFO] monitoring BDR replication status on node "node1" (ID: 1)
-    [2017-07-27 21:09:23] [WARNING] unable to connect to node node2 (ID 2)
-    [2017-07-27 21:09:23] [INFO] checking state of node 2, 0 of 5 attempts
-    [2017-07-27 21:09:23] [INFO] sleeping 1 seconds until next reconnection attempt
-    [2017-07-27 21:09:24] [INFO] checking state of node 2, 1 of 5 attempts
-    [2017-07-27 21:09:24] [INFO] sleeping 1 seconds until next reconnection attempt
-    [2017-07-27 21:09:25] [INFO] checking state of node 2, 2 of 5 attempts
-    [2017-07-27 21:09:25] [INFO] sleeping 1 seconds until next reconnection attempt
-    [2017-07-27 21:09:26] [INFO] checking state of node 2, 3 of 5 attempts
-    [2017-07-27 21:09:26] [INFO] sleeping 1 seconds until next reconnection attempt
-    [2017-07-27 21:09:27] [INFO] checking state of node 2, 4 of 5 attempts
-    [2017-07-27 21:09:27] [INFO] sleeping 1 seconds until next reconnection attempt
-    [2017-07-27 21:09:28] [WARNING] unable to reconnect to node 2 after 5 attempts
-    [2017-07-27 21:09:28] [NOTICE] other node's repmgrd is handling failover
-    [2017-07-27 21:09:28] [INFO] monitoring BDR replication status on node "node1" (ID: 1)
-    [2017-07-27 21:09:28] [DETAIL] monitoring node "node2" (ID: 2) in degraded mode
-    ...</programlisting>
-    </para>
-    <para>
-      This assumes only the PostgreSQL instance on <literal>node2</literal> has failed. In this case the
-      &repmgrd; instance running on <literal>node2</literal> has performed the failover. However if
-      the entire server becomes unavailable, &repmgrd; on <literal>node1</literal> will perform
-      the failover.
-    </para>
-  </sect1>
-  <sect1 id="bdr-node-recovery" xreflabel="Node recovery">
-    <title>Node recovery</title>
-    <para>
-      Following failure of a BDR node, if the node subsequently becomes available again,
-      a <varname>bdr_recovery</varname> event will be generated. This could potentially be used to
-      reconfigure PgBouncer automatically to bring the node back into the available pool,
-      however it would be prudent to manually verify the node's status before
-      exposing it to the application.
-    </para>
-    <para>
-      If the failed node comes back up and connects correctly, output similar to this
-      will be visible in the &repmgrd; log:
-      <programlisting>
-        [2017-07-27 21:25:30] [DETAIL] monitoring node "node2" (ID: 2) in degraded mode
-        [2017-07-27 21:25:46] [INFO] monitoring BDR replication status on node "node2" (ID: 2)
-        [2017-07-27 21:25:46] [DETAIL] monitoring node "node2" (ID: 2) in degraded mode
-        [2017-07-27 21:25:55] [INFO] active replication slot for node "node1" found after 1 seconds
-        [2017-07-27 21:25:55] [NOTICE] node "node2" (ID: 2) has recovered after 986 seconds</programlisting>
-    </para>
-  </sect1>
-
-  <sect1 id="bdr-complete-shutdown" xreflabel="Shutdown of both nodes">
-    <title>Shutdown of both nodes</title>
-    <para>
-      If both PostgreSQL instances are shut down, &repmgrd; will try and handle the
-      situation as gracefully as possible, though with no failover candidates available
-      there's not much it can do. Should this case ever occur, we recommend shutting
-      down &repmgrd; on both nodes and restarting it once the PostgreSQL instances
-      are running properly.
-    </para>
-  </sect1>
-</chapter>
-

doc/repmgrd-configuration.xml

@@ -15,9 +15,13 @@
   </para>
   <para>
     &repmgrd; can be configured to provide failover
-    capability in case the primary upstream node becomes unreachable, and/or
+    capability in case the primary or upstream node becomes unreachable, and/or
     provide monitoring data to the &repmgr; metadatabase.
   </para>
+  <para>
+    From &repmgr; 4.4, when running on the primary node, &repmgrd; can also monitor
+    standby disconnections/reconnections (see <xref linkend="repmgrd-primary-child-disconnection"/>).
+  </para>
 
   <sect1 id="repmgrd-basic-configuration">
     <title>repmgrd configuration</title>
@@ -85,6 +89,10 @@
                   <literal>query</literal> - determines server availability
                   by executing an SQL statement on the node via the existing connection
                 </simpara>
+                <simpara>
+                  The query is a minimal throwaway query - <command>SELECT 1</command> -
+                  which is used to determine that the server can accept queries.
+                </simpara>
               </listitem>
 
             </itemizedlist>
@@ -148,7 +156,7 @@
     </variablelist>
 
       <para>
-        See also <filename><ulink url="https://raw.githubusercontent.com/2ndQuadrant/repmgr/master/repmgr.conf.sample">repmgr.conf.sample</ulink></filename> for an annotated sample configuration file.
+        See also <filename><ulink url="https://raw.githubusercontent.com/EnterpriseDB/repmgr/master/repmgr.conf.sample">repmgr.conf.sample</ulink></filename> for an annotated sample configuration file.
       </para>
 
     <sect2 id="repmgrd-automatic-failover-configuration">
@@ -321,11 +329,11 @@
 
     </sect2>
 
-    <sect2 id="repmgrd-automatic-failover-configuration-optional">
+    <sect2 id="repmgrd-automatic-failover-configuration-optional" xreflabel="Optional configuration for automatic failover">
       <title>Optional configuration for automatic failover</title>
 
       <para>
-        The following configuraton options can be use to fine-tune automatic failover:
+        The following configuraton options can be used to fine-tune automatic failover:
       </para>
       <variablelist>
 
@@ -337,14 +345,18 @@
             </indexterm>
 
             <para>
-              Indicates a preferred priority (default: <literal>100</literal>) for promoting nodes;
-			  a value of zero prevents the node being promoted to primary.
+              Indicates a preferred priority (default: <literal>100</literal>) for promoting nodes.
             </para>
             <para>
               Note that the priority setting is only applied if two or more nodes are
               determined as promotion candidates; in that case the node with the
               higher priority is selected.
             </para>
+            <para>
+              A value of zero will always prevent the node being promoted to primary, even if there
+              is no other promotion candidate.
+            </para>
+
           </listitem>
         </varlistentry>
 
@@ -366,8 +378,8 @@
               </para>
             </note>
             <para>
-              One or both of the following parameter placeholders
-			  should be provided, which will be replaced by repmgrd with the appropriate
+              One or more of the following parameter placeholders
+			  may be provided, which will be replaced by repmgrd with the appropriate
 	          value:
               <itemizedlist spacing="compact" mark="bullet">
                 <listitem>
@@ -376,6 +388,15 @@
                 <listitem>
                   <simpara><literal>%a</literal>: node name</simpara>
                 </listitem>
+                <listitem>
+                  <simpara><literal>%v</literal>: number of visible nodes</simpara>
+                </listitem>
+                <listitem>
+                  <simpara><literal>%u</literal>: number of shared upstream nodes</simpara>
+                </listitem>
+                <listitem>
+                  <simpara><literal>%t</literal>: total number of nodes</simpara>
+                </listitem>
               </itemizedlist>
             </para>
             <para>
@@ -394,8 +415,8 @@
             </indexterm>
 
             <para>
-              If <literal>true</literal>, only continue with failover if no standbys have seen
-			  the primary node recently.
+              If <literal>true</literal>, only continue with failover if no standbys
+              (or the witness server, if present) have seen the primary node recently.
             </para>
             <note>
               <para>
@@ -406,6 +427,33 @@
           </listitem>
         </varlistentry>
 
+        <varlistentry>
+          <term><option>always_promote</option></term>
+
+          <listitem>
+            <indexterm>
+              <primary>always_promote</primary>
+            </indexterm>
+
+            <para>
+              Default: <literal>false</literal>.
+            </para>
+            <para>
+              If <literal>true</literal>, promote the local node even if its
+              &repmgr; metadata is not up-to-date.
+            </para>
+            <para>
+              Normally &repmgr; expects its metadata (stored in the <varname>repmgr.nodes</varname>
+              table) to be up-to-date so &repmgrd; can take the correct action during a failover.
+              However it's possible that updates made on the primary may not
+              have propagated to the standby (promotion candidate). In this case &repmgrd; will
+              default to not promoting the standby. This behaviour can be overridden by setting
+              <option>always_promote</option> to <literal>true</literal>.
+            </para>
+          </listitem>
+        </varlistentry>
+
+
         <varlistentry>
 
           <term><option>standby_disconnect_on_failover</option></term>
@@ -441,6 +489,32 @@
           </listitem>
         </varlistentry>
 
+        <varlistentry>
+
+          <term><option>repmgrd_exit_on_inactive_node</option></term>
+          <listitem>
+            <indexterm>
+              <primary>repmgrd_exit_on_inactive_node</primary>
+            </indexterm>
+            <para>
+              This parameter is available in &repmgr; 5.3 and later.
+            </para>
+            <para>
+              If a node was marked as inactive but is running, and this option is set to
+              <literal>true</literal>, &repmgrd; will abort on startup.
+            </para>
+            <para>
+              By default, <option>repmgrd_exit_on_inactive_node</option> is set
+              to <literal>false</literal>, in which case &repmgrd; will set the
+              node record to active on startup.
+            </para>
+            <para>
+              Setting this parameter to <literal>true</literal> causes &repmgrd;
+              to behave in the same way it did in &repmgr; 5.2 and earlier.
+            </para>
+          </listitem>
+        </varlistentry>
+
       </variablelist>
 
       <para>
@@ -486,6 +560,23 @@
 
     </sect2>
 
+
+    <sect2 id="repmgrd-automatic-failover-configuration-pgbouncer-fencing">
+      <title>Configuring &repmgrd; and pgbouncer to fence a failed primary node</title>
+      <indexterm>
+        <primary>fencing</primary>
+        <secondary>using repmgrd and pgbouncer to fence a failed primary node</secondary>
+      </indexterm>
+      <indexterm>
+        <primary>PgBouncer</primary>
+        <secondary>using repmgrd and pgbouncer to fence a failed primary node</secondary>
+      </indexterm>
+      <para>
+        For further details and a reference implementation, see the separate document
+        <ulink url="https://github.com/EnterpriseDB/repmgr/blob/master/doc/repmgrd-node-fencing.md">Fencing a failed master node with repmgrd and PgBouncer</ulink>.
+      </para>
+    </sect2>
+
     <sect2 id="postgresql-service-configuration">
       <title>PostgreSQL service configuration</title>
 
@@ -566,7 +657,8 @@ repmgrd_service_stop_command='sudo systemctl repmgr12 stop'
         the option <option>monitor_interval_secs</option> (see above).
       </para>
       <para>
-        For more details on monitoring, see <xref linkend="repmgrd-monitoring"/>.
+        For more details on monitoring, see <xref linkend="repmgrd-monitoring"/>. For information on
+        monitoring standby disconnections, see <xref linkend="repmgrd-primary-child-disconnection"/>.
       </para>
     </sect2>
 
@@ -602,18 +694,6 @@ repmgrd_service_stop_command='sudo systemctl repmgr12 stop'
           </simpara>
         </listitem>
 
-        <listitem>
-          <simpara>
-            <varname>bdr_local_monitoring_only</varname>
-          </simpara>
-        </listitem>
-
-        <listitem>
-          <simpara>
-            <varname>bdr_recovery_timeout</varname>
-          </simpara>
-        </listitem>
-
          <listitem>
           <simpara>
             <varname>child_nodes_check_interval</varname>
@@ -746,6 +826,12 @@ repmgrd_service_stop_command='sudo systemctl repmgr12 stop'
           </simpara>
         </listitem>
 
+        <listitem>
+          <simpara>
+            <varname>always_promote</varname>
+          </simpara>
+        </listitem>
+
         <listitem>
           <simpara>
             <varname>promote_command</varname>
@@ -917,7 +1003,7 @@ repmgrd_service_stop_command='sudo systemctl repmgr12 stop'
       </para>
       <para>
         If none of the above apply, &repmgrd; will create a PID file
-        in the operating system's temporary directory (as setermined by the environment variable
+        in the operating system's temporary directory (as determined by the environment variable
         <varname>TMPDIR</varname>, or if that is not set, will use <filename>/tmp</filename>).
       </para>
       <para>
@@ -997,6 +1083,29 @@ REPMGRD_OPTS="--daemonize=false"
       </para>
 
     </sect2>
+
+    <sect2 id="repmgrd-daemon-monitoring">
+      <title>repmgrd daemon monitoring</title>
+      <indexterm>
+        <primary>repmgrd</primary>
+        <secondary>monitoring</secondary>
+      </indexterm>
+      <indexterm>
+        <primary>monitoring</primary>
+        <secondary>repmgrd</secondary>
+      </indexterm>
+
+      <para>
+        The command <command><link linkend="repmgr-service-status">repmgr service status</link></command>
+        provides an overview of the &repmgrd; daemon status (including pause status)
+        on all nodes in the cluster.
+      </para>
+      <para>
+        From &repmgr; 5.3, <command><link linkend="repmgr-node-check">repmgr node check --repmgrd</link></command>
+        can be used to check the status of &repmgrd; (including pause status)
+        on the local node.
+      </para>
+    </sect2>
   </sect1>
 
   <sect1 id="repmgrd-connection-settings">

doc/repmgrd-node-fencing.md

@@ -108,7 +108,7 @@ The actual script is as follows; adjust the configurable items as appropriate:
 
     # 1. Promote this node from standby to primary
 
-    repmgr standby promote -f /etc/repmgr.conf
+    repmgr standby promote -f /etc/repmgr.conf --log-to-file
 
     # 2. Reconfigure pgbouncer instances
 
@@ -146,7 +146,7 @@ Script and template file should be installed on each node where `repmgrd` is run
 Finally, set `promote_command` in `repmgr.conf` on each node to
 point to the custom promote script:
 
-    promote_command=/var/lib/postgres/repmgr/promote.sh
+    promote_command='/var/lib/postgres/repmgr/promote.sh'
 
 and reload/restart any running `repmgrd` instances for the changes to take
 effect.

doc/repmgrd-operation.xml

@@ -137,7 +137,7 @@ NOTICE: node 3 (node3) paused</programlisting>
       If the primary becomes available again (e.g. following a software upgrade), &repmgrd;
       will automatically reconnect, e.g.:
       <programlisting>
-[2019-08-28 12:25:41] [NOTICE] reconnected to upstream node 1 after 8 seconds, resuming monitoring</programlisting>
+[2019-08-28 12:25:41] [NOTICE] reconnected to upstream node "node1" (ID: 1) after 8 seconds, resuming monitoring</programlisting>
     </para>
 
     <para>
@@ -295,7 +295,7 @@ NOTICE: node 3 (node3) unpaused</programlisting>
     [2017-08-29 10:59:37] [HINT] use "repmgr standby promote" to manually promote this node
     [2017-08-29 10:59:37] [INFO] node "node2" (ID: 2) monitoring upstream node "node1" (ID: 1) in degraded state (automatic failover disabled)
     [2017-08-29 10:59:53] [INFO] node "node2" (ID: 2) monitoring upstream node "node1" (ID: 1) in degraded state (automatic failover disabled)
-    [2017-08-29 11:00:45] [NOTICE] reconnected to upstream node 1 after 68 seconds, resuming monitoring
+    [2017-08-29 11:00:45] [NOTICE] reconnected to upstream node "node1" (ID: 1) after 68 seconds, resuming monitoring
     [2017-08-29 11:00:57] [INFO] node "node2" (ID: 2) monitoring upstream node "node1" (ID: 1) in normal state (automatic failover disabled)</programlisting>
 
  </para>

doc/switchover.xml

@@ -120,16 +120,19 @@
    </important>
 
    <note>
-    <simpara>
+    <para>
      On <literal>systemd</literal> systems we strongly recommend using the appropriate
      <command>systemctl</command> commands (typically run via <command>sudo</command>) to ensure
      <literal>systemd</literal> is informed about the status of the PostgreSQL service.
-    </simpara>
-    <simpara>
+    </para>
+    <para>
      If using <command>sudo</command> for the <command>systemctl</command> calls, make sure the
      <command>sudo</command> specification doesn't require a real tty for the user. If not set
      this way, <command>repmgr</command> will fail to stop the primary.
-    </simpara>
+    </para>
+    <para>
+      See the <xref linkend="configuration-file-service-commands"/> documentation section for further details.
+    </para>
    </note>
 
    <para>
@@ -186,6 +189,7 @@
       NOTICE: local node "node2" (ID: 2) will be promoted to primary; current primary "node1" (ID: 1) will be demoted to standby
       INFO: following shutdown command would be run on node "node1":
         "pg_ctl -l /var/log/postgresql/startup.log -D '/var/lib/postgresql/data' -m fast -W stop"
+      INFO: parameter "shutdown_check_timeout" is set to 60 seconds
     </programlisting>
    </para>
 
@@ -238,22 +242,12 @@
       </simpara>
     </note>
     <para>
-      For more details on <application>pg_rewind</application>, see:
+      For more details on <application>pg_rewind</application>, see section <xref linkend="repmgr-node-rejoin-pg-rewind"/>
+      in the <link linkend="repmgr-node-rejoin"><command>repmgr node rejoin</command></link> documentation and
+      the PostgreSQL documentation at
       <ulink url="https://www.postgresql.org/docs/current/app-pgrewind.html">https://www.postgresql.org/docs/current/app-pgrewind.html</ulink>.
     </para>
-    <para>
-      <application>pg_rewind</application> has been part of the core PostgreSQL distribution since
-      version 9.5. Users of versions 9.3 and 9.4 will need to manually install it; the source code is available here:
-      <ulink url="https://github.com/vmware/pg_rewind">https://github.com/vmware/pg_rewind</ulink>.
-      If the <application>pg_rewind</application>
-      binary is not installed in the PostgreSQL <filename>bin</filename> directory, provide
-      its full path  on the demotion candidate  with <option>--force-rewind</option>.
-    </para>
-    <para>
-      Note that building the 9.3/9.4 version of <application>pg_rewind</application> requires the PostgreSQL
-      source code. Also, PostgreSQL 9.3 does not provide <varname>wal_log_hints</varname>,
-      meaning data checksums must have been enabled when the database was initialized.
-    </para>
+
   </sect2>
 
 
@@ -342,7 +336,7 @@
    <itemizedlist spacing="compact" mark="bullet">
     <listitem>
      <simpara>
-      If using PostgreSQL 9.3 or 9.4, you should ensure that the shutdown command
+      If using PostgreSQL 9.4, you should ensure that the shutdown command
       is configured to use PostgreSQL's <varname>fast</varname> shutdown mode (the default in 9.5
       and later). If relying on <command>pg_ctl</command> to perform database server operations,
       you should include <literal>-m fast</literal> in <varname>pg_ctl_options</varname>

doc/upgrading-repmgr.xml

@@ -71,6 +71,12 @@
 	  <secondary>minor release</secondary>
 	</indexterm>
 
+    <para>
+	  A minor release upgrade involves updating &repmgr; from one minor release to another
+	  minor release within the same major release (e.g. <literal>5.3.1</literal> to <literal>5.3.2</literal>).
+	  An upgrade between minor releases of differing major releases (e.g. <literal>5.2.1</literal> to <literal>5.3.2</literal>)
+	  is a <link linkend="upgrading-major-version">major upgrade</link>.
+    </para>
     <para>
       The process for installing minor version upgrades is quite straightforward:
 
@@ -105,15 +111,17 @@
 	</para>
 
 	<para>
-	  A PostgreSQL restart is <emphasis>not</emphasis> required for minor version upgrades.
+	  A PostgreSQL restart is usually <emphasis>not</emphasis> required for minor version upgrades
+	  within the same major version (e.g. <literal>5.3.1</literal> to <literal>5.3.2</literal>).
+	  Be sure to check the <link linkend="appendix-release-notes">release notes</link>.
 	</para>
 
     <note>
 	  <para>
-	    The same &repmgr; &quot;major version&quot; (e.g. <literal>4.2</literal>) must be
-	    installed on all nodes in the replication cluster. While it's possible to have differing
-	    &repmgr; &quot;minor versions&quot; (e.g. <literal>4.2.1</literal>)  on different nodes,
-	    we strongly recommend updating all nodes to the latest minor version.
+		The same &repmgr; &quot;major version&quot; (e.g. <literal>5.3</literal>) must be
+		installed on all nodes in the replication cluster. While it's possible to have differing
+		&repmgr; &quot;minor versions&quot; (e.g. <literal>5.3.1</literal> and <literal>5.3.2</literal>)
+		on different nodes, we strongly recommend updating all nodes to the latest minor version.
 	  </para>
     </note>
 
@@ -201,9 +209,13 @@ ALTER EXTENSION repmgr UPDATE</programlisting>
 	</para>
 	<tip>
 	  <para>
-		If the &repmgr; upgrade requires a PostgreSQL restart, combine the &repmgr; upgrade
-		with a PostgreSQL minor version upgrade, which will require a restart in any case.
-		New PostgreSQL minor version are usually released every couple of months.
+        If the &repmgr; upgrade requires a PostgreSQL restart, combine the &repmgr; upgrade
+        with a PostgreSQL minor version upgrade, which will require a restart in any case.
+      </para>
+      <para>
+		New PostgreSQL minor versions are usually released every couple of months;
+        see the <ulink url="https://www.postgresql.org/developer/roadmap/">Roadmap</ulink>
+        for the current schedule.
 	  </para>
 	</tip>
   </sect2>
@@ -269,6 +281,29 @@ ALTER EXTENSION repmgr UPDATE</programlisting>
 	</para>
   </tip>
 
+  <sect2 id="upgrading-pg-upgrade-standby" xreflabel="pg_upgrade and upgrading standbys">
+    <title>Upgrading standbys with pg_upgrade and rsync</title>
+    <para>
+      If you are intending to upgrade a standby using the <command>rsync</command> method described
+      in the <ulink url="https://www.postgresql.org/docs/current/pgupgrade.html#PGUPGRADE-STEP-REPLICAS">pg_upgrade documentation</ulink>,
+      you <emphasis>must</emphasis> ensure the standby's replication configuration is present and correct
+      before starting the standby.
+    </para>
+    <para>
+      Use <link linkend="repmgr-standby-clone">repmgr standby clone --replication-conf-only</link> to generate
+      the correct replication configuration.
+    </para>
+
+    <tip>
+	  <para>
+        If upgrading from PostgreSQL 11 or earlier, be sure to delete <filename>recovery.conf</filename>, if present,
+        otherwise PostgreSQL will refuse to start.
+      </para>
+    </tip>
+
+  </sect2>
+
+
  </sect1>
 
 
@@ -285,12 +320,12 @@ ALTER EXTENSION repmgr UPDATE</programlisting>
    <orderedlist>
     <listitem>
      <simpara>
-       converting the repmgr.conf configuration files
+       converting the <filename>repmgr.conf</filename> configuration files
      </simpara>
     </listitem>
     <listitem>
      <simpara>
-       upgrading the repmgr schema using <command>CREATE EXTENSION</command>
+       upgrading the repmgr schema using <command>CREATE EXTENSION</command> (PostgreSQL 12 and earlier)
      </simpara>
     </listitem>
    </orderedlist>
@@ -434,22 +469,31 @@ ALTER EXTENSION repmgr UPDATE</programlisting>
     <para>
       Please note that the the conversion script will add an empty
       placeholder parameter for <varname>data_directory</varname>, which
-      is a required parameter from &repmgr; 4.
+      is a required parameter from &repmgr; 4. This must be manually modified to contain
+      the correct data directory.
     </para>
    </sect3>
   </sect2>
   <sect2>
-   <title>Upgrading the repmgr schema</title>
+   <title>Upgrading the repmgr schema (PostgreSQL 12 and earlier)</title>
    <para>
     Ensure &repmgrd; is not running, or any cron jobs which execute the
     <command>repmgr</command> binary.
    </para>
    <para>
-    Install <literal>repmgr 4</literal> packages; any <literal>repmgr 3.x</literal> packages
+    Install the latest &repmgr; package; any <literal>repmgr 3.x</literal> packages
     should be uninstalled (if not automatically uninstalled already by your packaging system).
    </para>
    <sect3>
     <title>Upgrading from repmgr 3.1.1 or earlier</title>
+    <tip>
+     <simpara>
+      If you don't care about any data from the existing &repmgr; installation,
+      (e.g. the contents of the <structname>events</structname> and <structname>monitoring</structname>
+      tables), the following steps can be skipped; proceed to <xref linkend="upgrade-reregister-nodes"/>.
+     </simpara>
+    </tip>
+
     <para>
      If your repmgr version is 3.1.1 or earlier, you will need to update
      the schema to the latest version in the 3.x series (3.3.2) before
@@ -461,10 +505,10 @@ ALTER EXTENSION repmgr UPDATE</programlisting>
       <itemizedlist spacing="compact" mark="bullet">
       <listitem>
         <simpara>
-          <ulink url="https://raw.githubusercontent.com/2ndQuadrant/repmgr/REL3_3_STABLE/sql/repmgr3.0_repmgr3.1.sql">repmgr3.0_repmgr3.1.sql</ulink></simpara>
+          <ulink url="https://raw.githubusercontent.com/EnterpriseDB/repmgr/REL3_3_STABLE/sql/repmgr3.0_repmgr3.1.sql">repmgr3.0_repmgr3.1.sql</ulink></simpara>
       </listitem>
       <listitem>
-        <simpara><ulink url="https://raw.githubusercontent.com/2ndQuadrant/repmgr/REL3_3_STABLE/sql/repmgr3.1.1_repmgr3.1.2.sql">repmgr3.1.1_repmgr3.1.2.sql</ulink></simpara>
+        <simpara><ulink url="https://raw.githubusercontent.com/EnterpriseDB/repmgr/REL3_3_STABLE/sql/repmgr3.1.1_repmgr3.1.2.sql">repmgr3.1.1_repmgr3.1.2.sql</ulink></simpara>
       </listitem>
       </itemizedlist>
     </para>
@@ -478,19 +522,37 @@ ALTER EXTENSION repmgr UPDATE</programlisting>
     <para>
      In the database used by the existing &repmgr; installation, execute:
      <programlisting>
-      CREATE EXTENSION repmgr FROM unpackaged;</programlisting>
+      CREATE EXTENSION repmgr FROM unpackaged</programlisting>
     </para>
+
     <para>
      This will move and convert all objects from the existing schema
      into the new, standard <literal>repmgr</literal> schema.
     </para>
     <note>
-      <simpara>there must be only one schema matching <literal>repmgr_%</literal> in the
+      <simpara>There must be only one schema matching <literal>repmgr_%</literal> in the
         database, otherwise this step may not work.
       </simpara>
     </note>
    </sect3>
-   <sect3>
+  </sect2>
+
+  <sect2>
+   <title>Upgrading the repmgr schema (PostgreSQL 13 and later)</title>
+   <para>
+     Beginning with PostgreSQL 13, the <command>CREATE EXTENSION ... FROM unpackaged</command>
+     syntax is no longer available. In the unlikely event you have ended up with an
+     installation running PostgreSQL 13 or later and containing the legacy &repmgr;
+     schema, there is no convenient way of upgrading this; instead you'll just need
+     to re-register the nodes as detailed in <link linkend="upgrade-reregister-nodes">the following section</link>,
+     which will create the &repmgr; extension automatically.
+   </para>
+   <para>
+     Any historical data you wish to retain (e.g. the contents of the <structname>events</structname>
+     and <structname>monitoring</structname> tables) will need to be exported manually.
+   </para>
+  </sect2>
+  <sect2 id="upgrade-reregister-nodes">
     <title>Re-register each node</title>
     <para>
      This is necessary to update the <literal>repmgr</literal> metadata with some additional items.
@@ -500,6 +562,10 @@ ALTER EXTENSION repmgr UPDATE</programlisting>
      <programlisting>
       repmgr primary register -f /etc/repmgr.conf --force</programlisting>
     </para>
+    <para>
+      If not already present (e.g. after executing <command>CREATE EXTENSION repmgr FROM unpackaged</command>),
+      the &repmgr; extension will be automatically created by <command>repmgr primary register</command>.
+    </para>
     <para>
      On each standby node, execute e.g.
      <programlisting>
@@ -512,18 +578,20 @@ ALTER EXTENSION repmgr UPDATE</programlisting>
     <para>
      The original <literal>repmgr_$cluster</literal> schema can be dropped at any time.
     </para>
-    <tip>
-     <simpara>
-      If you don't care about any data from the existing &repmgr; installation,
-      (e.g. the contents of the <structname>events</structname> and <structname>monitoring</structname>
-      tables), the manual <command>CREATE EXTENSION</command> step can be skipped; just re-register
-      each node, starting with the primary node, and the <literal>repmgr</literal> extension will be
-      automatically created.
-     </simpara>
-    </tip>
-   </sect3>
+
   </sect2>
 
+  <sect2 id="upgrade-drop-repmgr-cluster-schema">
+    <title>Drop the legacy repmgr schema</title>
+    <para>
+      Once the cluster has been registered with the current &repmgr; version, the legacy
+      <literal>repmgr_$cluster</literal> schema can be dropped at any time with:
+<programlisting>
+    DROP SCHEMA repmgr_$cluster CASCADE</programlisting>
+      (substitute <literal>$cluster</literal> with the value of the <varname>clustername</varname>
+      variable used in &repmgr; 3.x).
+    </para>
+  </sect2>
  </sect1>
 
 </chapter>

errcode.h

@@ -1,6 +1,6 @@
 /*
  * errcode.h
- * Copyright (c) 2ndQuadrant, 2010-2019
+ * Copyright (c) EnterpriseDB Corporation, 2010-2021
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

expected/repmgr_extension.out

@@ -32,18 +32,6 @@ SELECT * FROM repmgr.show_nodes;
 (0 rows)
 
 -- functions
-SELECT repmgr.am_bdr_failover_handler(-1);
- am_bdr_failover_handler 
--------------------------
- 
-(1 row)
-
-SELECT repmgr.am_bdr_failover_handler(NULL);
- am_bdr_failover_handler 
--------------------------
- 
-(1 row)
-
 SELECT repmgr.get_new_primary();
  get_new_primary 
 -----------------
@@ -92,9 +80,3 @@ SELECT repmgr.standby_set_last_updated();
  
 (1 row)
 
-SELECT repmgr.unset_bdr_failover_handler();
- unset_bdr_failover_handler 
-----------------------------
- 
-(1 row)
-

log.c

@@ -1,6 +1,6 @@
 /*
  * log.c - Logging methods
- * Copyright (c) 2ndQuadrant, 2010-2019
+ * Copyright (c) EnterpriseDB Corporation, 2010-2021
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

log.h

@@ -1,6 +1,6 @@
 /*
  * log.h
- * Copyright (c) 2ndQuadrant, 2010-2019
+ * Copyright (c) EnterpriseDB Corporation, 2010-2021
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

repmgr--4.2--4.3.sql

@@ -1,17 +1,10 @@
 -- complain if script is sourced in psql, rather than via CREATE EXTENSION
-\echo Use "CREATE EXTENSION repmgr" to load this file. \quit
+\echo Use "ALTER EXTENSION repmgr UPDATE" to load this file. \quit
 
-CREATE FUNCTION set_upstream_last_seen()
-  RETURNS VOID
-  AS 'MODULE_PATHNAME', 'set_upstream_last_seen'
-  LANGUAGE C STRICT;
+-- This script is intentionally empty and exists to skip the CREATE FUNCTION
+-- commands contained in the 4.2--4.3 and 4.3--4.4 extension upgrade scripts,
+-- which reference C functions which no longer exist in 5.3 and later.
+--
+-- These functions will be explicitly created in the 5.2--5.3 extension
+-- upgrade step with the correct C function references.
 
-CREATE FUNCTION get_upstream_last_seen()
-  RETURNS INT
-  AS 'MODULE_PATHNAME', 'get_upstream_last_seen'
-  LANGUAGE C STRICT;
-
-CREATE FUNCTION get_wal_receiver_pid()
-  RETURNS INT
-  AS 'MODULE_PATHNAME', 'get_wal_receiver_pid'
-  LANGUAGE C STRICT;

repmgr--4.3--4.4.sql

@@ -1,19 +1,9 @@
 -- complain if script is sourced in psql, rather than via CREATE EXTENSION
-\echo Use "CREATE EXTENSION repmgr" to load this file. \quit
+\echo Use "ALTER EXTENSION repmgr UPDATE" to load this file. \quit
 
-DROP FUNCTION set_upstream_last_seen();
-
-CREATE FUNCTION set_upstream_last_seen(INT)
-  RETURNS VOID
-  AS 'MODULE_PATHNAME', 'set_upstream_last_seen'
-  LANGUAGE C STRICT;
-
-CREATE FUNCTION get_upstream_node_id()
-  RETURNS INT
-  AS 'MODULE_PATHNAME', 'get_upstream_node_id'
-  LANGUAGE C STRICT;
-
-CREATE FUNCTION set_upstream_node_id(INT)
-  RETURNS VOID
-  AS 'MODULE_PATHNAME', 'set_upstream_node_id'
-  LANGUAGE C STRICT;
+-- This script is intentionally empty and exists to skip the CREATE FUNCTION
+-- commands contained in the 4.3--4.4 extension upgrade script, which reference
+-- C functions which no longer exist in 5.3 and later.
+--
+-- These functions will be explicitly created in the 5.2--5.3 extension
+-- upgrade step with the correct C function references.

repmgr--5.0--5.1.sql

@@ -0,0 +1,5 @@
+-- complain if script is sourced in psql, rather than via CREATE EXTENSION
+\echo Use "CREATE EXTENSION repmgr" to load this file. \quit
+
+DROP FUNCTION am_bdr_failover_handler(INT);
+DROP FUNCTION unset_bdr_failover_handler();

repmgr--5.0.sql

@@ -153,16 +153,6 @@ CREATE FUNCTION reset_voting_status()
   AS 'MODULE_PATHNAME', 'reset_voting_status'
   LANGUAGE C STRICT;
 
-CREATE FUNCTION am_bdr_failover_handler(INT)
-  RETURNS BOOL
-  AS 'MODULE_PATHNAME', 'am_bdr_failover_handler'
-  LANGUAGE C STRICT;
-
-CREATE FUNCTION unset_bdr_failover_handler()
-  RETURNS VOID
-  AS 'MODULE_PATHNAME', 'unset_bdr_failover_handler'
-  LANGUAGE C STRICT;
-
 CREATE FUNCTION get_repmgrd_pid()
   RETURNS INT
   AS 'MODULE_PATHNAME', 'get_repmgrd_pid'

repmgr--5.1--5.2.sql

@@ -0,0 +1,7 @@
+-- complain if script is sourced in psql, rather than via CREATE EXTENSION
+\echo Use "CREATE EXTENSION repmgr" to load this file. \quit
+
+SELECT pg_catalog.pg_extension_config_dump('repmgr.nodes', '');
+SELECT pg_catalog.pg_extension_config_dump('repmgr.events', '');
+SELECT pg_catalog.pg_extension_config_dump('repmgr.monitoring_history', '');
+

repmgr--5.1.sql

@@ -0,0 +1,214 @@
+-- complain if script is sourced in psql, rather than via CREATE EXTENSION
+\echo Use "CREATE EXTENSION repmgr" to load this file. \quit
+
+CREATE TABLE repmgr.nodes (
+  node_id          INTEGER     PRIMARY KEY,
+  upstream_node_id INTEGER     NULL REFERENCES nodes (node_id) DEFERRABLE,
+  active           BOOLEAN     NOT NULL DEFAULT TRUE,
+  node_name        TEXT        NOT NULL,
+  type             TEXT        NOT NULL CHECK (type IN('primary','standby','witness','bdr')),
+  location         TEXT        NOT NULL DEFAULT 'default',
+  priority         INT         NOT NULL DEFAULT 100,
+  conninfo         TEXT        NOT NULL,
+  repluser         VARCHAR(63) NOT NULL,
+  slot_name        TEXT        NULL,
+  config_file      TEXT        NOT NULL
+);
+
+CREATE TABLE repmgr.events (
+  node_id          INTEGER NOT NULL,
+  event            TEXT NOT NULL,
+  successful       BOOLEAN NOT NULL DEFAULT TRUE,
+  event_timestamp  TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  details          TEXT NULL
+);
+
+DO $repmgr$
+DECLARE
+  DECLARE server_version_num INT;
+BEGIN
+  SELECT setting
+    FROM pg_catalog.pg_settings
+   WHERE name = 'server_version_num'
+    INTO server_version_num;
+  IF server_version_num >= 90400 THEN
+    EXECUTE $repmgr_func$
+CREATE TABLE repmgr.monitoring_history (
+  primary_node_id                INTEGER NOT NULL,
+  standby_node_id                INTEGER NOT NULL,
+  last_monitor_time              TIMESTAMP WITH TIME ZONE NOT NULL,
+  last_apply_time                TIMESTAMP WITH TIME ZONE,
+  last_wal_primary_location      PG_LSN NOT NULL,
+  last_wal_standby_location      PG_LSN,
+  replication_lag                BIGINT NOT NULL,
+  apply_lag                      BIGINT NOT NULL
+)
+    $repmgr_func$;
+  ELSE
+    EXECUTE $repmgr_func$
+CREATE TABLE repmgr.monitoring_history (
+  primary_node_id                INTEGER NOT NULL,
+  standby_node_id                INTEGER NOT NULL,
+  last_monitor_time              TIMESTAMP WITH TIME ZONE NOT NULL,
+  last_apply_time                TIMESTAMP WITH TIME ZONE,
+  last_wal_primary_location      TEXT NOT NULL,
+  last_wal_standby_location      TEXT,
+  replication_lag                BIGINT NOT NULL,
+  apply_lag                      BIGINT NOT NULL
+)
+    $repmgr_func$;
+  END IF;
+END$repmgr$;
+
+
+
+CREATE INDEX idx_monitoring_history_time
+          ON repmgr.monitoring_history (last_monitor_time, standby_node_id);
+
+CREATE VIEW repmgr.show_nodes AS
+   SELECT n.node_id,
+          n.node_name,
+          n.active,
+          n.upstream_node_id,
+          un.node_name AS upstream_node_name,
+          n.type,
+          n.priority,
+          n.conninfo
+     FROM repmgr.nodes n
+LEFT JOIN repmgr.nodes un
+       ON un.node_id = n.upstream_node_id;
+
+CREATE TABLE repmgr.voting_term (
+  term INT NOT NULL
+);
+
+CREATE UNIQUE INDEX voting_term_restrict
+ON repmgr.voting_term ((TRUE));
+
+CREATE RULE voting_term_delete AS
+   ON DELETE TO repmgr.voting_term
+   DO INSTEAD NOTHING;
+
+
+/* ================= */
+/* repmgrd functions */
+/* ================= */
+
+/* monitoring functions */
+
+CREATE FUNCTION set_local_node_id(INT)
+  RETURNS VOID
+  AS 'MODULE_PATHNAME', 'set_local_node_id'
+  LANGUAGE C STRICT;
+
+CREATE FUNCTION get_local_node_id()
+  RETURNS INT
+  AS 'MODULE_PATHNAME', 'get_local_node_id'
+  LANGUAGE C STRICT;
+
+CREATE FUNCTION standby_set_last_updated()
+  RETURNS TIMESTAMP WITH TIME ZONE
+  AS 'MODULE_PATHNAME', 'standby_set_last_updated'
+  LANGUAGE C STRICT;
+
+CREATE FUNCTION standby_get_last_updated()
+  RETURNS TIMESTAMP WITH TIME ZONE
+  AS 'MODULE_PATHNAME', 'standby_get_last_updated'
+  LANGUAGE C STRICT;
+
+CREATE FUNCTION set_upstream_last_seen(INT)
+  RETURNS VOID
+  AS 'MODULE_PATHNAME', 'set_upstream_last_seen'
+  LANGUAGE C STRICT;
+
+CREATE FUNCTION get_upstream_last_seen()
+  RETURNS INT
+  AS 'MODULE_PATHNAME', 'get_upstream_last_seen'
+  LANGUAGE C STRICT;
+
+CREATE FUNCTION get_upstream_node_id()
+  RETURNS INT
+  AS 'MODULE_PATHNAME', 'get_upstream_node_id'
+  LANGUAGE C STRICT;
+
+CREATE FUNCTION set_upstream_node_id(INT)
+  RETURNS VOID
+  AS 'MODULE_PATHNAME', 'set_upstream_node_id'
+  LANGUAGE C STRICT;
+
+/* failover functions */
+
+CREATE FUNCTION notify_follow_primary(INT)
+  RETURNS VOID
+  AS 'MODULE_PATHNAME', 'notify_follow_primary'
+  LANGUAGE C STRICT;
+
+CREATE FUNCTION get_new_primary()
+  RETURNS INT
+  AS 'MODULE_PATHNAME', 'get_new_primary'
+  LANGUAGE C STRICT;
+
+CREATE FUNCTION reset_voting_status()
+  RETURNS VOID
+  AS 'MODULE_PATHNAME', 'reset_voting_status'
+  LANGUAGE C STRICT;
+
+CREATE FUNCTION get_repmgrd_pid()
+  RETURNS INT
+  AS 'MODULE_PATHNAME', 'get_repmgrd_pid'
+  LANGUAGE C STRICT;
+
+CREATE FUNCTION get_repmgrd_pidfile()
+  RETURNS TEXT
+  AS 'MODULE_PATHNAME', 'get_repmgrd_pidfile'
+  LANGUAGE C STRICT;
+
+CREATE FUNCTION set_repmgrd_pid(INT, TEXT)
+  RETURNS VOID
+  AS 'MODULE_PATHNAME', 'set_repmgrd_pid'
+  LANGUAGE C CALLED ON NULL INPUT;
+
+CREATE FUNCTION repmgrd_is_running()
+  RETURNS BOOL
+  AS 'MODULE_PATHNAME', 'repmgrd_is_running'
+  LANGUAGE C STRICT;
+
+CREATE FUNCTION repmgrd_pause(BOOL)
+  RETURNS VOID
+  AS 'MODULE_PATHNAME', 'repmgrd_pause'
+  LANGUAGE C STRICT;
+
+CREATE FUNCTION repmgrd_is_paused()
+  RETURNS BOOL
+  AS 'MODULE_PATHNAME', 'repmgrd_is_paused'
+  LANGUAGE C STRICT;
+
+CREATE FUNCTION get_wal_receiver_pid()
+  RETURNS INT
+  AS 'MODULE_PATHNAME', 'get_wal_receiver_pid'
+  LANGUAGE C STRICT;
+
+
+
+
+/* views */
+
+CREATE VIEW repmgr.replication_status AS
+  SELECT m.primary_node_id, m.standby_node_id, n.node_name AS standby_name,
+ 	     n.type AS node_type, n.active, last_monitor_time,
+         CASE WHEN n.type='standby' THEN m.last_wal_primary_location ELSE NULL END AS last_wal_primary_location,
+         m.last_wal_standby_location,
+         CASE WHEN n.type='standby' THEN pg_catalog.pg_size_pretty(m.replication_lag) ELSE NULL END AS replication_lag,
+         CASE WHEN n.type='standby' THEN
+           CASE WHEN replication_lag > 0 THEN age(now(), m.last_apply_time) ELSE '0'::INTERVAL END
+           ELSE NULL
+         END AS replication_time_lag,
+         CASE WHEN n.type='standby' THEN pg_catalog.pg_size_pretty(m.apply_lag) ELSE NULL END AS apply_lag,
+         AGE(NOW(), CASE WHEN pg_catalog.pg_is_in_recovery() THEN repmgr.standby_get_last_updated() ELSE m.last_monitor_time END) AS communication_time_lag
+    FROM repmgr.monitoring_history m
+    JOIN repmgr.nodes n ON m.standby_node_id = n.node_id
+   WHERE (m.standby_node_id, m.last_monitor_time) IN (
+	          SELECT m1.standby_node_id, MAX(m1.last_monitor_time)
+			    FROM repmgr.monitoring_history m1 GROUP BY 1
+         );
+

repmgr--5.2--5.3.sql

@@ -0,0 +1,64 @@
+-- complain if script is sourced in psql, rather than via CREATE EXTENSION
+\echo Use "CREATE EXTENSION repmgr" to load this file. \quit
+
+CREATE OR REPLACE FUNCTION set_local_node_id(INT)
+  RETURNS VOID
+  AS 'MODULE_PATHNAME', 'repmgr_set_local_node_id'
+  LANGUAGE C STRICT;
+
+CREATE OR REPLACE FUNCTION repmgr.get_local_node_id()
+  RETURNS INT
+  AS 'MODULE_PATHNAME', 'repmgr_get_local_node_id'
+  LANGUAGE C STRICT;
+
+CREATE OR REPLACE FUNCTION standby_set_last_updated()
+  RETURNS TIMESTAMP WITH TIME ZONE
+  AS 'MODULE_PATHNAME', 'repmgr_standby_set_last_updated'
+  LANGUAGE C STRICT;
+
+CREATE OR REPLACE FUNCTION standby_get_last_updated()
+  RETURNS TIMESTAMP WITH TIME ZONE
+  AS 'MODULE_PATHNAME', 'repmgr_standby_get_last_updated'
+  LANGUAGE C STRICT;
+
+CREATE OR REPLACE FUNCTION set_upstream_last_seen(INT)
+  RETURNS VOID
+  AS 'MODULE_PATHNAME', 'repmgr_set_upstream_last_seen'
+  LANGUAGE C STRICT;
+
+CREATE OR REPLACE FUNCTION get_upstream_last_seen()
+  RETURNS INT
+  AS 'MODULE_PATHNAME', 'repmgr_get_upstream_last_seen'
+  LANGUAGE C STRICT;
+
+CREATE OR REPLACE FUNCTION get_upstream_node_id()
+  RETURNS INT
+  AS 'MODULE_PATHNAME', 'repmgr_get_upstream_node_id'
+  LANGUAGE C STRICT;
+
+CREATE OR REPLACE FUNCTION set_upstream_node_id(INT)
+  RETURNS VOID
+  AS 'MODULE_PATHNAME', 'repmgr_set_upstream_node_id'
+  LANGUAGE C STRICT;
+
+/* failover functions */
+
+CREATE OR REPLACE FUNCTION notify_follow_primary(INT)
+  RETURNS VOID
+  AS 'MODULE_PATHNAME', 'repmgr_notify_follow_primary'
+  LANGUAGE C STRICT;
+
+CREATE OR REPLACE FUNCTION get_new_primary()
+  RETURNS INT
+  AS 'MODULE_PATHNAME', 'repmgr_get_new_primary'
+  LANGUAGE C STRICT;
+
+CREATE OR REPLACE FUNCTION reset_voting_status()
+  RETURNS VOID
+  AS 'MODULE_PATHNAME', 'repmgr_reset_voting_status'
+  LANGUAGE C STRICT;
+
+CREATE OR REPLACE FUNCTION get_wal_receiver_pid()
+  RETURNS INT
+  AS 'MODULE_PATHNAME', 'repmgr_get_wal_receiver_pid'
+  LANGUAGE C STRICT;

repmgr--5.2.sql

@@ -0,0 +1,192 @@
+-- complain if script is sourced in psql, rather than via CREATE EXTENSION
+\echo Use "CREATE EXTENSION repmgr" to load this file. \quit
+
+CREATE TABLE repmgr.nodes (
+  node_id          INTEGER     PRIMARY KEY,
+  upstream_node_id INTEGER     NULL REFERENCES nodes (node_id) DEFERRABLE,
+  active           BOOLEAN     NOT NULL DEFAULT TRUE,
+  node_name        TEXT        NOT NULL,
+  type             TEXT        NOT NULL CHECK (type IN('primary','standby','witness','bdr')),
+  location         TEXT        NOT NULL DEFAULT 'default',
+  priority         INT         NOT NULL DEFAULT 100,
+  conninfo         TEXT        NOT NULL,
+  repluser         VARCHAR(63) NOT NULL,
+  slot_name        TEXT        NULL,
+  config_file      TEXT        NOT NULL
+);
+
+SELECT pg_catalog.pg_extension_config_dump('repmgr.nodes', '');
+
+CREATE TABLE repmgr.events (
+  node_id          INTEGER NOT NULL,
+  event            TEXT NOT NULL,
+  successful       BOOLEAN NOT NULL DEFAULT TRUE,
+  event_timestamp  TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  details          TEXT NULL
+);
+
+SELECT pg_catalog.pg_extension_config_dump('repmgr.events', '');
+
+CREATE TABLE repmgr.monitoring_history (
+  primary_node_id                INTEGER NOT NULL,
+  standby_node_id                INTEGER NOT NULL,
+  last_monitor_time              TIMESTAMP WITH TIME ZONE NOT NULL,
+  last_apply_time                TIMESTAMP WITH TIME ZONE,
+  last_wal_primary_location      PG_LSN NOT NULL,
+  last_wal_standby_location      PG_LSN,
+  replication_lag                BIGINT NOT NULL,
+  apply_lag                      BIGINT NOT NULL
+);
+
+CREATE INDEX idx_monitoring_history_time
+          ON repmgr.monitoring_history (last_monitor_time, standby_node_id);
+
+SELECT pg_catalog.pg_extension_config_dump('repmgr.monitoring_history', '');
+
+CREATE VIEW repmgr.show_nodes AS
+   SELECT n.node_id,
+          n.node_name,
+          n.active,
+          n.upstream_node_id,
+          un.node_name AS upstream_node_name,
+          n.type,
+          n.priority,
+          n.conninfo
+     FROM repmgr.nodes n
+LEFT JOIN repmgr.nodes un
+       ON un.node_id = n.upstream_node_id;
+
+CREATE TABLE repmgr.voting_term (
+  term INT NOT NULL
+);
+
+CREATE UNIQUE INDEX voting_term_restrict
+ON repmgr.voting_term ((TRUE));
+
+CREATE RULE voting_term_delete AS
+   ON DELETE TO repmgr.voting_term
+   DO INSTEAD NOTHING;
+
+
+/* ================= */
+/* repmgrd functions */
+/* ================= */
+
+/* monitoring functions */
+
+CREATE FUNCTION set_local_node_id(INT)
+  RETURNS VOID
+  AS 'MODULE_PATHNAME', 'set_local_node_id'
+  LANGUAGE C STRICT;
+
+CREATE FUNCTION get_local_node_id()
+  RETURNS INT
+  AS 'MODULE_PATHNAME', 'get_local_node_id'
+  LANGUAGE C STRICT;
+
+CREATE FUNCTION standby_set_last_updated()
+  RETURNS TIMESTAMP WITH TIME ZONE
+  AS 'MODULE_PATHNAME', 'standby_set_last_updated'
+  LANGUAGE C STRICT;
+
+CREATE FUNCTION standby_get_last_updated()
+  RETURNS TIMESTAMP WITH TIME ZONE
+  AS 'MODULE_PATHNAME', 'standby_get_last_updated'
+  LANGUAGE C STRICT;
+
+CREATE FUNCTION set_upstream_last_seen(INT)
+  RETURNS VOID
+  AS 'MODULE_PATHNAME', 'set_upstream_last_seen'
+  LANGUAGE C STRICT;
+
+CREATE FUNCTION get_upstream_last_seen()
+  RETURNS INT
+  AS 'MODULE_PATHNAME', 'get_upstream_last_seen'
+  LANGUAGE C STRICT;
+
+CREATE FUNCTION get_upstream_node_id()
+  RETURNS INT
+  AS 'MODULE_PATHNAME', 'get_upstream_node_id'
+  LANGUAGE C STRICT;
+
+CREATE FUNCTION set_upstream_node_id(INT)
+  RETURNS VOID
+  AS 'MODULE_PATHNAME', 'set_upstream_node_id'
+  LANGUAGE C STRICT;
+
+/* failover functions */
+
+CREATE FUNCTION notify_follow_primary(INT)
+  RETURNS VOID
+  AS 'MODULE_PATHNAME', 'notify_follow_primary'
+  LANGUAGE C STRICT;
+
+CREATE FUNCTION get_new_primary()
+  RETURNS INT
+  AS 'MODULE_PATHNAME', 'get_new_primary'
+  LANGUAGE C STRICT;
+
+CREATE FUNCTION reset_voting_status()
+  RETURNS VOID
+  AS 'MODULE_PATHNAME', 'reset_voting_status'
+  LANGUAGE C STRICT;
+
+CREATE FUNCTION get_repmgrd_pid()
+  RETURNS INT
+  AS 'MODULE_PATHNAME', 'get_repmgrd_pid'
+  LANGUAGE C STRICT;
+
+CREATE FUNCTION get_repmgrd_pidfile()
+  RETURNS TEXT
+  AS 'MODULE_PATHNAME', 'get_repmgrd_pidfile'
+  LANGUAGE C STRICT;
+
+CREATE FUNCTION set_repmgrd_pid(INT, TEXT)
+  RETURNS VOID
+  AS 'MODULE_PATHNAME', 'set_repmgrd_pid'
+  LANGUAGE C CALLED ON NULL INPUT;
+
+CREATE FUNCTION repmgrd_is_running()
+  RETURNS BOOL
+  AS 'MODULE_PATHNAME', 'repmgrd_is_running'
+  LANGUAGE C STRICT;
+
+CREATE FUNCTION repmgrd_pause(BOOL)
+  RETURNS VOID
+  AS 'MODULE_PATHNAME', 'repmgrd_pause'
+  LANGUAGE C STRICT;
+
+CREATE FUNCTION repmgrd_is_paused()
+  RETURNS BOOL
+  AS 'MODULE_PATHNAME', 'repmgrd_is_paused'
+  LANGUAGE C STRICT;
+
+CREATE FUNCTION get_wal_receiver_pid()
+  RETURNS INT
+  AS 'MODULE_PATHNAME', 'get_wal_receiver_pid'
+  LANGUAGE C STRICT;
+
+
+
+
+/* views */
+
+CREATE VIEW repmgr.replication_status AS
+  SELECT m.primary_node_id, m.standby_node_id, n.node_name AS standby_name,
+ 	     n.type AS node_type, n.active, last_monitor_time,
+         CASE WHEN n.type='standby' THEN m.last_wal_primary_location ELSE NULL END AS last_wal_primary_location,
+         m.last_wal_standby_location,
+         CASE WHEN n.type='standby' THEN pg_catalog.pg_size_pretty(m.replication_lag) ELSE NULL END AS replication_lag,
+         CASE WHEN n.type='standby' THEN
+           CASE WHEN replication_lag > 0 THEN age(now(), m.last_apply_time) ELSE '0'::INTERVAL END
+           ELSE NULL
+         END AS replication_time_lag,
+         CASE WHEN n.type='standby' THEN pg_catalog.pg_size_pretty(m.apply_lag) ELSE NULL END AS apply_lag,
+         AGE(NOW(), CASE WHEN pg_catalog.pg_is_in_recovery() THEN repmgr.standby_get_last_updated() ELSE m.last_monitor_time END) AS communication_time_lag
+    FROM repmgr.monitoring_history m
+    JOIN repmgr.nodes n ON m.standby_node_id = n.node_id
+   WHERE (m.standby_node_id, m.last_monitor_time) IN (
+	          SELECT m1.standby_node_id, MAX(m1.last_monitor_time)
+			    FROM repmgr.monitoring_history m1 GROUP BY 1
+         );
+

repmgr--5.3--5.4.sql

@@ -0,0 +1,2 @@
+-- complain if script is sourced in psql, rather than via CREAT EXTENSION
+\echo Use "CREATE EXTENSION repmgr" to load this file. \quit

repmgr--5.3.sql

@@ -0,0 +1,192 @@
+-- complain if script is sourced in psql, rather than via CREATE EXTENSION
+\echo Use "CREATE EXTENSION repmgr" to load this file. \quit
+
+CREATE TABLE repmgr.nodes (
+  node_id          INTEGER     PRIMARY KEY,
+  upstream_node_id INTEGER     NULL REFERENCES nodes (node_id) DEFERRABLE,
+  active           BOOLEAN     NOT NULL DEFAULT TRUE,
+  node_name        TEXT        NOT NULL,
+  type             TEXT        NOT NULL CHECK (type IN('primary','standby','witness','bdr')),
+  location         TEXT        NOT NULL DEFAULT 'default',
+  priority         INT         NOT NULL DEFAULT 100,
+  conninfo         TEXT        NOT NULL,
+  repluser         VARCHAR(63) NOT NULL,
+  slot_name        TEXT        NULL,
+  config_file      TEXT        NOT NULL
+);
+
+SELECT pg_catalog.pg_extension_config_dump('repmgr.nodes', '');
+
+CREATE TABLE repmgr.events (
+  node_id          INTEGER NOT NULL,
+  event            TEXT NOT NULL,
+  successful       BOOLEAN NOT NULL DEFAULT TRUE,
+  event_timestamp  TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  details          TEXT NULL
+);
+
+SELECT pg_catalog.pg_extension_config_dump('repmgr.events', '');
+
+CREATE TABLE repmgr.monitoring_history (
+  primary_node_id                INTEGER NOT NULL,
+  standby_node_id                INTEGER NOT NULL,
+  last_monitor_time              TIMESTAMP WITH TIME ZONE NOT NULL,
+  last_apply_time                TIMESTAMP WITH TIME ZONE,
+  last_wal_primary_location      PG_LSN NOT NULL,
+  last_wal_standby_location      PG_LSN,
+  replication_lag                BIGINT NOT NULL,
+  apply_lag                      BIGINT NOT NULL
+);
+
+CREATE INDEX idx_monitoring_history_time
+          ON repmgr.monitoring_history (last_monitor_time, standby_node_id);
+
+SELECT pg_catalog.pg_extension_config_dump('repmgr.monitoring_history', '');
+
+CREATE VIEW repmgr.show_nodes AS
+   SELECT n.node_id,
+          n.node_name,
+          n.active,
+          n.upstream_node_id,
+          un.node_name AS upstream_node_name,
+          n.type,
+          n.priority,
+          n.conninfo
+     FROM repmgr.nodes n
+LEFT JOIN repmgr.nodes un
+       ON un.node_id = n.upstream_node_id;
+
+CREATE TABLE repmgr.voting_term (
+  term INT NOT NULL
+);
+
+CREATE UNIQUE INDEX voting_term_restrict
+ON repmgr.voting_term ((TRUE));
+
+CREATE RULE voting_term_delete AS
+   ON DELETE TO repmgr.voting_term
+   DO INSTEAD NOTHING;
+
+
+/* ================= */
+/* repmgrd functions */
+/* ================= */
+
+/* monitoring functions */
+
+CREATE FUNCTION set_local_node_id(INT)
+  RETURNS VOID
+  AS 'MODULE_PATHNAME', 'repmgr_set_local_node_id'
+  LANGUAGE C STRICT;
+
+CREATE FUNCTION get_local_node_id()
+  RETURNS INT
+  AS 'MODULE_PATHNAME', 'repmgr_get_local_node_id'
+  LANGUAGE C STRICT;
+
+CREATE FUNCTION standby_set_last_updated()
+  RETURNS TIMESTAMP WITH TIME ZONE
+  AS 'MODULE_PATHNAME', 'repmgr_standby_set_last_updated'
+  LANGUAGE C STRICT;
+
+CREATE FUNCTION standby_get_last_updated()
+  RETURNS TIMESTAMP WITH TIME ZONE
+  AS 'MODULE_PATHNAME', 'repmgr_standby_get_last_updated'
+  LANGUAGE C STRICT;
+
+CREATE FUNCTION set_upstream_last_seen(INT)
+  RETURNS VOID
+  AS 'MODULE_PATHNAME', 'repmgr_set_upstream_last_seen'
+  LANGUAGE C STRICT;
+
+CREATE FUNCTION get_upstream_last_seen()
+  RETURNS INT
+  AS 'MODULE_PATHNAME', 'repmgr_get_upstream_last_seen'
+  LANGUAGE C STRICT;
+
+CREATE FUNCTION get_upstream_node_id()
+  RETURNS INT
+  AS 'MODULE_PATHNAME', 'repmgr_get_upstream_node_id'
+  LANGUAGE C STRICT;
+
+CREATE FUNCTION set_upstream_node_id(INT)
+  RETURNS VOID
+  AS 'MODULE_PATHNAME', 'repmgr_set_upstream_node_id'
+  LANGUAGE C STRICT;
+
+/* failover functions */
+
+CREATE FUNCTION notify_follow_primary(INT)
+  RETURNS VOID
+  AS 'MODULE_PATHNAME', 'repmgr_notify_follow_primary'
+  LANGUAGE C STRICT;
+
+CREATE FUNCTION get_new_primary()
+  RETURNS INT
+  AS 'MODULE_PATHNAME', 'repmgr_get_new_primary'
+  LANGUAGE C STRICT;
+
+CREATE FUNCTION reset_voting_status()
+  RETURNS VOID
+  AS 'MODULE_PATHNAME', 'repmgr_reset_voting_status'
+  LANGUAGE C STRICT;
+
+CREATE FUNCTION get_repmgrd_pid()
+  RETURNS INT
+  AS 'MODULE_PATHNAME', 'get_repmgrd_pid'
+  LANGUAGE C STRICT;
+
+CREATE FUNCTION get_repmgrd_pidfile()
+  RETURNS TEXT
+  AS 'MODULE_PATHNAME', 'get_repmgrd_pidfile'
+  LANGUAGE C STRICT;
+
+CREATE FUNCTION set_repmgrd_pid(INT, TEXT)
+  RETURNS VOID
+  AS 'MODULE_PATHNAME', 'set_repmgrd_pid'
+  LANGUAGE C CALLED ON NULL INPUT;
+
+CREATE FUNCTION repmgrd_is_running()
+  RETURNS BOOL
+  AS 'MODULE_PATHNAME', 'repmgrd_is_running'
+  LANGUAGE C STRICT;
+
+CREATE FUNCTION repmgrd_pause(BOOL)
+  RETURNS VOID
+  AS 'MODULE_PATHNAME', 'repmgrd_pause'
+  LANGUAGE C STRICT;
+
+CREATE FUNCTION repmgrd_is_paused()
+  RETURNS BOOL
+  AS 'MODULE_PATHNAME', 'repmgrd_is_paused'
+  LANGUAGE C STRICT;
+
+CREATE FUNCTION get_wal_receiver_pid()
+  RETURNS INT
+  AS 'MODULE_PATHNAME', 'repmgr_get_wal_receiver_pid'
+  LANGUAGE C STRICT;
+
+
+
+
+/* views */
+
+CREATE VIEW repmgr.replication_status AS
+  SELECT m.primary_node_id, m.standby_node_id, n.node_name AS standby_name,
+ 	     n.type AS node_type, n.active, last_monitor_time,
+         CASE WHEN n.type='standby' THEN m.last_wal_primary_location ELSE NULL END AS last_wal_primary_location,
+         m.last_wal_standby_location,
+         CASE WHEN n.type='standby' THEN pg_catalog.pg_size_pretty(m.replication_lag) ELSE NULL END AS replication_lag,
+         CASE WHEN n.type='standby' THEN
+           CASE WHEN replication_lag > 0 THEN age(now(), m.last_apply_time) ELSE '0'::INTERVAL END
+           ELSE NULL
+         END AS replication_time_lag,
+         CASE WHEN n.type='standby' THEN pg_catalog.pg_size_pretty(m.apply_lag) ELSE NULL END AS apply_lag,
+         AGE(NOW(), CASE WHEN pg_catalog.pg_is_in_recovery() THEN repmgr.standby_get_last_updated() ELSE m.last_monitor_time END) AS communication_time_lag
+    FROM repmgr.monitoring_history m
+    JOIN repmgr.nodes n ON m.standby_node_id = n.node_id
+   WHERE (m.standby_node_id, m.last_monitor_time) IN (
+	          SELECT m1.standby_node_id, MAX(m1.last_monitor_time)
+			    FROM repmgr.monitoring_history m1 GROUP BY 1
+         );
+

repmgr--5.4.sql

@@ -0,0 +1,192 @@
+-- complain if script is sourced in psql, rather than via CREATE EXTENSION
+\echo Use "CREATE EXTENSION repmgr" to load this file. \quit
+
+CREATE TABLE repmgr.nodes (
+  node_id          INTEGER     PRIMARY KEY,
+  upstream_node_id INTEGER     NULL REFERENCES nodes (node_id) DEFERRABLE,
+  active           BOOLEAN     NOT NULL DEFAULT TRUE,
+  node_name        TEXT        NOT NULL,
+  type             TEXT        NOT NULL CHECK (type IN('primary','standby','witness','bdr')),
+  location         TEXT        NOT NULL DEFAULT 'default',
+  priority         INT         NOT NULL DEFAULT 100,
+  conninfo         TEXT        NOT NULL,
+  repluser         VARCHAR(63) NOT NULL,
+  slot_name        TEXT        NULL,
+  config_file      TEXT        NOT NULL
+);
+
+SELECT pg_catalog.pg_extension_config_dump('repmgr.nodes', '');
+
+CREATE TABLE repmgr.events (
+  node_id          INTEGER NOT NULL,
+  event            TEXT NOT NULL,
+  successful       BOOLEAN NOT NULL DEFAULT TRUE,
+  event_timestamp  TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  details          TEXT NULL
+);
+
+SELECT pg_catalog.pg_extension_config_dump('repmgr.events', '');
+
+CREATE TABLE repmgr.monitoring_history (
+  primary_node_id                INTEGER NOT NULL,
+  standby_node_id                INTEGER NOT NULL,
+  last_monitor_time              TIMESTAMP WITH TIME ZONE NOT NULL,
+  last_apply_time                TIMESTAMP WITH TIME ZONE,
+  last_wal_primary_location      PG_LSN NOT NULL,
+  last_wal_standby_location      PG_LSN,
+  replication_lag                BIGINT NOT NULL,
+  apply_lag                      BIGINT NOT NULL
+);
+
+CREATE INDEX idx_monitoring_history_time
+          ON repmgr.monitoring_history (last_monitor_time, standby_node_id);
+
+SELECT pg_catalog.pg_extension_config_dump('repmgr.monitoring_history', '');
+
+CREATE VIEW repmgr.show_nodes AS
+   SELECT n.node_id,
+          n.node_name,
+          n.active,
+          n.upstream_node_id,
+          un.node_name AS upstream_node_name,
+          n.type,
+          n.priority,
+          n.conninfo
+     FROM repmgr.nodes n
+LEFT JOIN repmgr.nodes un
+       ON un.node_id = n.upstream_node_id;
+
+CREATE TABLE repmgr.voting_term (
+  term INT NOT NULL
+);
+
+CREATE UNIQUE INDEX voting_term_restrict
+ON repmgr.voting_term ((TRUE));
+
+CREATE RULE voting_term_delete AS
+   ON DELETE TO repmgr.voting_term
+   DO INSTEAD NOTHING;
+
+
+/* ================= */
+/* repmgrd functions */
+/* ================= */
+
+/* monitoring functions */
+
+CREATE FUNCTION set_local_node_id(INT)
+  RETURNS VOID
+  AS 'MODULE_PATHNAME', 'repmgr_set_local_node_id'
+  LANGUAGE C STRICT;
+
+CREATE FUNCTION get_local_node_id()
+  RETURNS INT
+  AS 'MODULE_PATHNAME', 'repmgr_get_local_node_id'
+  LANGUAGE C STRICT;
+
+CREATE FUNCTION standby_set_last_updated()
+  RETURNS TIMESTAMP WITH TIME ZONE
+  AS 'MODULE_PATHNAME', 'repmgr_standby_set_last_updated'
+  LANGUAGE C STRICT;
+
+CREATE FUNCTION standby_get_last_updated()
+  RETURNS TIMESTAMP WITH TIME ZONE
+  AS 'MODULE_PATHNAME', 'repmgr_standby_get_last_updated'
+  LANGUAGE C STRICT;
+
+CREATE FUNCTION set_upstream_last_seen(INT)
+  RETURNS VOID
+  AS 'MODULE_PATHNAME', 'repmgr_set_upstream_last_seen'
+  LANGUAGE C STRICT;
+
+CREATE FUNCTION get_upstream_last_seen()
+  RETURNS INT
+  AS 'MODULE_PATHNAME', 'repmgr_get_upstream_last_seen'
+  LANGUAGE C STRICT;
+
+CREATE FUNCTION get_upstream_node_id()
+  RETURNS INT
+  AS 'MODULE_PATHNAME', 'repmgr_get_upstream_node_id'
+  LANGUAGE C STRICT;
+
+CREATE FUNCTION set_upstream_node_id(INT)
+  RETURNS VOID
+  AS 'MODULE_PATHNAME', 'repmgr_set_upstream_node_id'
+  LANGUAGE C STRICT;
+
+/* failover functions */
+
+CREATE FUNCTION notify_follow_primary(INT)
+  RETURNS VOID
+  AS 'MODULE_PATHNAME', 'repmgr_notify_follow_primary'
+  LANGUAGE C STRICT;
+
+CREATE FUNCTION get_new_primary()
+  RETURNS INT
+  AS 'MODULE_PATHNAME', 'repmgr_get_new_primary'
+  LANGUAGE C STRICT;
+
+CREATE FUNCTION reset_voting_status()
+  RETURNS VOID
+  AS 'MODULE_PATHNAME', 'repmgr_reset_voting_status'
+  LANGUAGE C STRICT;
+
+CREATE FUNCTION get_repmgrd_pid()
+  RETURNS INT
+  AS 'MODULE_PATHNAME', 'get_repmgrd_pid'
+  LANGUAGE C STRICT;
+
+CREATE FUNCTION get_repmgrd_pidfile()
+  RETURNS TEXT
+  AS 'MODULE_PATHNAME', 'get_repmgrd_pidfile'
+  LANGUAGE C STRICT;
+
+CREATE FUNCTION set_repmgrd_pid(INT, TEXT)
+  RETURNS VOID
+  AS 'MODULE_PATHNAME', 'set_repmgrd_pid'
+  LANGUAGE C CALLED ON NULL INPUT;
+
+CREATE FUNCTION repmgrd_is_running()
+  RETURNS BOOL
+  AS 'MODULE_PATHNAME', 'repmgrd_is_running'
+  LANGUAGE C STRICT;
+
+CREATE FUNCTION repmgrd_pause(BOOL)
+  RETURNS VOID
+  AS 'MODULE_PATHNAME', 'repmgrd_pause'
+  LANGUAGE C STRICT;
+
+CREATE FUNCTION repmgrd_is_paused()
+  RETURNS BOOL
+  AS 'MODULE_PATHNAME', 'repmgrd_is_paused'
+  LANGUAGE C STRICT;
+
+CREATE FUNCTION get_wal_receiver_pid()
+  RETURNS INT
+  AS 'MODULE_PATHNAME', 'repmgr_get_wal_receiver_pid'
+  LANGUAGE C STRICT;
+
+
+
+
+/* views */
+
+CREATE VIEW repmgr.replication_status AS
+  SELECT m.primary_node_id, m.standby_node_id, n.node_name AS standby_name,
+ 	     n.type AS node_type, n.active, last_monitor_time,
+         CASE WHEN n.type='standby' THEN m.last_wal_primary_location ELSE NULL END AS last_wal_primary_location,
+         m.last_wal_standby_location,
+         CASE WHEN n.type='standby' THEN pg_catalog.pg_size_pretty(m.replication_lag) ELSE NULL END AS replication_lag,
+         CASE WHEN n.type='standby' THEN
+           CASE WHEN replication_lag > 0 THEN age(now(), m.last_apply_time) ELSE '0'::INTERVAL END
+           ELSE NULL
+         END AS replication_time_lag,
+         CASE WHEN n.type='standby' THEN pg_catalog.pg_size_pretty(m.apply_lag) ELSE NULL END AS apply_lag,
+         AGE(NOW(), CASE WHEN pg_catalog.pg_is_in_recovery() THEN repmgr.standby_get_last_updated() ELSE m.last_monitor_time END) AS communication_time_lag
+    FROM repmgr.monitoring_history m
+    JOIN repmgr.nodes n ON m.standby_node_id = n.node_id
+   WHERE (m.standby_node_id, m.last_monitor_time) IN (
+	          SELECT m1.standby_node_id, MAX(m1.last_monitor_time)
+			    FROM repmgr.monitoring_history m1 GROUP BY 1
+         );
+

repmgr--unpackaged--5.1.sql

@@ -0,0 +1,265 @@
+-- complain if script is sourced in psql, rather than via CREATE EXTENSION
+\echo Use "CREATE EXTENSION repmgr" to load this file. \quit
+
+-- extract the current schema name
+-- NOTE: this assumes there will be only one schema matching 'repmgr_%';
+-- user is responsible for ensuring this is the case
+
+CREATE TEMPORARY TABLE repmgr_old_schema (schema_name TEXT);
+INSERT INTO repmgr_old_schema (schema_name)
+SELECT nspname AS schema_name
+  FROM pg_catalog.pg_namespace
+ WHERE nspname LIKE 'repmgr_%'
+ LIMIT 1;
+
+-- move old objects into new schema
+DO $repmgr$
+DECLARE
+  old_schema TEXT;
+BEGIN
+  SELECT schema_name FROM repmgr_old_schema
+    INTO old_schema;
+  EXECUTE format('ALTER TABLE %I.repl_nodes SET SCHEMA repmgr', old_schema);
+  EXECUTE format('ALTER TABLE %I.repl_events SET SCHEMA repmgr', old_schema);
+  EXECUTE format('ALTER TABLE %I.repl_monitor SET SCHEMA repmgr', old_schema);
+  EXECUTE format('DROP VIEW IF EXISTS %I.repl_show_nodes', old_schema);
+  EXECUTE format('DROP VIEW IF EXISTS %I.repl_status', old_schema);
+END$repmgr$;
+
+-- convert "repmgr_$cluster.repl_nodes" to "repmgr.nodes"
+CREATE TABLE repmgr.nodes (
+  node_id          INTEGER     PRIMARY KEY,
+  upstream_node_id INTEGER     NULL REFERENCES repmgr.nodes (node_id) DEFERRABLE,
+  active           BOOLEAN     NOT NULL DEFAULT TRUE,
+  node_name        TEXT        NOT NULL,
+  type             TEXT        NOT NULL CHECK (type IN('primary','standby','witness','bdr')),
+  location         TEXT        NOT NULL DEFAULT 'default',
+  priority         INT         NOT NULL DEFAULT 100,
+  conninfo         TEXT        NOT NULL,
+  repluser         VARCHAR(63) NOT NULL,
+  slot_name        TEXT        NULL,
+  config_file      TEXT        NOT NULL
+);
+
+INSERT INTO repmgr.nodes
+  (node_id, upstream_node_id, active, node_name, type, location, priority, conninfo, repluser, slot_name, config_file)
+SELECT id, upstream_node_id, active, name,
+       CASE WHEN type = 'master' THEN 'primary' ELSE type END,
+       'default', priority, conninfo, 'unknown', slot_name, 'unknown'
+  FROM repmgr.repl_nodes
+ ORDER BY id;
+
+
+-- convert "repmgr_$cluster.repl_event" to "event"
+
+ALTER TABLE repmgr.repl_events RENAME TO events;
+
+-- create new table "repmgr.voting_term"
+CREATE TABLE repmgr.voting_term (
+  term INT NOT NULL
+);
+
+CREATE UNIQUE INDEX voting_term_restrict
+ON repmgr.voting_term ((TRUE));
+
+CREATE RULE voting_term_delete AS
+   ON DELETE TO repmgr.voting_term
+   DO INSTEAD NOTHING;
+
+INSERT INTO repmgr.voting_term (term) VALUES (1);
+
+
+-- convert "repmgr_$cluster.repl_monitor" to "monitoring_history"
+
+
+DO $repmgr$
+DECLARE
+  DECLARE server_version_num INT;
+BEGIN
+  SELECT setting
+    FROM pg_catalog.pg_settings
+   WHERE name = 'server_version_num'
+    INTO server_version_num;
+  IF server_version_num >= 90400 THEN
+    EXECUTE $repmgr_func$
+CREATE TABLE repmgr.monitoring_history (
+  primary_node_id                INTEGER NOT NULL,
+  standby_node_id                INTEGER NOT NULL,
+  last_monitor_time              TIMESTAMP WITH TIME ZONE NOT NULL,
+  last_apply_time                TIMESTAMP WITH TIME ZONE,
+  last_wal_primary_location      PG_LSN NOT NULL,
+  last_wal_standby_location      PG_LSN,
+  replication_lag                BIGINT NOT NULL,
+  apply_lag                      BIGINT NOT NULL
+)
+    $repmgr_func$;
+    INSERT INTO repmgr.monitoring_history
+      (primary_node_id, standby_node_id, last_monitor_time,  last_apply_time, last_wal_primary_location, last_wal_standby_location, replication_lag, apply_lag)
+    SELECT primary_node, standby_node, last_monitor_time,  last_apply_time, last_wal_primary_location::pg_lsn, last_wal_standby_location::pg_lsn, replication_lag, apply_lag
+      FROM repmgr.repl_monitor;
+  ELSE
+    EXECUTE $repmgr_func$
+CREATE TABLE repmgr.monitoring_history (
+  primary_node_id                INTEGER NOT NULL,
+  standby_node_id                INTEGER NOT NULL,
+  last_monitor_time              TIMESTAMP WITH TIME ZONE NOT NULL,
+  last_apply_time                TIMESTAMP WITH TIME ZONE,
+  last_wal_primary_location      TEXT NOT NULL,
+  last_wal_standby_location      TEXT,
+  replication_lag                BIGINT NOT NULL,
+  apply_lag                      BIGINT NOT NULL
+)
+    $repmgr_func$;
+    INSERT INTO repmgr.monitoring_history
+      (primary_node_id, standby_node_id, last_monitor_time,  last_apply_time, last_wal_primary_location, last_wal_standby_location, replication_lag, apply_lag)
+    SELECT primary_node, standby_node, last_monitor_time,  last_apply_time, last_wal_primary_location, last_wal_standby_location, replication_lag, apply_lag
+      FROM repmgr.repl_monitor;
+
+  END IF;
+END$repmgr$;
+
+CREATE INDEX idx_monitoring_history_time
+          ON repmgr.monitoring_history (last_monitor_time, standby_node_id);
+
+CREATE VIEW repmgr.show_nodes AS
+   SELECT n.node_id,
+          n.node_name,
+          n.active,
+          n.upstream_node_id,
+          un.node_name AS upstream_node_name,
+          n.type,
+          n.priority,
+          n.conninfo
+     FROM repmgr.nodes n
+LEFT JOIN repmgr.nodes un
+       ON un.node_id = n.upstream_node_id;
+
+
+/* ================= */
+/* repmgrd functions */
+/* ================= */
+
+/* monitoring functions */
+
+CREATE FUNCTION set_local_node_id(INT)
+  RETURNS VOID
+  AS 'MODULE_PATHNAME', 'set_local_node_id'
+  LANGUAGE C STRICT;
+
+CREATE FUNCTION get_local_node_id()
+  RETURNS INT
+  AS 'MODULE_PATHNAME', 'get_local_node_id'
+  LANGUAGE C STRICT;
+
+CREATE FUNCTION standby_set_last_updated()
+  RETURNS TIMESTAMP WITH TIME ZONE
+  AS 'MODULE_PATHNAME', 'standby_set_last_updated'
+  LANGUAGE C STRICT;
+
+CREATE FUNCTION standby_get_last_updated()
+  RETURNS TIMESTAMP WITH TIME ZONE
+  AS 'MODULE_PATHNAME', 'standby_get_last_updated'
+  LANGUAGE C STRICT;
+
+CREATE FUNCTION set_upstream_last_seen(INT)
+  RETURNS VOID
+  AS 'MODULE_PATHNAME', 'set_upstream_last_seen'
+  LANGUAGE C STRICT;
+
+CREATE FUNCTION get_upstream_last_seen()
+  RETURNS INT
+  AS 'MODULE_PATHNAME', 'get_upstream_last_seen'
+  LANGUAGE C STRICT;
+
+CREATE FUNCTION get_upstream_node_id()
+  RETURNS INT
+  AS 'MODULE_PATHNAME', 'get_upstream_node_id'
+  LANGUAGE C STRICT;
+
+CREATE FUNCTION set_upstream_node_id(INT)
+  RETURNS VOID
+  AS 'MODULE_PATHNAME', 'set_upstream_node_id'
+  LANGUAGE C STRICT;
+
+/* failover functions */
+
+CREATE FUNCTION notify_follow_primary(INT)
+  RETURNS VOID
+  AS 'MODULE_PATHNAME', 'notify_follow_primary'
+  LANGUAGE C STRICT;
+
+CREATE FUNCTION get_new_primary()
+  RETURNS INT
+  AS 'MODULE_PATHNAME', 'get_new_primary'
+  LANGUAGE C STRICT;
+
+CREATE FUNCTION reset_voting_status()
+  RETURNS VOID
+  AS 'MODULE_PATHNAME', 'reset_voting_status'
+  LANGUAGE C STRICT;
+
+CREATE FUNCTION get_repmgrd_pid()
+  RETURNS INT
+  AS 'MODULE_PATHNAME', 'get_repmgrd_pid'
+  LANGUAGE C STRICT;
+
+CREATE FUNCTION get_repmgrd_pidfile()
+  RETURNS TEXT
+  AS 'MODULE_PATHNAME', 'get_repmgrd_pidfile'
+  LANGUAGE C STRICT;
+
+CREATE FUNCTION set_repmgrd_pid(INT, TEXT)
+  RETURNS VOID
+  AS 'MODULE_PATHNAME', 'set_repmgrd_pid'
+  LANGUAGE C CALLED ON NULL INPUT;
+
+CREATE FUNCTION repmgrd_is_running()
+  RETURNS BOOL
+  AS 'MODULE_PATHNAME', 'repmgrd_is_running'
+  LANGUAGE C STRICT;
+
+CREATE FUNCTION repmgrd_pause(BOOL)
+  RETURNS VOID
+  AS 'MODULE_PATHNAME', 'repmgrd_pause'
+  LANGUAGE C STRICT;
+
+CREATE FUNCTION repmgrd_is_paused()
+  RETURNS BOOL
+  AS 'MODULE_PATHNAME', 'repmgrd_is_paused'
+  LANGUAGE C STRICT;
+
+CREATE FUNCTION get_wal_receiver_pid()
+  RETURNS INT
+  AS 'MODULE_PATHNAME', 'get_wal_receiver_pid'
+  LANGUAGE C STRICT;
+
+
+/* views */
+
+CREATE VIEW repmgr.replication_status AS
+  SELECT m.primary_node_id, m.standby_node_id, n.node_name AS standby_name,
+ 	     n.type AS node_type, n.active, last_monitor_time,
+         CASE WHEN n.type='standby' THEN m.last_wal_primary_location ELSE NULL END AS last_wal_primary_location,
+         m.last_wal_standby_location,
+         CASE WHEN n.type='standby' THEN pg_catalog.pg_size_pretty(m.replication_lag) ELSE NULL END AS replication_lag,
+         CASE WHEN n.type='standby' THEN
+           CASE WHEN replication_lag > 0 THEN age(now(), m.last_apply_time) ELSE '0'::INTERVAL END
+           ELSE NULL
+         END AS replication_time_lag,
+         CASE WHEN n.type='standby' THEN pg_catalog.pg_size_pretty(m.apply_lag) ELSE NULL END AS apply_lag,
+         AGE(NOW(), CASE WHEN pg_catalog.pg_is_in_recovery() THEN repmgr.standby_get_last_updated() ELSE m.last_monitor_time END) AS communication_time_lag
+    FROM repmgr.monitoring_history m
+    JOIN repmgr.nodes n ON m.standby_node_id = n.node_id
+   WHERE (m.standby_node_id, m.last_monitor_time) IN (
+	          SELECT m1.standby_node_id, MAX(m1.last_monitor_time)
+			    FROM repmgr.monitoring_history m1 GROUP BY 1
+         );
+
+
+
+/* drop old tables */
+DROP TABLE repmgr.repl_nodes;
+DROP TABLE repmgr.repl_monitor;
+
+-- remove temporary table
+DROP TABLE repmgr_old_schema;

repmgr--unpackaged--5.2.sql

@@ -0,0 +1,245 @@
+-- complain if script is sourced in psql, rather than via CREATE EXTENSION
+\echo Use "CREATE EXTENSION repmgr" to load this file. \quit
+
+-- extract the current schema name
+-- NOTE: this assumes there will be only one schema matching 'repmgr_%';
+-- user is responsible for ensuring this is the case
+
+CREATE TEMPORARY TABLE repmgr_old_schema (schema_name TEXT);
+INSERT INTO repmgr_old_schema (schema_name)
+SELECT nspname AS schema_name
+  FROM pg_catalog.pg_namespace
+ WHERE nspname LIKE 'repmgr_%'
+ LIMIT 1;
+
+-- move old objects into new schema
+DO $repmgr$
+DECLARE
+  old_schema TEXT;
+BEGIN
+  SELECT schema_name FROM repmgr_old_schema
+    INTO old_schema;
+  EXECUTE format('ALTER TABLE %I.repl_nodes SET SCHEMA repmgr', old_schema);
+  EXECUTE format('ALTER TABLE %I.repl_events SET SCHEMA repmgr', old_schema);
+  EXECUTE format('ALTER TABLE %I.repl_monitor SET SCHEMA repmgr', old_schema);
+  EXECUTE format('DROP VIEW IF EXISTS %I.repl_show_nodes', old_schema);
+  EXECUTE format('DROP VIEW IF EXISTS %I.repl_status', old_schema);
+END$repmgr$;
+
+-- convert "repmgr_$cluster.repl_nodes" to "repmgr.nodes"
+CREATE TABLE repmgr.nodes (
+  node_id          INTEGER     PRIMARY KEY,
+  upstream_node_id INTEGER     NULL REFERENCES repmgr.nodes (node_id) DEFERRABLE,
+  active           BOOLEAN     NOT NULL DEFAULT TRUE,
+  node_name        TEXT        NOT NULL,
+  type             TEXT        NOT NULL CHECK (type IN('primary','standby','witness','bdr')),
+  location         TEXT        NOT NULL DEFAULT 'default',
+  priority         INT         NOT NULL DEFAULT 100,
+  conninfo         TEXT        NOT NULL,
+  repluser         VARCHAR(63) NOT NULL,
+  slot_name        TEXT        NULL,
+  config_file      TEXT        NOT NULL
+);
+
+INSERT INTO repmgr.nodes
+  (node_id, upstream_node_id, active, node_name, type, location, priority, conninfo, repluser, slot_name, config_file)
+SELECT id, upstream_node_id, active, name,
+       CASE WHEN type = 'master' THEN 'primary' ELSE type END,
+       'default', priority, conninfo, 'unknown', slot_name, 'unknown'
+  FROM repmgr.repl_nodes
+ ORDER BY id;
+
+
+-- convert "repmgr_$cluster.repl_event" to "event"
+
+CREATE TABLE repmgr.events (
+  node_id          INTEGER NOT NULL,
+  event            TEXT NOT NULL,
+  successful       BOOLEAN NOT NULL DEFAULT TRUE,
+  event_timestamp  TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  details          TEXT NULL
+);
+
+INSERT INTO repmgr.events
+  (node_id, event, successful, event_timestamp, details)
+  SELECT node_id, event, successful, event_timestamp, details
+    FROM repmgr.repl_events;
+
+-- create new table "repmgr.voting_term"
+CREATE TABLE repmgr.voting_term (
+  term INT NOT NULL
+);
+
+CREATE UNIQUE INDEX voting_term_restrict
+ON repmgr.voting_term ((TRUE));
+
+CREATE RULE voting_term_delete AS
+   ON DELETE TO repmgr.voting_term
+   DO INSTEAD NOTHING;
+
+INSERT INTO repmgr.voting_term (term) VALUES (1);
+
+-- convert "repmgr_$cluster.repl_monitor" to "monitoring_history"
+
+CREATE TABLE repmgr.monitoring_history (
+  primary_node_id                INTEGER NOT NULL,
+  standby_node_id                INTEGER NOT NULL,
+  last_monitor_time              TIMESTAMP WITH TIME ZONE NOT NULL,
+  last_apply_time                TIMESTAMP WITH TIME ZONE,
+  last_wal_primary_location      PG_LSN NOT NULL,
+  last_wal_standby_location      PG_LSN,
+  replication_lag                BIGINT NOT NULL,
+  apply_lag                      BIGINT NOT NULL
+);
+
+INSERT INTO repmgr.monitoring_history
+  (primary_node_id, standby_node_id, last_monitor_time,  last_apply_time, last_wal_primary_location, last_wal_standby_location, replication_lag, apply_lag)
+  SELECT primary_node, standby_node, last_monitor_time,  last_apply_time, last_wal_primary_location::pg_lsn, last_wal_standby_location::pg_lsn, replication_lag, apply_lag
+    FROM repmgr.repl_monitor;
+
+CREATE INDEX idx_monitoring_history_time
+          ON repmgr.monitoring_history (last_monitor_time, standby_node_id);
+
+CREATE VIEW repmgr.show_nodes AS
+   SELECT n.node_id,
+          n.node_name,
+          n.active,
+          n.upstream_node_id,
+          un.node_name AS upstream_node_name,
+          n.type,
+          n.priority,
+          n.conninfo
+     FROM repmgr.nodes n
+LEFT JOIN repmgr.nodes un
+       ON un.node_id = n.upstream_node_id;
+
+
+/* ================= */
+/* repmgrd functions */
+/* ================= */
+
+/* monitoring functions */
+
+CREATE FUNCTION set_local_node_id(INT)
+  RETURNS VOID
+  AS 'MODULE_PATHNAME', 'set_local_node_id'
+  LANGUAGE C STRICT;
+
+CREATE FUNCTION get_local_node_id()
+  RETURNS INT
+  AS 'MODULE_PATHNAME', 'get_local_node_id'
+  LANGUAGE C STRICT;
+
+CREATE FUNCTION standby_set_last_updated()
+  RETURNS TIMESTAMP WITH TIME ZONE
+  AS 'MODULE_PATHNAME', 'standby_set_last_updated'
+  LANGUAGE C STRICT;
+
+CREATE FUNCTION standby_get_last_updated()
+  RETURNS TIMESTAMP WITH TIME ZONE
+  AS 'MODULE_PATHNAME', 'standby_get_last_updated'
+  LANGUAGE C STRICT;
+
+CREATE FUNCTION set_upstream_last_seen(INT)
+  RETURNS VOID
+  AS 'MODULE_PATHNAME', 'set_upstream_last_seen'
+  LANGUAGE C STRICT;
+
+CREATE FUNCTION get_upstream_last_seen()
+  RETURNS INT
+  AS 'MODULE_PATHNAME', 'get_upstream_last_seen'
+  LANGUAGE C STRICT;
+
+CREATE FUNCTION get_upstream_node_id()
+  RETURNS INT
+  AS 'MODULE_PATHNAME', 'get_upstream_node_id'
+  LANGUAGE C STRICT;
+
+CREATE FUNCTION set_upstream_node_id(INT)
+  RETURNS VOID
+  AS 'MODULE_PATHNAME', 'set_upstream_node_id'
+  LANGUAGE C STRICT;
+
+/* failover functions */
+
+CREATE FUNCTION notify_follow_primary(INT)
+  RETURNS VOID
+  AS 'MODULE_PATHNAME', 'notify_follow_primary'
+  LANGUAGE C STRICT;
+
+CREATE FUNCTION get_new_primary()
+  RETURNS INT
+  AS 'MODULE_PATHNAME', 'get_new_primary'
+  LANGUAGE C STRICT;
+
+CREATE FUNCTION reset_voting_status()
+  RETURNS VOID
+  AS 'MODULE_PATHNAME', 'reset_voting_status'
+  LANGUAGE C STRICT;
+
+CREATE FUNCTION get_repmgrd_pid()
+  RETURNS INT
+  AS 'MODULE_PATHNAME', 'get_repmgrd_pid'
+  LANGUAGE C STRICT;
+
+CREATE FUNCTION get_repmgrd_pidfile()
+  RETURNS TEXT
+  AS 'MODULE_PATHNAME', 'get_repmgrd_pidfile'
+  LANGUAGE C STRICT;
+
+CREATE FUNCTION set_repmgrd_pid(INT, TEXT)
+  RETURNS VOID
+  AS 'MODULE_PATHNAME', 'set_repmgrd_pid'
+  LANGUAGE C CALLED ON NULL INPUT;
+
+CREATE FUNCTION repmgrd_is_running()
+  RETURNS BOOL
+  AS 'MODULE_PATHNAME', 'repmgrd_is_running'
+  LANGUAGE C STRICT;
+
+CREATE FUNCTION repmgrd_pause(BOOL)
+  RETURNS VOID
+  AS 'MODULE_PATHNAME', 'repmgrd_pause'
+  LANGUAGE C STRICT;
+
+CREATE FUNCTION repmgrd_is_paused()
+  RETURNS BOOL
+  AS 'MODULE_PATHNAME', 'repmgrd_is_paused'
+  LANGUAGE C STRICT;
+
+CREATE FUNCTION get_wal_receiver_pid()
+  RETURNS INT
+  AS 'MODULE_PATHNAME', 'get_wal_receiver_pid'
+  LANGUAGE C STRICT;
+
+
+/* views */
+
+CREATE VIEW repmgr.replication_status AS
+  SELECT m.primary_node_id, m.standby_node_id, n.node_name AS standby_name,
+ 	     n.type AS node_type, n.active, last_monitor_time,
+         CASE WHEN n.type='standby' THEN m.last_wal_primary_location ELSE NULL END AS last_wal_primary_location,
+         m.last_wal_standby_location,
+         CASE WHEN n.type='standby' THEN pg_catalog.pg_size_pretty(m.replication_lag) ELSE NULL END AS replication_lag,
+         CASE WHEN n.type='standby' THEN
+           CASE WHEN replication_lag > 0 THEN age(now(), m.last_apply_time) ELSE '0'::INTERVAL END
+           ELSE NULL
+         END AS replication_time_lag,
+         CASE WHEN n.type='standby' THEN pg_catalog.pg_size_pretty(m.apply_lag) ELSE NULL END AS apply_lag,
+         AGE(NOW(), CASE WHEN pg_catalog.pg_is_in_recovery() THEN repmgr.standby_get_last_updated() ELSE m.last_monitor_time END) AS communication_time_lag
+    FROM repmgr.monitoring_history m
+    JOIN repmgr.nodes n ON m.standby_node_id = n.node_id
+   WHERE (m.standby_node_id, m.last_monitor_time) IN (
+	          SELECT m1.standby_node_id, MAX(m1.last_monitor_time)
+			    FROM repmgr.monitoring_history m1 GROUP BY 1
+         );
+
+
+
+/* drop old tables */
+DROP TABLE repmgr.repl_nodes;
+DROP TABLE repmgr.repl_monitor;
+DROP TABLE repmgr.repl_events;
+
+-- remove temporary table
+DROP TABLE repmgr_old_schema;

repmgr--unpackaged--5.3.sql

@@ -0,0 +1,245 @@
+-- complain if script is sourced in psql, rather than via CREATE EXTENSION
+\echo Use "CREATE EXTENSION repmgr" to load this file. \quit
+
+-- extract the current schema name
+-- NOTE: this assumes there will be only one schema matching 'repmgr_%';
+-- user is responsible for ensuring this is the case
+
+CREATE TEMPORARY TABLE repmgr_old_schema (schema_name TEXT);
+INSERT INTO repmgr_old_schema (schema_name)
+SELECT nspname AS schema_name
+  FROM pg_catalog.pg_namespace
+ WHERE nspname LIKE 'repmgr_%'
+ LIMIT 1;
+
+-- move old objects into new schema
+DO $repmgr$
+DECLARE
+  old_schema TEXT;
+BEGIN
+  SELECT schema_name FROM repmgr_old_schema
+    INTO old_schema;
+  EXECUTE format('ALTER TABLE %I.repl_nodes SET SCHEMA repmgr', old_schema);
+  EXECUTE format('ALTER TABLE %I.repl_events SET SCHEMA repmgr', old_schema);
+  EXECUTE format('ALTER TABLE %I.repl_monitor SET SCHEMA repmgr', old_schema);
+  EXECUTE format('DROP VIEW IF EXISTS %I.repl_show_nodes', old_schema);
+  EXECUTE format('DROP VIEW IF EXISTS %I.repl_status', old_schema);
+END$repmgr$;
+
+-- convert "repmgr_$cluster.repl_nodes" to "repmgr.nodes"
+CREATE TABLE repmgr.nodes (
+  node_id          INTEGER     PRIMARY KEY,
+  upstream_node_id INTEGER     NULL REFERENCES repmgr.nodes (node_id) DEFERRABLE,
+  active           BOOLEAN     NOT NULL DEFAULT TRUE,
+  node_name        TEXT        NOT NULL,
+  type             TEXT        NOT NULL CHECK (type IN('primary','standby','witness','bdr')),
+  location         TEXT        NOT NULL DEFAULT 'default',
+  priority         INT         NOT NULL DEFAULT 100,
+  conninfo         TEXT        NOT NULL,
+  repluser         VARCHAR(63) NOT NULL,
+  slot_name        TEXT        NULL,
+  config_file      TEXT        NOT NULL
+);
+
+INSERT INTO repmgr.nodes
+  (node_id, upstream_node_id, active, node_name, type, location, priority, conninfo, repluser, slot_name, config_file)
+SELECT id, upstream_node_id, active, name,
+       CASE WHEN type = 'master' THEN 'primary' ELSE type END,
+       'default', priority, conninfo, 'unknown', slot_name, 'unknown'
+  FROM repmgr.repl_nodes
+ ORDER BY id;
+
+
+-- convert "repmgr_$cluster.repl_event" to "event"
+
+CREATE TABLE repmgr.events (
+  node_id          INTEGER NOT NULL,
+  event            TEXT NOT NULL,
+  successful       BOOLEAN NOT NULL DEFAULT TRUE,
+  event_timestamp  TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  details          TEXT NULL
+);
+
+INSERT INTO repmgr.events
+  (node_id, event, successful, event_timestamp, details)
+  SELECT node_id, event, successful, event_timestamp, details
+    FROM repmgr.repl_events;
+
+-- create new table "repmgr.voting_term"
+CREATE TABLE repmgr.voting_term (
+  term INT NOT NULL
+);
+
+CREATE UNIQUE INDEX voting_term_restrict
+ON repmgr.voting_term ((TRUE));
+
+CREATE RULE voting_term_delete AS
+   ON DELETE TO repmgr.voting_term
+   DO INSTEAD NOTHING;
+
+INSERT INTO repmgr.voting_term (term) VALUES (1);
+
+-- convert "repmgr_$cluster.repl_monitor" to "monitoring_history"
+
+CREATE TABLE repmgr.monitoring_history (
+  primary_node_id                INTEGER NOT NULL,
+  standby_node_id                INTEGER NOT NULL,
+  last_monitor_time              TIMESTAMP WITH TIME ZONE NOT NULL,
+  last_apply_time                TIMESTAMP WITH TIME ZONE,
+  last_wal_primary_location      PG_LSN NOT NULL,
+  last_wal_standby_location      PG_LSN,
+  replication_lag                BIGINT NOT NULL,
+  apply_lag                      BIGINT NOT NULL
+);
+
+INSERT INTO repmgr.monitoring_history
+  (primary_node_id, standby_node_id, last_monitor_time,  last_apply_time, last_wal_primary_location, last_wal_standby_location, replication_lag, apply_lag)
+  SELECT primary_node, standby_node, last_monitor_time,  last_apply_time, last_wal_primary_location::pg_lsn, last_wal_standby_location::pg_lsn, replication_lag, apply_lag
+    FROM repmgr.repl_monitor;
+
+CREATE INDEX idx_monitoring_history_time
+          ON repmgr.monitoring_history (last_monitor_time, standby_node_id);
+
+CREATE VIEW repmgr.show_nodes AS
+   SELECT n.node_id,
+          n.node_name,
+          n.active,
+          n.upstream_node_id,
+          un.node_name AS upstream_node_name,
+          n.type,
+          n.priority,
+          n.conninfo
+     FROM repmgr.nodes n
+LEFT JOIN repmgr.nodes un
+       ON un.node_id = n.upstream_node_id;
+
+
+/* ================= */
+/* repmgrd functions */
+/* ================= */
+
+/* monitoring functions */
+
+CREATE FUNCTION set_local_node_id(INT)
+  RETURNS VOID
+  AS 'MODULE_PATHNAME', 'repmgr_set_local_node_id'
+  LANGUAGE C STRICT;
+
+CREATE FUNCTION get_local_node_id()
+  RETURNS INT
+  AS 'MODULE_PATHNAME', 'repmgr_get_local_node_id'
+  LANGUAGE C STRICT;
+
+CREATE FUNCTION standby_set_last_updated()
+  RETURNS TIMESTAMP WITH TIME ZONE
+  AS 'MODULE_PATHNAME', 'repmgr_standby_set_last_updated'
+  LANGUAGE C STRICT;
+
+CREATE FUNCTION standby_get_last_updated()
+  RETURNS TIMESTAMP WITH TIME ZONE
+  AS 'MODULE_PATHNAME', 'repmgr_standby_get_last_updated'
+  LANGUAGE C STRICT;
+
+CREATE FUNCTION set_upstream_last_seen(INT)
+  RETURNS VOID
+  AS 'MODULE_PATHNAME', 'repmgr_set_upstream_last_seen'
+  LANGUAGE C STRICT;
+
+CREATE FUNCTION get_upstream_last_seen()
+  RETURNS INT
+  AS 'MODULE_PATHNAME', 'repmgr_get_upstream_last_seen'
+  LANGUAGE C STRICT;
+
+CREATE FUNCTION get_upstream_node_id()
+  RETURNS INT
+  AS 'MODULE_PATHNAME', 'repmgr_get_upstream_node_id'
+  LANGUAGE C STRICT;
+
+CREATE FUNCTION set_upstream_node_id(INT)
+  RETURNS VOID
+  AS 'MODULE_PATHNAME', 'repmgr_set_upstream_node_id'
+  LANGUAGE C STRICT;
+
+/* failover functions */
+
+CREATE FUNCTION notify_follow_primary(INT)
+  RETURNS VOID
+  AS 'MODULE_PATHNAME', 'repmgr_notify_follow_primary'
+  LANGUAGE C STRICT;
+
+CREATE FUNCTION get_new_primary()
+  RETURNS INT
+  AS 'MODULE_PATHNAME', 'repmgr_get_new_primary'
+  LANGUAGE C STRICT;
+
+CREATE FUNCTION reset_voting_status()
+  RETURNS VOID
+  AS 'MODULE_PATHNAME', 'repmgr_reset_voting_status'
+  LANGUAGE C STRICT;
+
+CREATE FUNCTION get_repmgrd_pid()
+  RETURNS INT
+  AS 'MODULE_PATHNAME', 'get_repmgrd_pid'
+  LANGUAGE C STRICT;
+
+CREATE FUNCTION get_repmgrd_pidfile()
+  RETURNS TEXT
+  AS 'MODULE_PATHNAME', 'get_repmgrd_pidfile'
+  LANGUAGE C STRICT;
+
+CREATE FUNCTION set_repmgrd_pid(INT, TEXT)
+  RETURNS VOID
+  AS 'MODULE_PATHNAME', 'set_repmgrd_pid'
+  LANGUAGE C CALLED ON NULL INPUT;
+
+CREATE FUNCTION repmgrd_is_running()
+  RETURNS BOOL
+  AS 'MODULE_PATHNAME', 'repmgrd_is_running'
+  LANGUAGE C STRICT;
+
+CREATE FUNCTION repmgrd_pause(BOOL)
+  RETURNS VOID
+  AS 'MODULE_PATHNAME', 'repmgrd_pause'
+  LANGUAGE C STRICT;
+
+CREATE FUNCTION repmgrd_is_paused()
+  RETURNS BOOL
+  AS 'MODULE_PATHNAME', 'repmgrd_is_paused'
+  LANGUAGE C STRICT;
+
+CREATE FUNCTION get_wal_receiver_pid()
+  RETURNS INT
+  AS 'MODULE_PATHNAME', 'repmgr_get_wal_receiver_pid'
+  LANGUAGE C STRICT;
+
+
+/* views */
+
+CREATE VIEW repmgr.replication_status AS
+  SELECT m.primary_node_id, m.standby_node_id, n.node_name AS standby_name,
+ 	     n.type AS node_type, n.active, last_monitor_time,
+         CASE WHEN n.type='standby' THEN m.last_wal_primary_location ELSE NULL END AS last_wal_primary_location,
+         m.last_wal_standby_location,
+         CASE WHEN n.type='standby' THEN pg_catalog.pg_size_pretty(m.replication_lag) ELSE NULL END AS replication_lag,
+         CASE WHEN n.type='standby' THEN
+           CASE WHEN replication_lag > 0 THEN age(now(), m.last_apply_time) ELSE '0'::INTERVAL END
+           ELSE NULL
+         END AS replication_time_lag,
+         CASE WHEN n.type='standby' THEN pg_catalog.pg_size_pretty(m.apply_lag) ELSE NULL END AS apply_lag,
+         AGE(NOW(), CASE WHEN pg_catalog.pg_is_in_recovery() THEN repmgr.standby_get_last_updated() ELSE m.last_monitor_time END) AS communication_time_lag
+    FROM repmgr.monitoring_history m
+    JOIN repmgr.nodes n ON m.standby_node_id = n.node_id
+   WHERE (m.standby_node_id, m.last_monitor_time) IN (
+	          SELECT m1.standby_node_id, MAX(m1.last_monitor_time)
+			    FROM repmgr.monitoring_history m1 GROUP BY 1
+         );
+
+
+
+/* drop old tables */
+DROP TABLE repmgr.repl_nodes;
+DROP TABLE repmgr.repl_monitor;
+DROP TABLE repmgr.repl_events;
+
+-- remove temporary table
+DROP TABLE repmgr_old_schema;

repmgr-action-bdr.c

@@ -1,557 +0,0 @@
-/*
- * repmgr-action-bdr.c
- *
- * Implements BDR-related actions for the repmgr command line utility
- *
- * Copyright (c) 2ndQuadrant, 2010-2019
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "repmgr.h"
-
-#include "repmgr-client-global.h"
-#include "repmgr-action-bdr.h"
-
-
-/*
- * do_bdr_register()
- *
- * As each BDR node is its own primary, registering a BDR node
- * will create the repmgr metadata schema if necessary.
- */
-void
-do_bdr_register(void)
-{
-	PGconn	   *conn = NULL;
-	BdrNodeInfoList bdr_nodes = T_BDR_NODE_INFO_LIST_INITIALIZER;
-	ExtensionStatus extension_status = REPMGR_UNKNOWN;
-	t_node_info node_info = T_NODE_INFO_INITIALIZER;
-	RecordStatus record_status = RECORD_NOT_FOUND;
-	PQExpBufferData event_details;
-	bool		success = true;
-	char	   *dbname = NULL;
-
-	/* sanity-check configuration for BDR-compatability */
-	if (config_file_options.replication_type != REPLICATION_TYPE_BDR)
-	{
-		log_error(_("cannot run BDR REGISTER on a non-BDR node"));
-		exit(ERR_BAD_CONFIG);
-	}
-
-	dbname = pg_malloc0(MAXLEN);
-
-	if (dbname == NULL)
-	{
-		log_error(_("unable to allocate memory; terminating."));
-		exit(ERR_OUT_OF_MEMORY);
-	}
-
-	/* store the database name for future reference */
-	get_conninfo_value(config_file_options.conninfo, "dbname", dbname);
-
-	conn = establish_db_connection(config_file_options.conninfo, true);
-
-	if (!is_bdr_db(conn, NULL))
-	{
-		log_error(_("database \"%s\" is not BDR-enabled"), dbname);
-		log_hint(_("when using repmgr with BDR, the repmgr schema must be stored in the BDR database"));
-		PQfinish(conn);
-		pfree(dbname);
-		exit(ERR_BAD_CONFIG);
-	}
-
-	/* Check that there are at most 2 BDR nodes */
-	get_all_bdr_node_records(conn, &bdr_nodes);
-
-	if (bdr_nodes.node_count == 0)
-	{
-		log_error(_("database \"%s\" is BDR-enabled but no BDR nodes were found"), dbname);
-		PQfinish(conn);
-		pfree(dbname);
-		exit(ERR_BAD_CONFIG);
-	}
-
-	/* BDR 2 implementation is for 2 nodes only */
-	if (get_bdr_version_num() < 3 && bdr_nodes.node_count > 2)
-	{
-		log_error(_("repmgr can only support BDR 2.x clusters with 2 nodes"));
-		log_detail(_("this BDR cluster has %i nodes"), bdr_nodes.node_count);
-		PQfinish(conn);
-		pfree(dbname);
-		exit(ERR_BAD_CONFIG);
-	}
-
-	if (get_bdr_version_num() > 2)
-	{
-		log_error(_("\"repmgr bdr register\" is for BDR 2.x only"));
-		PQfinish(conn);
-		pfree(dbname);
-		exit(ERR_BAD_CONFIG);
-	}
-
-
-	/* check for a matching BDR node */
-	{
-		PQExpBufferData bdr_local_node_name;
-		bool		node_match = false;
-
-		initPQExpBuffer(&bdr_local_node_name);
-		node_match = bdr_node_name_matches(conn, config_file_options.node_name, &bdr_local_node_name);
-
-		if (node_match == false)
-		{
-			if (strlen(bdr_local_node_name.data))
-			{
-				log_error(_("local node BDR node name is \"%s\", expected: \"%s\""),
-						  bdr_local_node_name.data,
-						  config_file_options.node_name);
-				log_hint(_("\"node_name\" in repmgr.conf must match \"node_name\" in bdr.bdr_nodes"));
-			}
-			else
-			{
-				log_error(_("local node does not report BDR node name"));
-				log_hint(_("ensure this is an active BDR node"));
-			}
-
-			PQfinish(conn);
-			pfree(dbname);
-			termPQExpBuffer(&bdr_local_node_name);
-			exit(ERR_BAD_CONFIG);
-		}
-
-		termPQExpBuffer(&bdr_local_node_name);
-	}
-
-	/* check whether repmgr extension exists, and there are no non-BDR nodes registered */
-	extension_status = get_repmgr_extension_status(conn, NULL);
-
-	if (extension_status == REPMGR_UNKNOWN)
-	{
-		log_error(_("unable to determine status of \"repmgr\" extension in database \"%s\""),
-				  dbname);
-		PQfinish(conn);
-		pfree(dbname);
-		exit(ERR_BAD_CONFIG);
-	}
-
-	if (extension_status == REPMGR_UNAVAILABLE)
-	{
-		log_error(_("\"repmgr\" extension is not available"));
-		PQfinish(conn);
-		pfree(dbname);
-		exit(ERR_BAD_CONFIG);
-	}
-
-	if (extension_status == REPMGR_INSTALLED)
-	{
-		if (!is_bdr_repmgr(conn))
-		{
-			log_error(_("repmgr metadatabase contains records for non-BDR nodes"));
-			PQfinish(conn);
-			pfree(dbname);
-			exit(ERR_BAD_CONFIG);
-		}
-	}
-	else
-	{
-		log_debug("creating repmgr extension in database \"%s\"", dbname);
-
-		begin_transaction(conn);
-
-		if (!create_repmgr_extension(conn))
-		{
-			log_error(_("unable to create repmgr extension - see preceding error message(s); aborting"));
-			rollback_transaction(conn);
-			pfree(dbname);
-			PQfinish(conn);
-			exit(ERR_BAD_CONFIG);
-		}
-
-		commit_transaction(conn);
-	}
-
-	pfree(dbname);
-
-	if (bdr_node_has_repmgr_set(conn, config_file_options.node_name) == false)
-	{
-		log_debug("bdr_node_has_repmgr_set() = false");
-		bdr_node_set_repmgr_set(conn, config_file_options.node_name);
-	}
-
-	/*
-	 * before adding the extension tables to the replication set, if any other
-	 * BDR nodes exist, populate repmgr.nodes with a copy of existing entries
-	 *
-	 * currently we won't copy the contents of any other tables
-	 *
-	 */
-	{
-		NodeInfoList local_node_records = T_NODE_INFO_LIST_INITIALIZER;
-
-		(void) get_all_node_records(conn, &local_node_records);
-
-		if (local_node_records.node_count == 0)
-		{
-			BdrNodeInfoList bdr_nodes = T_BDR_NODE_INFO_LIST_INITIALIZER;
-			BdrNodeInfoListCell *bdr_cell = NULL;
-
-			get_all_bdr_node_records(conn, &bdr_nodes);
-
-			if (bdr_nodes.node_count == 0)
-			{
-				log_error(_("unable to retrieve any BDR node records"));
-				log_detail("%s", PQerrorMessage(conn));
-				PQfinish(conn);
-				exit(ERR_BAD_CONFIG);
-			}
-
-			for (bdr_cell = bdr_nodes.head; bdr_cell; bdr_cell = bdr_cell->next)
-			{
-				PGconn	   *bdr_node_conn = NULL;
-				NodeInfoList existing_nodes = T_NODE_INFO_LIST_INITIALIZER;
-				NodeInfoListCell *cell = NULL;
-				ExtensionStatus other_node_extension_status = REPMGR_UNKNOWN;
-
-				/* skip the local node */
-				if (strncmp(node_info.node_name, bdr_cell->node_info->node_name, sizeof(node_info.node_name)) == 0)
-				{
-					continue;
-				}
-
-				log_debug("connecting to BDR node \"%s\" (conninfo: \"%s\")",
-						  bdr_cell->node_info->node_name,
-						  bdr_cell->node_info->node_local_dsn);
-				bdr_node_conn = establish_db_connection_quiet(bdr_cell->node_info->node_local_dsn);
-
-				if (PQstatus(bdr_node_conn) != CONNECTION_OK)
-				{
-					continue;
-				}
-
-				/* check repmgr schema exists, skip if not */
-				other_node_extension_status = get_repmgr_extension_status(bdr_node_conn, NULL);
-
-				if (other_node_extension_status != REPMGR_INSTALLED)
-				{
-					continue;
-				}
-
-				(void) get_all_node_records(bdr_node_conn, &existing_nodes);
-
-				for (cell = existing_nodes.head; cell; cell = cell->next)
-				{
-					log_debug("creating record for node \"%s\" (ID: %i)",
-							  cell->node_info->node_name, cell->node_info->node_id);
-					create_node_record(conn, "bdr register", cell->node_info);
-				}
-
-				PQfinish(bdr_node_conn);
-				break;
-			}
-		}
-	}
-
-	/* Add the repmgr extension tables to a replication set */
-
-	if (get_bdr_version_num() < 3)
-	{
-		add_extension_tables_to_bdr_replication_set(conn);
-	}
-	else
-	{
-		/* this is the only table we need to replicate */
-		char *replication_set = get_default_bdr_replication_set(conn);
-
-		/*
-		 * this probably won't happen, but we need to be sure we're using
-		 * the replication set metadata correctly...
-		 */
-		if (conn == NULL)
-		{
-			log_error(_("unable to retrieve default BDR replication set"));
-			log_hint(_("see preceding messages"));
-			log_debug("check query in get_default_bdr_replication_set()");
-			exit(ERR_BAD_CONFIG);
-		}
-
-		if (is_table_in_bdr_replication_set(conn, "nodes", replication_set) == false)
-		{
-			add_table_to_bdr_replication_set(conn, "nodes", replication_set);
-		}
-
-		pfree(replication_set);
-	}
-
-	initPQExpBuffer(&event_details);
-
-	begin_transaction(conn);
-
-	/*
-	 * we'll check if a record exists (even if the schema was just created),
-	 * as there's a faint chance of a race condition
-	 */
-
-	record_status = get_node_record(conn, config_file_options.node_id, &node_info);
-
-	/* Update internal node record */
-
-	node_info.type = BDR;
-	node_info.node_id = config_file_options.node_id;
-	node_info.upstream_node_id = NO_UPSTREAM_NODE;
-	node_info.active = true;
-	node_info.priority = config_file_options.priority;
-
-	strncpy(node_info.node_name, config_file_options.node_name, sizeof(node_info.node_name));
-	strncpy(node_info.location, config_file_options.location, sizeof(node_info.location));
-	strncpy(node_info.conninfo, config_file_options.conninfo, sizeof(node_info.conninfo));
-
-	if (record_status == RECORD_FOUND)
-	{
-		bool		node_updated = false;
-
-		/*
-		 * At this point we will have established there are no non-BDR
-		 * records, so no need to verify the node type
-		 */
-		if (!runtime_options.force)
-		{
-			log_error(_("this node is already registered"));
-			log_hint(_("use -F/--force to overwrite the existing node record"));
-			rollback_transaction(conn);
-			PQfinish(conn);
-			exit(ERR_BAD_CONFIG);
-		}
-
-		/*
-		 * don't permit changing the node name - this must match the BDR node
-		 * name set when the node was registered.
-		 */
-
-		if (strncmp(node_info.node_name, config_file_options.node_name, sizeof(node_info.node_name)) != 0)
-		{
-			log_error(_("a record for node %i is already registered with node_name \"%s\""),
-					  config_file_options.node_id, node_info.node_name);
-			log_hint(_("node_name configured in repmgr.conf is \"%s\""), config_file_options.node_name);
-
-			rollback_transaction(conn);
-			PQfinish(conn);
-			exit(ERR_BAD_CONFIG);
-		}
-
-		node_updated = update_node_record(conn, "bdr register", &node_info);
-
-		if (node_updated == true)
-		{
-			appendPQExpBuffer(&event_details, _("node record updated for node \"%s\" (%i)"),
-							  config_file_options.node_name, config_file_options.node_id);
-			log_verbose(LOG_NOTICE, "%s", event_details.data);
-		}
-		else
-		{
-			success = false;
-		}
-
-	}
-	else
-	{
-		/* create new node record */
-		bool		node_created = create_node_record(conn, "bdr register", &node_info);
-
-		if (node_created == true)
-		{
-			appendPQExpBuffer(&event_details,
-							  _("node record created for node \"%s\" (ID: %i)"),
-							  config_file_options.node_name, config_file_options.node_id);
-			log_notice("%s", event_details.data);
-		}
-		else
-		{
-			success = false;
-		}
-	}
-
-	if (success == false)
-	{
-		rollback_transaction(conn);
-		PQfinish(conn);
-		exit(ERR_DB_QUERY);
-	}
-
-	commit_transaction(conn);
-	/* Log the event */
-	create_event_notification(
-							  conn,
-							  &config_file_options,
-							  config_file_options.node_id,
-							  "bdr_register",
-							  true,
-							  event_details.data);
-
-	termPQExpBuffer(&event_details);
-
-	PQfinish(conn);
-
-	log_notice(_("BDR node %i registered (conninfo: %s)"),
-			   config_file_options.node_id, config_file_options.conninfo);
-
-	return;
-}
-
-
-void
-do_bdr_unregister(void)
-{
-	PGconn	   *conn = NULL;
-	ExtensionStatus extension_status = REPMGR_UNKNOWN;
-	int			target_node_id = UNKNOWN_NODE_ID;
-	t_node_info node_info = T_NODE_INFO_INITIALIZER;
-	RecordStatus record_status = RECORD_NOT_FOUND;
-	bool		node_record_deleted = false;
-	PQExpBufferData event_details;
-	char	   *dbname;
-
-	/* sanity-check configuration for BDR-compatability */
-
-	if (config_file_options.replication_type != REPLICATION_TYPE_BDR)
-	{
-		log_error(_("cannot run BDR UNREGISTER on a non-BDR node"));
-		exit(ERR_BAD_CONFIG);
-	}
-
-	dbname = pg_malloc0(MAXLEN);
-
-	if (dbname == NULL)
-	{
-		log_error(_("unable to allocate memory; terminating."));
-		exit(ERR_OUT_OF_MEMORY);
-	}
-
-	/* store the database name for future reference */
-	get_conninfo_value(config_file_options.conninfo, "dbname", dbname);
-
-	conn = establish_db_connection(config_file_options.conninfo, true);
-
-	if (!is_bdr_db(conn, NULL))
-	{
-		log_error(_("database \"%s\" is not BDR-enabled"), dbname);
-		PQfinish(conn);
-		pfree(dbname);
-		exit(ERR_BAD_CONFIG);
-	}
-
-	extension_status = get_repmgr_extension_status(conn, NULL);
-	if (extension_status != REPMGR_INSTALLED)
-	{
-		log_error(_("repmgr is not installed on database \"%s\""), dbname);
-		PQfinish(conn);
-		pfree(dbname);
-		exit(ERR_BAD_CONFIG);
-	}
-
-	pfree(dbname);
-
-	if (!is_bdr_repmgr(conn))
-	{
-		log_error(_("repmgr metadatabase contains records for non-BDR nodes"));
-		PQfinish(conn);
-		exit(ERR_BAD_CONFIG);
-	}
-
-	initPQExpBuffer(&event_details);
-	if (runtime_options.node_id != UNKNOWN_NODE_ID)
-		target_node_id = runtime_options.node_id;
-	else
-		target_node_id = config_file_options.node_id;
-
-
-	/* Check node exists and is really a BDR node */
-	record_status = get_node_record(conn, target_node_id, &node_info);
-
-	if (record_status != RECORD_FOUND)
-	{
-		log_error(_("no record found for node %i"), target_node_id);
-		PQfinish(conn);
-		exit(ERR_BAD_CONFIG);
-	}
-
-	begin_transaction(conn);
-
-	log_debug("unregistering node %i", target_node_id);
-
-	node_record_deleted = delete_node_record(conn, target_node_id);
-
-	if (node_record_deleted == false)
-	{
-		appendPQExpBuffer(&event_details,
-						  "unable to delete node record for node \"%s\" (ID: %i)",
-						  node_info.node_name,
-						  target_node_id);
-		rollback_transaction(conn);
-	}
-	else
-	{
-		appendPQExpBuffer(&event_details,
-						  "node record deleted for node \"%s\" (ID: %i)",
-						  node_info.node_name,
-						  target_node_id);
-		commit_transaction(conn);
-	}
-
-
-	/* Log the event */
-	create_event_notification(
-							  conn,
-							  &config_file_options,
-							  config_file_options.node_id,
-							  "bdr_unregister",
-							  true,
-							  event_details.data);
-
-	PQfinish(conn);
-
-	log_notice(_("bdr node \"%s\" (ID: %i) successfully unregistered"),
-			   node_info.node_name, target_node_id);
-
-	termPQExpBuffer(&event_details);
-
-	return;
-}
-
-
-void
-do_bdr_help(void)
-{
-	print_help_header();
-
-	printf(_("Usage:\n"));
-	printf(_("    %s [OPTIONS] bdr register\n"), progname());
-	printf(_("    %s [OPTIONS] bdr unregister\n"), progname());
-	puts("");
-
-	printf(_("BDR REGISTER\n"));
-	puts("");
-	printf(_("  \"bdr register\" initialises the repmgr cluster and registers the initial bdr node.\n"));
-	puts("");
-	printf(_("  -F, --force                         overwrite an existing node record\n"));
-	puts("");
-
-	printf(_("BDR UNREGISTER\n"));
-	puts("");
-	printf(_("  \"bdr unregister\" unregisters an inactive BDR node.\n"));
-	puts("");
-	printf(_("  --node-id                           ID node to unregister (optional, used when the node to unregister\n" \
-			 "                                        is offline)\n"));
-	puts("");
-}

repmgr-action-bdr.h

@@ -1,28 +0,0 @@
-/*
- * repmgr-action-bdr.h
- * Copyright (c) 2ndQuadrant, 2010-2019
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef _REPMGR_ACTION_BDR_H_
-#define _REPMGR_ACTION_BDR_H_
-
-extern void do_bdr_register(void);
-extern void do_bdr_unregister(void);
-
-extern void do_bdr_help(void);
-
-
-#endif							/* _REPMGR_ACTION_BDR_H_ */

repmgr-action-cluster.c

@@ -3,7 +3,7 @@
  *
  * Implements cluster information actions for the repmgr command line utility
  *
- * Copyright (c) 2ndQuadrant, 2010-2019
+ * Copyright (c) EnterpriseDB Corporation, 2010-2021
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -55,10 +55,8 @@ typedef enum
 struct ColHeader headers_show[SHOW_HEADER_COUNT];
 struct ColHeader headers_event[EVENT_HEADER_COUNT];
 
-
-
-static int	build_cluster_matrix(t_node_matrix_rec ***matrix_rec_dest, int *name_length, ItemList *warnings, int *error_code);
-static int	build_cluster_crosscheck(t_node_status_cube ***cube_dest, int *name_length, ItemList *warnings, int *error_code);
+static int	build_cluster_matrix(t_node_matrix_rec ***matrix_rec_dest, ItemList *warnings, int *error_code);
+static int	build_cluster_crosscheck(t_node_status_cube ***cube_dest, ItemList *warnings, int *error_code);
 static void cube_set_node_status(t_node_status_cube **cube, int n, int node_id, int matrix_node_id, int connection_node_id, int connection_status);
 
 /*
@@ -67,6 +65,8 @@ static void cube_set_node_status(t_node_status_cube **cube, int n, int node_id,
  * Parameters:
  *   --compact
  *   --csv
+ *   --terse
+ *   --verbose
  */
 void
 do_cluster_show(void)
@@ -206,7 +206,8 @@ do_cluster_show(void)
 		else
 		{
 			/* NOP on pre-9.6 servers */
-			cell->node_info->replication_info->timeline_id = get_node_timeline(cell->node_info->conn);
+			cell->node_info->replication_info->timeline_id = get_node_timeline(cell->node_info->conn,
+																			   cell->node_info->replication_info->timeline_id_str);
 		}
 
 		initPQExpBuffer(&node_status);
@@ -244,18 +245,13 @@ do_cluster_show(void)
 
 		headers_show[SHOW_LOCATION].cur_length = strlen(cell->node_info->location);
 
-		if (cell->node_info->replication_info->timeline_id == UNKNOWN_TIMELINE_ID)
+		/* Format timeline ID */
+		if (cell->node_info->type == WITNESS)
 		{
-			/* display "?" */
-			headers_show[SHOW_PRIORITY].cur_length = 1;
-		}
-		else
-		{
-			initPQExpBuffer(&buf);
-			appendPQExpBuffer(&buf, "%i", cell->node_info->replication_info->timeline_id);
-			headers_show[SHOW_PRIORITY].cur_length = strlen(buf.data);
-			termPQExpBuffer(&buf);
+			/* The witness node's timeline ID is irrelevant */
+			strncpy(cell->node_info->replication_info->timeline_id_str, _("n/a"), MAXLEN);
 		}
+		headers_show[SHOW_TIMELINE_ID].cur_length = strlen(cell->node_info->replication_info->timeline_id_str);
 
 		headers_show[SHOW_CONNINFO].cur_length = strlen(cell->node_info->conninfo);
 
@@ -322,10 +318,7 @@ do_cluster_show(void)
 
 			if (headers_show[SHOW_TIMELINE_ID].display == true)
 			{
-				if (cell->node_info->replication_info->timeline_id == UNKNOWN_TIMELINE_ID)
-					printf("| %-*c ", headers_show[SHOW_TIMELINE_ID].max_length, '?');
-				else
-					printf("| %-*i ", headers_show[SHOW_TIMELINE_ID].max_length, (int)cell->node_info->replication_info->timeline_id);
+				printf("| %-*s ", headers_show[SHOW_TIMELINE_ID].max_length, cell->node_info->replication_info->timeline_id_str);
 			}
 
 			if (headers_show[SHOW_CONNINFO].display == true)
@@ -343,14 +336,25 @@ do_cluster_show(void)
 	/* emit any warnings */
 	if (warnings.head != NULL && runtime_options.terse == false && runtime_options.output_mode != OM_CSV)
 	{
-		ItemListCell *cell = NULL;
 
-		printf(_("\nWARNING: following issues were detected\n"));
+		ItemListCell *cell = NULL;
+		PQExpBufferData warning;
+
+		initPQExpBuffer(&warning);
+
+		appendPQExpBufferStr(&warning,
+							 _("following issues were detected\n"));
 		for (cell = warnings.head; cell; cell = cell->next)
 		{
-			printf(_("  - %s\n"), cell->string);
+			appendPQExpBuffer(&warning,
+							  _("  - %s\n"), cell->string);
 		}
 
+		puts("");
+		log_warning("%s", warning.data);
+
+		termPQExpBuffer(&warning);
+
 		if (runtime_options.verbose == false && connection_error_found == true)
 		{
 			log_hint(_("execute with --verbose option to see connection error messages"));
@@ -532,9 +536,6 @@ do_cluster_crosscheck(void)
 {
 	int			i = 0,
 				n = 0;
-	char		c;
-	const char *node_header = "Name";
-	int			name_length = strlen(node_header);
 
 	t_node_status_cube **cube;
 
@@ -542,7 +543,7 @@ do_cluster_crosscheck(void)
 	int			error_code = SUCCESS;
 	ItemList	warnings = {NULL, NULL};
 
-	n = build_cluster_crosscheck(&cube, &name_length, &warnings, &error_code);
+	n = build_cluster_crosscheck(&cube, &warnings, &error_code);
 
 	if (runtime_options.output_mode == OM_CSV)
 	{
@@ -576,24 +577,56 @@ do_cluster_crosscheck(void)
 	}
 	else
 	{
-		printf("%*s | Id ", name_length, node_header);
-		for (i = 0; i < n; i++)
-			printf("| %2d ", cube[i]->node_id);
-		printf("\n");
+		/* output header contains node name, node ID and one column for each node in the cluster */
+		struct ColHeader *headers_crosscheck = NULL;
+
+		int header_count = n + 2;
+		int header_id = 2;
+
+		headers_crosscheck = palloc0(sizeof(ColHeader) * header_count);
+
+		/* Initialize column headers  */
+		strncpy(headers_crosscheck[0].title, _("Name"), MAXLEN);
+		strncpy(headers_crosscheck[1].title, _("ID"), MAXLEN);
 
-		for (i = 0; i < name_length; i++)
-			printf("-");
-		printf("-+----");
 		for (i = 0; i < n; i++)
-			printf("+----");
-		printf("\n");
+		{
+			maxlen_snprintf(headers_crosscheck[header_id].title, "%i", cube[i]->node_id);
+			header_id++;
+		}
+
+		/* Initialize column max values */
+		for (i = 0; i < header_count; i++)
+		{
+			headers_crosscheck[i].display = true;
+			headers_crosscheck[i].max_length = strlen(headers_crosscheck[i].title);
+			headers_crosscheck[i].cur_length = headers_crosscheck[i].max_length;
+
+			/* We can derive the maximum node ID length for the ID column from
+			 * the generated matrix node ID headers
+			 */
+			if (i >= 2 && headers_crosscheck[i].max_length > headers_crosscheck[1].max_length)
+				headers_crosscheck[1].max_length = headers_crosscheck[i].max_length;
+		}
+
+		for (i = 0; i < n; i++)
+		{
+			if (strlen(cube[i]->node_name) > headers_crosscheck[0].max_length)
+			{
+				headers_crosscheck[0].max_length = strlen(cube[i]->node_name);
+			}
+		}
+
+		print_status_header(header_count, headers_crosscheck);
 
 		for (i = 0; i < n; i++)
 		{
 			int			column_node_ix;
 
-			printf("%*s | %2d ", name_length,
+			printf(" %-*s | %-*i ",
+				   headers_crosscheck[0].max_length,
 				   cube[i]->node_name,
+				   headers_crosscheck[1].max_length,
 				   cube[i]->node_id);
 
 			for (column_node_ix = 0; column_node_ix < n; column_node_ix++)
@@ -601,6 +634,8 @@ do_cluster_crosscheck(void)
 				int			max_node_status = -2;
 				int			node_ix = 0;
 
+				char		c;
+
 				/*
 				 * The value of entry (i,j) is equal to the maximum value of all
 				 * the (i,j,k). Indeed:
@@ -640,12 +675,14 @@ do_cluster_crosscheck(void)
 						exit(ERR_INTERNAL);
 				}
 
-				printf("|  %c ", c);
+				printf("| %-*c ", headers_crosscheck[column_node_ix + 2].max_length, c);
 			}
 
 			printf("\n");
 		}
 
+		pfree(headers_crosscheck);
+
 		if (warnings.head != NULL && runtime_options.terse == false)
 		{
 			log_warning(_("following problems detected:"));
@@ -702,16 +739,13 @@ do_cluster_matrix()
 				j = 0,
 				n = 0;
 
-	const char *node_header = "Name";
-	int			name_length = strlen(node_header);
-
 	t_node_matrix_rec **matrix_rec_list;
 
 	bool		connection_error_found = false;
 	int			error_code = SUCCESS;
 	ItemList	warnings = {NULL, NULL};
 
-	n = build_cluster_matrix(&matrix_rec_list, &name_length, &warnings, &error_code);
+	n = build_cluster_matrix(&matrix_rec_list, &warnings, &error_code);
 
 	if (runtime_options.output_mode == OM_CSV)
 	{
@@ -734,27 +768,60 @@ do_cluster_matrix()
 	}
 	else
 	{
-		char		c;
+		/* output header contains node name, node ID and one column for each node in the cluster */
+		struct ColHeader *headers_matrix = NULL;
 
-		printf("%*s | Id ", name_length, node_header);
-		for (i = 0; i < n; i++)
-			printf("| %2d ", matrix_rec_list[i]->node_id);
-		printf("\n");
+		int header_count = n + 2;
+		int header_id = 2;
 
-		for (i = 0; i < name_length; i++)
-			printf("-");
-		printf("-+----");
-		for (i = 0; i < n; i++)
-			printf("+----");
-		printf("\n");
+		headers_matrix = palloc0(sizeof(ColHeader) * header_count);
+
+		/* Initialize column headers  */
+		strncpy(headers_matrix[0].title, _("Name"), MAXLEN);
+		strncpy(headers_matrix[1].title, _("ID"), MAXLEN);
 
 		for (i = 0; i < n; i++)
 		{
-			printf("%*s | %2d ", name_length,
+			maxlen_snprintf(headers_matrix[header_id].title, "%i", matrix_rec_list[i]->node_id);
+			header_id++;
+		}
+
+		/* Initialize column max values */
+		for (i = 0; i < header_count; i++)
+		{
+			headers_matrix[i].display = true;
+			headers_matrix[i].max_length = strlen(headers_matrix[i].title);
+			headers_matrix[i].cur_length = headers_matrix[i].max_length;
+
+			/* We can derive the maximum node ID length for the ID column from
+			 * the generated matrix node ID headers
+			 */
+			if (i >= 2 && headers_matrix[i].max_length > headers_matrix[1].max_length)
+				headers_matrix[1].max_length = headers_matrix[i].max_length;
+		}
+
+
+		for (i = 0; i < n; i++)
+		{
+			if (strlen(matrix_rec_list[i]->node_name) > headers_matrix[0].max_length)
+			{
+				headers_matrix[0].max_length = strlen(matrix_rec_list[i]->node_name);
+			}
+		}
+
+		print_status_header(header_count, headers_matrix);
+
+		for (i = 0; i < n; i++)
+		{
+			printf(" %-*s | %-*i ",
+				   headers_matrix[0].max_length,
 				   matrix_rec_list[i]->node_name,
+				   headers_matrix[1].max_length,
 				   matrix_rec_list[i]->node_id);
 			for (j = 0; j < n; j++)
 			{
+				char		c;
+
 				switch (matrix_rec_list[i]->node_status_list[j]->node_status)
 				{
 					case -2:
@@ -772,11 +839,13 @@ do_cluster_matrix()
 						exit(ERR_INTERNAL);
 				}
 
-				printf("|  %c ", c);
+				printf("| %-*c ", headers_matrix[j + 2].max_length, c);
 			}
 			printf("\n");
 		}
 
+		pfree(headers_matrix);
+
 		if (warnings.head != NULL && runtime_options.terse == false)
 		{
 			log_warning(_("following problems detected:"));
@@ -832,7 +901,7 @@ matrix_set_node_status(t_node_matrix_rec **matrix_rec_list, int n, int node_id,
 
 
 static int
-build_cluster_matrix(t_node_matrix_rec ***matrix_rec_dest, int *name_length, ItemList *warnings, int *error_code)
+build_cluster_matrix(t_node_matrix_rec ***matrix_rec_dest, ItemList *warnings, int *error_code)
 {
 	PGconn	   *conn = NULL;
 	int			i = 0,
@@ -890,7 +959,6 @@ build_cluster_matrix(t_node_matrix_rec ***matrix_rec_dest, int *name_length, Ite
 	/* Initialise matrix structure for each node */
 	for (cell = nodes.head; cell; cell = cell->next)
 	{
-		int			name_length_cur;
 		NodeInfoListCell *cell_j;
 
 		matrix_rec_list[i] = (t_node_matrix_rec *) pg_malloc0(sizeof(t_node_matrix_rec));
@@ -900,13 +968,6 @@ build_cluster_matrix(t_node_matrix_rec ***matrix_rec_dest, int *name_length, Ite
 				cell->node_info->node_name,
 				sizeof(matrix_rec_list[i]->node_name));
 
-		/*
-		 * Find the maximum length of a node name
-		 */
-		name_length_cur = strlen(matrix_rec_list[i]->node_name);
-		if (name_length_cur > *name_length)
-			*name_length = name_length_cur;
-
 		matrix_rec_list[i]->node_status_list = (t_node_status_rec **) pg_malloc0(sizeof(t_node_status_rec) * nodes.node_count);
 
 		j = 0;
@@ -1071,7 +1132,7 @@ build_cluster_matrix(t_node_matrix_rec ***matrix_rec_dest, int *name_length, Ite
 
 
 static int
-build_cluster_crosscheck(t_node_status_cube ***dest_cube, int *name_length, ItemList *warnings, int *error_code)
+build_cluster_crosscheck(t_node_status_cube ***dest_cube, ItemList *warnings, int *error_code)
 {
 	PGconn	   *conn = NULL;
 	int			h,
@@ -1120,20 +1181,12 @@ build_cluster_crosscheck(t_node_status_cube ***dest_cube, int *name_length, Item
 
 	for (cell = nodes.head; cell; cell = cell->next)
 	{
-		int			name_length_cur = 0;
 		NodeInfoListCell *cell_i = NULL;
 
 		cube[h] = (t_node_status_cube *) pg_malloc(sizeof(t_node_status_cube));
 		cube[h]->node_id = cell->node_info->node_id;
 		strncpy(cube[h]->node_name, cell->node_info->node_name, sizeof(cube[h]->node_name));
 
-		/*
-		 * Find the maximum length of a node name
-		 */
-		name_length_cur = strlen(cube[h]->node_name);
-		if (name_length_cur > *name_length)
-			*name_length = name_length_cur;
-
 		cube[h]->matrix_list_rec = (t_node_matrix_rec **) pg_malloc(sizeof(t_node_matrix_rec) * nodes.node_count);
 
 		i = 0;
@@ -1396,6 +1449,10 @@ do_cluster_cleanup(void)
 		log_warning(_("unable to vacuum table \"repmgr.monitoring_history\""));
 		log_detail("%s", PQerrorMessage(primary_conn));
 	}
+	else
+	{
+		log_info(_("vacuum of table \"repmgr.monitoring_history\" completed"));
+	}
 
 	if (runtime_options.keep_history == 0)
 	{
@@ -1497,4 +1554,5 @@ do_cluster_help(void)
 	printf(_("    -k, --keep-history=VALUE  retain indicated number of days of history (default: 0)\n"));
 	puts("");
 
+	printf(_("%s home page: <%s>\n"), "repmgr", REPMGR_URL);
 }

repmgr-action-cluster.h

@@ -1,6 +1,6 @@
 /*
  * repmgr-action-cluster.h
- * Copyright (c) 2ndQuadrant, 2010-2019
+ * Copyright (c) EnterpriseDB Corporation, 2010-2021
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

repmgr-action-daemon.c

@@ -2,7 +2,7 @@
  * repmgr-action-daemon.c
  *
  * Implements repmgrd actions for the repmgr command line utility
- * Copyright (c) 2ndQuadrant, 2010-2019
+ * Copyright (c) EnterpriseDB Corporation, 2010-2021
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -339,4 +339,5 @@ void do_daemon_help(void)
 
 	puts("");
 
+	printf(_("%s home page: <%s>\n"), "repmgr", REPMGR_URL);
 }

repmgr-action-daemon.h

@@ -1,6 +1,6 @@
 /*
  * repmgr-action-daemon.h
- * Copyright (c) 2ndQuadrant, 2010-2019
+ * Copyright (c) EnterpriseDB Corporation, 2010-2021
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

repmgr-action-node.h

@@ -1,6 +1,6 @@
 /*
  * repmgr-action-node.h
- * Copyright (c) 2ndQuadrant, 2010-2019
+ * Copyright (c) EnterpriseDB Corporation, 2010-2021
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

repmgr-action-primary.c

@@ -3,7 +3,7 @@
  *
  * Implements primary actions for the repmgr command line utility
  *
- * Copyright (c) 2ndQuadrant, 2010-2019
+ * Copyright (c) EnterpriseDB Corporation, 2010-2021
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -106,7 +106,7 @@ do_primary_register(void)
 	current_primary_id = get_primary_node_id(conn);
 	if (current_primary_id != NODE_NOT_FOUND && current_primary_id != config_file_options.node_id)
 	{
-		log_debug("XXX %i", current_primary_id);
+		log_debug("current active primary node ID is %i", current_primary_id);
 		primary_conn = establish_primary_db_connection(conn, false);
 
 		if (PQstatus(primary_conn) == CONNECTION_OK)
@@ -454,9 +454,9 @@ do_primary_unregister(void)
 
 			/*
 			 * This appears to be the cluster primary - cowardly refuse to
-			 * delete the record
+			 * delete the record, unless --force is supplied.
 			 */
-			if (primary_node_info.node_id == target_node_info_ptr->node_id)
+			if (primary_node_info.node_id == target_node_info_ptr->node_id && !runtime_options.force)
 			{
 				log_error(_("node \"%s\" (ID: %i) is the current primary node, unable to unregister"),
 						  target_node_info_ptr->node_name,
@@ -575,4 +575,5 @@ do_primary_help(void)
 
 	puts("");
 
+	printf(_("%s home page: <%s>\n"), "repmgr", REPMGR_URL);
 }

repmgr-action-primary.h

@@ -1,6 +1,6 @@
 /*
  * repmgr-action-primary.h
- * Copyright (c) 2ndQuadrant, 2010-2019
+ * Copyright (c) EnterpriseDB Corporation, 2010-2021
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

repmgr-action-service.c

@@ -2,7 +2,7 @@
  * repmgr-action-service.c
  *
  * Implements repmgrd actions for the repmgr command line utility
- * Copyright (c) 2ndQuadrant, 2010-2019
+ * Copyright (c) EnterpriseDB Corporation, 2010-2021
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -357,11 +357,22 @@ do_service_status(void)
 	{
 		ItemListCell *cell = NULL;
 
-		printf(_("\nWARNING: following issues were detected\n"));
+		PQExpBufferData warning;
+
+		initPQExpBuffer(&warning);
+
+		appendPQExpBufferStr(&warning,
+							 _("following issues were detected\n"));
+
 		for (cell = warnings.head; cell; cell = cell->next)
 		{
-			printf(_("  - %s\n"), cell->string);
+			appendPQExpBuffer(&warning,
+							  _("  - %s\n"), cell->string);
 		}
+		puts("");
+		log_warning("%s", warning.data);
+
+		termPQExpBuffer(&warning);
 
 		if (runtime_options.verbose == false && connection_error_found == true)
 		{
@@ -532,4 +543,6 @@ void do_service_help(void)
 	puts("");
 
 	puts("");
+
+	printf(_("%s home page: <%s>\n"), "repmgr", REPMGR_URL);
 }

repmgr-action-service.h

@@ -1,6 +1,6 @@
 /*
  * repmgr-action-service.h
- * Copyright (c) 2ndQuadrant, 2010-2019
+ * Copyright (c) EnterpriseDB Corporation, 2010-2021
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

repmgr-action-standby.h

@@ -1,6 +1,6 @@
 /*
  * repmgr-action-standby.h
- * Copyright (c) 2ndQuadrant, 2010-2019
+ * Copyright (c) EnterpriseDB Corporation, 2010-2021
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

repmgr-action-witness.c

@@ -3,7 +3,7 @@
  *
  * Implements witness actions for the repmgr command line utility
  *
- * Copyright (c) 2ndQuadrant, 2010-2019
+ * Copyright (c) EnterpriseDB Corporation, 2010-2021
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -74,18 +74,6 @@ do_witness_register(void)
 		exit(ERR_BAD_CONFIG);
 	}
 
-	/* check that witness node is not a BDR node */
-	if (is_bdr_db_quiet(witness_conn) == true)
-	{
-		log_error(_("witness node is a BDR node"));
-		log_hint(_("a witness node cannot be configured for a BDR cluster"));
-
-		PQfinish(witness_conn);
-
-		exit(ERR_BAD_CONFIG);
-	}
-
-
 	/* connect to primary with provided parameters */
 	log_info(_("connecting to primary node"));
 
@@ -194,19 +182,6 @@ do_witness_register(void)
 		}
 	}
 
-	/* check that primary node is not a BDR node */
-	if (is_bdr_db_quiet(primary_conn) == true)
-	{
-		log_error(_("primary node is a BDR node"));
-		log_hint(_("a witness node cannot be configured for a BDR cluster"));
-
-		PQfinish(witness_conn);
-		PQfinish(primary_conn);
-
-		exit(ERR_BAD_CONFIG);
-	}
-
-
 	/* create repmgr extension, if does not exist */
 	if (runtime_options.dry_run == false &&  !create_repmgr_extension(witness_conn))
 	{
@@ -585,7 +560,7 @@ void do_witness_help(void)
 
 	printf(_("WITNESS UNREGISTER\n"));
 	puts("");
-	printf(_("  \"witness register\" unregisters a witness node.\n"));
+	printf(_("  \"witness unregister\" unregisters a witness node.\n"));
 	puts("");
 	printf(_("  --dry-run                check prerequisites but don't make any changes\n"));
 	printf(_("  -F, --force              unregister when witness node not running\n"));
@@ -594,5 +569,5 @@ void do_witness_help(void)
 
 	puts("");
 
-	return;
+	printf(_("%s home page: <%s>\n"), "repmgr", REPMGR_URL);
 }

repmgr-action-witness.h

@@ -1,6 +1,6 @@
 /*
  * repmgr-action-witness.h
- * Copyright (c) 2ndQuadrant, 2010-2019
+ * Copyright (c) EnterpriseDB Corporation, 2010-2021
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by