doc: link to main documentation section about RemoveIPC

Per suggestion in GitHub #705.

.github/CODEOWNERS

@@ -1,7 +0,0 @@
-# Each line is a file pattern followed by one or more owners.
-
-# These owners will be the default owners for everything in
-# the repo. Unless a later match takes precedence,
-# @global-owner1 and @global-owner2 will be requested for
-# review when someone opens a pull request.
-*       @EnterpriseDB/repmgr-dev

HISTORY

@@ -1,32 +1,4 @@
-5.4.1   2023-??-??
+5.2.2.  2021-??-??
-        repmgrd: ensure witness node metadata is updated (Ian)
-
-5.4.0   2023-03-16
-        Support cloning replicas using pg-backup-api
-
-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)
@@ -80,7 +52,7 @@
           "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)
+0          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

Makefile.global.in

@@ -22,7 +22,7 @@ GIT_WORK_TREE=${repmgr_abs_srcdir}
 GIT_DIR=${repmgr_abs_srcdir}/.git
 export GIT_DIR
 export GIT_WORK_TREE
-PG_LDFLAGS=-lcurl -ljson-c
+
 include $(PGXS)
 
 -include ${repmgr_abs_srcdir}/Makefile.custom

Makefile.in

@@ -13,7 +13,6 @@ 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 \
@@ -28,11 +27,7 @@ DATA = \
   repmgr--5.0--5.1.sql \
   repmgr--5.1.sql \
   repmgr--5.1--5.2.sql \
-  repmgr--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
 
@@ -66,7 +61,7 @@ REPMGR_CLIENT_OBJS = repmgr-client.o \
 	repmgr-action-primary.o repmgr-action-standby.o repmgr-action-witness.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 pgbackupapi.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
 
@@ -81,10 +76,10 @@ configfile-scan.c: configfile-scan.l
 $(REPMGR_CLIENT_OBJS): repmgr-client.h repmgr_version.h
 
 repmgr: $(REPMGR_CLIENT_OBJS)
-	$(CC) $(CFLAGS) $(REPMGR_CLIENT_OBJS) $(libpq_pgport) $(LDFLAGS) $(LDFLAGS_EX) $(LIBS) -o $@$(X)
+	$(CC) $(CFLAGS) $(REPMGR_CLIENT_OBJS) $(libpq_pgport) $(LDFLAGS) $(LDFLAGS_EX) -o $@$(X)
 
 repmgrd: $(REPMGRD_OBJS)
-	$(CC) $(CFLAGS) $(REPMGRD_OBJS) $(libpq_pgport) $(LDFLAGS) $(LDFLAGS_EX) $(LIBS) -o $@$(X)
+	$(CC) $(CFLAGS) $(REPMGRD_OBJS) $(libpq_pgport) $(LDFLAGS) $(LDFLAGS_EX) -o $@$(X)
 
 $(REPMGR_CLIENT_OBJS): $(HEADERS)
 $(REPMGRD_OBJS): $(HEADERS)

README.md

@@ -7,8 +7,8 @@ replication capabilities with utilities to set up standby servers, monitor
 replication, and perform administrative tasks such as failover or switchover
 operations.
 
-The most recent `repmgr` version (5.4.1) supports all PostgreSQL versions from
+The most recent `repmgr` version (5.2.1) supports all PostgreSQL versions from
-10 to 16.
+9.5 to 13. PostgreSQL 9.4 is also supported, with some restrictions.
 
 `repmgr` is distributed under the GNU GPL 3 and maintained by EnterpriseDB.
 
@@ -19,6 +19,14 @@ The full `repmgr` documentation is available here:
 
 > [repmgr documentation](https://repmgr.org/docs/current/index.html)
 
+The old `README` file for `repmgr` 3.x is available here:
+
+> https://github.com/EnterpriseDB/repmgr/blob/REL3_3_STABLE/README.md
+
+Note that the `repmgr` 3.x series is no longer supported and contains known bugs;
+please upgrade to the [current repmgr version](https://repmgr.org/docs/current/appendix-release-notes.html)
+as soon as possible.
+
 Versions
 --------
 
@@ -40,6 +48,7 @@ Directories
  - `contrib/`: additional utilities
  - `doc/`: DocBook-based documentation files
  - `expected/`: expected regression test output
+ - `scripts/`: example scripts
  - `sql/`: regression test input
 
 
@@ -56,6 +65,8 @@ There is a mailing list/forum to discuss contributions or issues:
 
 * https://groups.google.com/group/repmgr
 
+The IRC channel #repmgr is registered with freenode.
+
 Please report bugs and other issues to:
 
 * https://github.com/EnterpriseDB/repmgr
@@ -68,13 +79,6 @@ news are always welcome.
 Thanks from the repmgr core team.
 
 * Ian Barwick
-* Israel Barth
-* Mario González
-* Martín Marqués
-* Gianni Ciolli
-
-Past contributors:
-
 * Jaime Casanova
 * Abhijit Menon-Sen
 * Simon Riggs
@@ -86,4 +90,3 @@ Further reading
 * [repmgr documentation](https://repmgr.org/docs/current/index.html)
 * [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)

configdata.c

@@ -291,46 +291,6 @@ struct ConfigFileSetting config_file_settings[] =
 		{},
 		{}
 	},
-	/* pg_backupapi_backup_id*/
-	{
-		"pg_backupapi_backup_id",
-		CONFIG_STRING,
-		{ .strptr = config_file_options.pg_backupapi_backup_id },
-		{ .strdefault = "" },
-		{},
-		{ .strmaxlen = sizeof(config_file_options.pg_backupapi_backup_id) },
-		{}
-	},
-	/* pg_backupapi_host*/
-	{
-		"pg_backupapi_host",
-		CONFIG_STRING,
-		{ .strptr = config_file_options.pg_backupapi_host },
-		{ .strdefault = "" },
-		{},
-		{ .strmaxlen = sizeof(config_file_options.pg_backupapi_host) },
-		{}
-	},
-	/* pg_backupapi_node_name */
-	{
-		"pg_backupapi_node_name",
-		CONFIG_STRING,
-		{ .strptr = config_file_options.pg_backupapi_node_name },
-		{ .strdefault = "" },
-		{},
-		{ .strmaxlen = sizeof(config_file_options.pg_backupapi_node_name) },
-		{}
-	},
-	/* pg_backupapi_remote_ssh_command */
-	{
-		"pg_backupapi_remote_ssh_command",
-		CONFIG_STRING,
-		{ .strptr = config_file_options.pg_backupapi_remote_ssh_command },
-		{ .strdefault = "" },
-		{},
-		{ .strmaxlen = sizeof(config_file_options.pg_backupapi_remote_ssh_command) },
-		{}
-	},
 
 	/* =======================
 	 * standby follow settings
@@ -621,16 +581,6 @@ struct ConfigFileSetting config_file_settings[] =
 		{ .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",

configfile.h

@@ -164,10 +164,6 @@ typedef struct
 	char		archive_cleanup_command[MAXLEN];
 	bool		use_primary_conninfo_password;
 	char		passfile[MAXPGPATH];
-	char		pg_backupapi_backup_id[NAMEDATALEN];
-	char		pg_backupapi_host[NAMEDATALEN];
-	char		pg_backupapi_node_name[NAMEDATALEN];
-	char		pg_backupapi_remote_ssh_command[MAXLEN];
 
 	/* standby promote settings */
 	int			promote_check_timeout;
@@ -210,7 +206,6 @@ 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;

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.4.0.
+# Generated by GNU Autoconf 2.69 for repmgr 5.2.1.
 #
 # Report bugs to <repmgr@googlegroups.com>.
 #
@@ -582,8 +582,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='repmgr'
 PACKAGE_TARNAME='repmgr'
-PACKAGE_VERSION='5.4.0'
+PACKAGE_VERSION='5.2.1'
-PACKAGE_STRING='repmgr 5.4.0'
+PACKAGE_STRING='repmgr 5.2.1'
 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.4.0 to adapt to many kinds of systems.
+\`configure' configures repmgr 5.2.1 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.4.0:";;
+     short | recursive ) echo "Configuration of repmgr 5.2.1:";;
    esac
   cat <<\_ACEOF
 
@@ -1316,7 +1316,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-repmgr configure 5.4.0
+repmgr configure 5.2.1
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -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.4.0, which was
+It was created by repmgr $as_me 5.2.1, 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/^[^0-9]\+ \([0-9]\{1,2\}\).*$/\1/')
+              $SED -e 's/^PostgreSQL \([0-9]\{1,2\}\).*$/\1/')
 
 if test "$major_version_num" -lt '10'; then
     version_num=$(echo "$pgac_pg_config_version"|
-                $SED -e 's/^[^0-9]\+ \([0-9]*\)\.\([0-9]*\)\([a-zA-Z0-9.]*\)$/\1.\2/')
+                $SED -e 's/^PostgreSQL \([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
@@ -1829,7 +1829,7 @@ if test "$major_version_num" -lt '10'; then
     fi
 else
     version_num=$(echo "$pgac_pg_config_version"|
-                $SED -e 's/^[^0-9]\+ \(.\+\)$/\1/')
+                $SED -e 's/^PostgreSQL \(.\+\)$/\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.4.0, which was
+This file was extended by repmgr $as_me 5.2.1, 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.4.0
+repmgr config.status 5.2.1
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 

configure.in

@@ -1,4 +1,4 @@
-AC_INIT([repmgr], [5.4.0], [repmgr@googlegroups.com], [repmgr], [https://repmgr.org/])
+AC_INIT([repmgr], [5.2.1], [repmgr@googlegroups.com], [repmgr], [https://repmgr.org/])
 
 AC_COPYRIGHT([Copyright (c) 2010-2021, EnterpriseDB Corporation])
 
@@ -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/^[[^0-9]]\+ \([[0-9]]\{1,2\}\).*$/\1/')
+              $SED -e 's/^PostgreSQL \([[0-9]]\{1,2\}\).*$/\1/')
 
 if test "$major_version_num" -lt '10'; then
     version_num=$(echo "$pgac_pg_config_version"|
-                $SED -e 's/^[[^0-9]]\+ \([[0-9]]*\)\.\([[0-9]]*\)\([[a-zA-Z0-9.]]*\)$/\1.\2/')
+                $SED -e 's/^PostgreSQL \([[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?])
@@ -37,7 +37,7 @@ if test "$major_version_num" -lt '10'; then
     fi
 else
     version_num=$(echo "$pgac_pg_config_version"|
-                $SED -e 's/^[[^0-9]]\+ \(.\+\)$/\1/')
+                $SED -e 's/^PostgreSQL \(.\+\)$/\1/')
 
     if test -z "$version_num"; then
         AC_MSG_ERROR([could not detect the PostgreSQL version, wrong or broken pg_config?])
@@ -60,7 +60,6 @@ AC_SUBST(vpath_build)
 AC_CHECK_PROG(HAVE_GNUSED,gnused,yes,no)
 AC_CHECK_PROG(HAVE_GSED,gsed,yes,no)
 AC_CHECK_PROG(HAVE_SED,sed,yes,no)
-AC_CHECK_PROG(HAVE_FLEX,flex,yes,no)
 
 if test "$HAVE_GNUSED" = yes; then
  SED=gnused
@@ -73,25 +72,6 @@ else
 fi
 AC_SUBST(SED)
 
-AS_IF([test x"$HAVE_FLEX" != x"yes"], AC_MSG_ERROR([flex should be installed first]))
-
-#Checking libraries
-GENERIC_LIB_FAILED_MSG="library should be installed"
-
-AC_CHECK_LIB(selinux, is_selinux_enabled, [],
-     [AC_MSG_ERROR(['selinux' $GENERIC_LIB_FAILED_MSG])])
-
-AC_CHECK_LIB(lz4, LZ4_compress_default, [],
-     [AC_MSG_ERROR(['Z4' $GENERIC_LIB_FAILED_MSG])])
-
-AC_CHECK_LIB(xslt, xsltCleanupGlobals, [],
-     [AC_MSG_ERROR(['xslt' $GENERIC_LIB_FAILED_MSG])])
-
-AC_CHECK_LIB(pam, pam_start, [],
-     [AC_MSG_ERROR(['pam' $GENERIC_LIB_FAILED_MSG])])
-
-AC_CHECK_LIB(gssapi_krb5, gss_init_sec_context, [],
-     [AC_MSG_ERROR([gssapi_krb5 $GENERIC_LIB_FAILED_MSG])])
 
 AC_CONFIG_FILES([Makefile])
 AC_CONFIG_FILES([Makefile.global])

dbutils.c

@@ -61,8 +61,6 @@ static ReplSlotStatus _verify_replication_slot(PGconn *conn, char *slot_name, PQ
 
 static bool _create_event(PGconn *conn, t_configuration_options *options, int node_id, char *event, bool successful, char *details, t_event_info *event_info, bool send_notification);
 
-static NodeAttached _is_downstream_node_attached(PGconn *conn, char *node_name, char **node_state, bool quiet);
-
 /*
  * This provides a standardized way of logging database errors. Note
  * that the provided PGconn can be a normal or a replication connection;
@@ -1291,16 +1289,21 @@ get_cluster_size(PGconn *conn, char *size)
 	initPQExpBuffer(&query);
 	appendPQExpBufferStr(&query,
 						 "SELECT pg_catalog.pg_size_pretty(pg_catalog.sum(pg_catalog.pg_database_size(oid))::bigint) "
-						 "  FROM pg_catalog.pg_database ");
+						 "	 FROM pg_catalog.pg_database ");
 
 	log_verbose(LOG_DEBUG, "get_cluster_size():\n%s", query.data);
 
 	res = PQexec(conn, query.data);
 
 	if (PQresultStatus(res) != PGRES_TUPLES_OK)
+	{
+		log_db_error(conn, query.data, _("get_cluster_size(): unable to execute query"));
 		success = false;
+	}
 	else
+	{
 		snprintf(size, MAXLEN, "%s", PQgetvalue(res, 0, 0));
+	}
 
 	termPQExpBuffer(&query);
 	PQclear(res);
@@ -1823,80 +1826,11 @@ get_timeline_history(PGconn *repl_conn, TimeLineID tli)
 }
 
 
-pid_t
-get_wal_receiver_pid(PGconn *conn)
-{
-	PGresult   *res = NULL;
-	pid_t		wal_receiver_pid = UNKNOWN_PID;
-
-	res = PQexec(conn, "SELECT repmgr.get_wal_receiver_pid()");
-
-	if (PQresultStatus(res) != PGRES_TUPLES_OK)
-	{
-		log_error(_("unable to execute \"SELECT repmgr.get_wal_receiver_pid()\""));
-		log_detail("%s", PQerrorMessage(conn));
-	}
-	else if (!PQgetisnull(res, 0, 0))
-	{
-		wal_receiver_pid = atoi(PQgetvalue(res, 0, 0));
-	}
-
-	PQclear(res);
-
-	return wal_receiver_pid;
-}
-
-
 /* =============================== */
 /* user/role information functions */
 /* =============================== */
 
 
-/*
- * Determine if the user associated with the current connection can execute CHECKPOINT command.
- * User must be a supersuer or a member of the pg_checkpoint default role (available from PostgreSQL 15).
- */
-bool
-can_execute_checkpoint(PGconn *conn)
-{
-	PQExpBufferData query;
-	PGresult   *res;
-	bool		has_pg_checkpoint_role = false;
-
-	/* superusers can do anything, no role check needed */
-	if (is_superuser_connection(conn, NULL) == true)
-		return true;
-
-	/* pg_checkpoint available from PostgreSQL 15 */
-	if (PQserverVersion(conn) < 150000)
-		return false;
-
-	initPQExpBuffer(&query);
-	appendPQExpBufferStr(&query,
-						 " SELECT pg_catalog.pg_has_role('pg_checkpoint','USAGE') ");
-
-	res = PQexec(conn, query.data);
-
-	if (PQresultStatus(res) != PGRES_TUPLES_OK)
-	{
-		log_db_error(conn, query.data,
-					 _("can_execute_checkpoint(): unable to query user roles"));
-	}
-	else
-	{
-		has_pg_checkpoint_role = atobool(PQgetvalue(res, 0, 0));
-	}
-	termPQExpBuffer(&query);
-	PQclear(res);
-
-	return has_pg_checkpoint_role;
-}
-
-
-/*
- * Determine if the user associated with the current connection
- * has sufficient permissions to use pg_promote function
- */
 bool
 can_execute_pg_promote(PGconn *conn)
 {
@@ -1933,74 +1867,6 @@ can_execute_pg_promote(PGconn *conn)
 }
 
 
-/*
- * Determine if the user associated with the current connection
- * has sufficient permissions to disable the walsender
- */
-bool
-can_disable_walsender(PGconn *conn)
-{
-	/*
-	 * Requires PostgreSQL 9.5 or later, because ALTER SYSTEM
-	 */
-	if (PQserverVersion(conn) < 90500)
-	{
-		log_warning(_("\"standby_disconnect_on_failover\" specified, but not available for this PostgreSQL version"));
-		/* TODO: format server version */
-		log_detail(_("available from PostgreSQL 9.5; this PostgreSQL version is %i"), PQserverVersion(conn));
-
-		return false;
-	}
-
-	/*
-	 * Superusers can do anything
-	 */
-	if (is_superuser_connection(conn, NULL) == true)
-		return true;
-
-	PQExpBufferData query;
-	PGresult   *res;
-	bool		has_alter_system_priv = false;
-
-	/* GRANT ALTER SYSTEM available from PostgreSQL 15 */
-	if (PQserverVersion(conn) >= 150000)
-	{
-		initPQExpBuffer(&query);
-		appendPQExpBufferStr(&query,
-						" SELECT pg_catalog.has_parameter_privilege('wal_retrieve_retry_interval', 'ALTER SYSTEM') ");
-
-		res = PQexec(conn, query.data);
-
-		if (PQresultStatus(res) != PGRES_TUPLES_OK)
-		{
-			log_db_error(conn, query.data,
-					_("can_disable_walsender(): unable to query user parameter privileges"));
-		}
-		else
-		{
-			has_alter_system_priv = atobool(PQgetvalue(res, 0, 0));
-		}
-		termPQExpBuffer(&query);
-		PQclear(res);
-	}
-
-	if (has_alter_system_priv == false)
-	{
-		log_warning(_("\"standby_disconnect_on_failover\" specified, but repmgr user is not authorized to perform ALTER SYSTEM wal_retrieve_retry_interval"));
-
-		if (PQserverVersion(conn) >= 150000)
-		{
-			log_detail(_("superuser or ALTER SYSTEM wal_retrieve_retry_interval permission required to disable standbys on failover"));
-		}
-		else
-		{
-			log_detail(_("superuser permission required to disable standbys on failover"));
-		}
-	}
-
-	return has_alter_system_priv;
-}
-
 /*
  * Determine if the user associated with the current connection is
  * a member of the "pg_monitor" default role, or optionally one
@@ -2024,13 +1890,13 @@ connection_has_pg_monitor_role(PGconn *conn, const char *subrole)
 	initPQExpBuffer(&query);
 	appendPQExpBufferStr(&query,
 						 "  SELECT CASE "
-						 "           WHEN pg_catalog.pg_has_role('pg_monitor','USAGE') "
+						 "           WHEN pg_catalog.pg_has_role('pg_monitor','MEMBER') "
 						 "             THEN TRUE ");
 
 	if (subrole != NULL)
 	{
 		appendPQExpBuffer(&query,
-						  "           WHEN pg_catalog.pg_has_role('%s','USAGE') "
+						  "           WHEN pg_catalog.pg_has_role('%s','MEMBER') "
 						  "             THEN TRUE ",
 						  subrole);
 	}
@@ -2216,13 +2082,7 @@ server_in_exclusive_backup_mode(PGconn *conn)
 {
 	BackupState backup_state = BACKUP_STATE_UNKNOWN;
 	const char *sqlquery = "SELECT pg_catalog.pg_is_in_backup()";
-	PGresult   *res = NULL;
+	PGresult   *res = PQexec(conn, sqlquery);
-
-	/* Exclusive backup removed from PostgreSQL 15 */
-	if (PQserverVersion(conn) >= 150000)
-		return BACKUP_STATE_NO_BACKUP;
-
-	res = PQexec(conn, sqlquery);
 
 	if (PQresultStatus(res) != PGRES_TUPLES_OK)
 	{
@@ -2386,6 +2246,29 @@ repmgrd_pause(PGconn *conn, bool pause)
 	return success;
 }
 
+pid_t
+get_wal_receiver_pid(PGconn *conn)
+{
+	PGresult   *res = NULL;
+	pid_t		wal_receiver_pid = UNKNOWN_PID;
+
+	res = PQexec(conn, "SELECT repmgr.get_wal_receiver_pid()");
+
+	if (PQresultStatus(res) != PGRES_TUPLES_OK)
+	{
+		log_error(_("unable to execute \"SELECT repmgr.get_wal_receiver_pid()\""));
+		log_detail("%s", PQerrorMessage(conn));
+	}
+	else if (!PQgetisnull(res, 0, 0))
+	{
+		wal_receiver_pid = atoi(PQgetvalue(res, 0, 0));
+	}
+
+	PQclear(res);
+
+	return wal_receiver_pid;
+}
+
 
 int
 repmgrd_get_upstream_node_id(PGconn *conn)
@@ -2537,10 +2420,7 @@ get_repmgr_extension_status(PGconn *conn, t_extension_versions *extversions)
 /* node management functions */
 /* ========================= */
 
-/*
+/* assumes superuser connection */
- * Assumes the connection can execute CHECKPOINT command.
- * A check can be executed via 'can_execute_checkpoint' function.
- */
 void
 checkpoint(PGconn *conn)
 {
@@ -4362,7 +4242,7 @@ _create_event(PGconn *conn, t_configuration_options *options, int node_id, char
 						}
 						break;
 					case 'p':
-						/* %p: primary id ("standby_switchover"/"repmgrd_failover_promote": former primary id) */
+						/* %p: primary id ("standby_switchover": former primary id) */
 						src_ptr++;
 						if (event_info->node_id != UNKNOWN_NODE_ID)
 						{
@@ -4696,17 +4576,17 @@ drop_replication_slot_replprot(PGconn *repl_conn, char *slot_name)
 	initPQExpBuffer(&query);
 
 	appendPQExpBuffer(&query,
-					  "DROP_REPLICATION_SLOT %s;",
+					  "DROP_REPLICATION_SLOT %s",
 					  slot_name);
 
 	log_verbose(LOG_DEBUG, "drop_replication_slot_replprot():\n  %s", query.data);
 
 	res = PQexec(repl_conn, query.data);
 
-	if (PQresultStatus(res) != PGRES_TUPLES_OK || !PQntuples(res))
+	if (PQresultStatus(res) != PGRES_TUPLES_OK)
 	{
 		log_db_error(repl_conn, query.data,
-					 _("drop_replication_slot_replprot(): unable to drop replication slot \"%s\""),
+					 _("drop_replication_slot_sql(): unable to drop replication slot \"%s\""),
 					 slot_name);
 
 		success = false;
@@ -5824,7 +5704,7 @@ get_node_timeline(PGconn *conn, char *timeline_id_str)
 	TimeLineID timeline_id  = UNKNOWN_TIMELINE_ID;
 
 	/*
-	 * pg_control_checkpoint() was introduced in PostgreSQL 9.6
+	 * PG_control_checkpoint() was introduced in PostgreSQL 9.6
 	 */
 	if (PQserverVersion(conn) >= 90600)
 	{
@@ -5912,19 +5792,6 @@ get_node_replication_stats(PGconn *conn, t_node_info *node_info)
 NodeAttached
 is_downstream_node_attached(PGconn *conn, char *node_name, char **node_state)
 {
-	return _is_downstream_node_attached(conn, node_name, node_state, false);
-}
-
-NodeAttached
-is_downstream_node_attached_quiet(PGconn *conn, char *node_name, char **node_state)
-{
-	return _is_downstream_node_attached(conn, node_name, node_state, true);
-}
-
-NodeAttached
-_is_downstream_node_attached(PGconn *conn, char *node_name, char **node_state, bool quiet)
-{
-
 	PQExpBufferData query;
 	PGresult   *res = NULL;
 
@@ -5959,12 +5826,9 @@ _is_downstream_node_attached(PGconn *conn, char *node_name, char **node_state, b
 	 */
 	if (PQntuples(res) > 1)
 	{
-		if (quiet == false)
+		log_error(_("multiple entries with \"application_name\" set to  \"%s\" found in \"pg_stat_replication\""),
-		{
+				  node_name);
-			log_error(_("multiple entries with \"application_name\" set to  \"%s\" found in \"pg_stat_replication\""),
+		log_hint(_("verify that a unique node name is configured for each node"));
-					  node_name);
-			log_hint(_("verify that a unique node name is configured for each node"));
-		}
 
 		PQclear(res);
 
@@ -5973,8 +5837,7 @@ _is_downstream_node_attached(PGconn *conn, char *node_name, char **node_state, b
 
 	if (PQntuples(res) == 0)
 	{
-		if (quiet == false)
+		log_warning(_("node \"%s\" not found in \"pg_stat_replication\""), node_name);
-			log_warning(_("node \"%s\" not found in \"pg_stat_replication\""), node_name);
 
 		PQclear(res);
 
@@ -6000,10 +5863,9 @@ _is_downstream_node_attached(PGconn *conn, char *node_name, char **node_state, b
 
 		if (strcmp(state, "streaming") != 0)
 		{
-			if (quiet == false)
+			log_warning(_("node \"%s\" attached in state \"%s\""),
-				log_warning(_("node \"%s\" attached in state \"%s\""),
+						node_name,
-							node_name,
+						state);
-							state);
 
 			PQclear(res);
 
@@ -6146,43 +6008,6 @@ is_wal_replay_paused(PGconn *conn, bool check_pending_wal)
 	return is_paused;
 }
 
-/* repmgrd status functions */
-
-CheckStatus
-get_repmgrd_status(PGconn *conn)
-{
-	PQExpBufferData query;
-	PGresult   *res = NULL;
-	CheckStatus	repmgrd_status = CHECK_STATUS_CRITICAL;
-
-	initPQExpBuffer(&query);
-
-	appendPQExpBufferStr(&query,
-						 " SELECT "
-						 " CASE "
-						 "   WHEN repmgr.repmgrd_is_running() "
-						 "   THEN "
-						 "     CASE "
-						 "       WHEN repmgr.repmgrd_is_paused() THEN 1 ELSE 0 "
-						 "     END "
-						 "   ELSE 2 "
-						 " END AS repmgrd_status");
-	res = PQexec(conn, query.data);
-
-	if (PQresultStatus(res) != PGRES_TUPLES_OK)
-	{
-		log_db_error(conn, query.data, _("unable to execute repmgrd status query"));
-	}
-	else
-	{
-		repmgrd_status = atoi(PQgetvalue(res, 0, 0));
-	}
-
-	termPQExpBuffer(&query);
-	PQclear(res);
-	return repmgrd_status;
-}
-
 
 /* miscellaneous debugging functions */
 

dbutils.h

@@ -450,12 +450,9 @@ 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_checkpoint(PGconn *conn);
 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);
@@ -470,6 +467,7 @@ 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);
 
@@ -599,15 +597,11 @@ int			get_replication_lag_seconds(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, 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);
 
-/* repmgrd status functions */
-CheckStatus	get_repmgrd_status(PGconn *conn);
-
 /* miscellaneous debugging functions */
 const char *print_node_status(NodeStatus node_status);
 const char *print_pqping_status(PGPing ping_status);

doc/appendix-faq.xml

@@ -249,16 +249,16 @@
         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 --replication-conf-only</link></command>
-        can be used to create the correct replication configuration file for
+        can be used to create the correct <filename>recovery.conf</filename> 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 the replication configuration, and what options can be set there?</title>
+      <title>What does &repmgr; write in <filename>recovery.conf</filename>, and what options can be set there?</title>
       <para>
-        See section <link linkend="repmgr-standby-clone-recovery-conf">Customising replication configuration</link>.
+        See section <link linkend="repmgr-standby-clone-recovery-conf">Customising recovery.conf</link>.
       </para>
     </sect2>
 
@@ -366,11 +366,11 @@
       </para>
     </sect2>
 
-    <sect2 id="faq-repmgr-recovery-conf-quoted-values" xreflabel="Quoted values in replication.conf">
+    <sect2 id="faq-repmgr-recovery-conf-quoted-values" xreflabel="Quoted values in recovery.conf">
-      <title>Why are some values in <filename>recovery.conf</filename> (PostgreSQL 11 and earlier) surrounded by pairs of single quotes?</title>
+      <title>Why are some values in <filename>recovery.conf</filename> 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 the file is parsed.
+        are escaped correctly and do not cause errors when <filename>recovery.conf</filename> is parsed.
       </para>
       <para>
         The escaping is performed by an internal PostgreSQL routine, which leaves strings consisting
@@ -419,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 the replication configuration. However &repmgrd; does not currently
+        in <filename>recovery.conf</filename> - but as it's not currently possible
-        consider this setting, and therefore may not be able to properly evaluate
+        to directly examine the value applied to the standby, &repmgrd;
-        the node as a promotion candidate.
+        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

doc/appendix-packages.xml

@@ -50,18 +50,18 @@
       <title>CentOS repositories</title>
 
       <para>
-        &repmgr; packages are available from the public EDB repository, and also the
+        &repmgr; packages are available from the public 2ndQuadrant repository, and also the
-        PostgreSQL community repository. The EDB repository is updated immediately
+        PostgreSQL community repository. The 2ndQuadrant repository is updated immediately
         after each &repmgr; release.
       </para>
 
       <table id="centos-2ndquadrant-repository">
-        <title>EDB public repository</title>
+        <title>2ndQuadrant public repository</title>
         <tgroup cols="2">
           <tbody>
             <row>
               <entry>Repository URL:</entry>
-              <entry><ulink url="https://dl.enterprisedb.com/">https://dl.enterprisedb.com/</ulink></entry>
+              <entry><ulink url="https://dl.2ndquadrant.com/">https://dl.2ndquadrant.com/</ulink></entry>
             </row>
             <row>
               <entry>Repository documentation:</entry>
@@ -252,7 +252,7 @@
     </indexterm>
 
     <para>
-      &repmgr; <literal>.deb</literal> packages are provided by EDB as well as the
+      &repmgr; <literal>.deb</literal> packages are provided by 2ndQuadrant 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.
@@ -262,12 +262,12 @@
       <title>APT repositories</title>
 
       <table id="apt-2ndquadrant-repository">
-        <title>EDB public repository</title>
+        <title>2ndQuadrant public repository</title>
         <tgroup cols="2">
           <tbody>
             <row>
               <entry>Repository URL:</entry>
-              <entry><ulink url="https://dl.enterprisedb.com/">https://dl.enterprisedb.com/</ulink></entry>
+              <entry><ulink url="https://dl.2ndquadrant.com/">https://dl.2ndquadrant.com/</ulink></entry>
             </row>
             <row>
               <entry>Repository documentation:</entry>
@@ -401,7 +401,7 @@
     </indexterm>
 
     <para>
-      For testing new features and bug fixes, from time to time EDB provides
+      For testing new features and bug fixes, from time to time 2ndQuadrant 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.
@@ -413,22 +413,22 @@
       </para>
     </note>
     <para>
-      To install a snapshot package, it's necessary to install the EDB public snapshot repository,
+      To install a snapshot package, it's necessary to install the 2ndQuadrant 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>
+      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>
       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.enterprisedb.com/default/snapshot/get/9.6/rpm | bash</programlisting>
+curl https://dl.2ndquadrant.com/default/snapshot/get/9.6/rpm | bash</programlisting>
 
       or as a normal user with root sudo access:
       <programlisting>
-curl https://dl.enterprisedb.com/default/snapshot/get/9.6/rpm | sudo bash</programlisting>
+curl https://dl.2ndquadrant.com/default/snapshot/get/9.6/rpm | sudo bash</programlisting>
     </para>
     <para>
       Alternatively you can browse the repository here:
-      <ulink url="https://dl.enterprisedb.com/default/snapshot/browse/">https://dl.enterprisedb.com/default/snapshot/browse/</ulink>.
+      <ulink url="https://dl.2ndquadrant.com/default/snapshot/browse/">https://dl.2ndquadrant.com/default/snapshot/browse/</ulink>.
     </para>
     <para>
       Once the repository is installed, installing or updating &repmgr; will result in the latest snapshot
@@ -493,6 +493,32 @@ 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,252 +15,18 @@
     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.4.1">
+  <sect1 id="release-5.2.2">
-    <title id="release-current">Release 5.4.1</title>
+    <title id="release-current">Release 5.2.2</title>
-    <para><emphasis>??? ?? ??????, 202?</emphasis></para>
+    <para><emphasis>??? ? ???, 2021</emphasis></para>
     <para>
-      &repmgr; 5.4.1 is a minor release providing ...
+      &repmgr; 5.2.2 is a minor release.
     </para>
     <sect2>
       <title>Bug fixes</title>
       <para>
-        <itemizedlist>
-          <listitem>
-            <para>
-              &repmgrd;: ensure witness node metadata is updated if the primary
-              node changed while the witness &repmgrd; was not running.
-            </para>
-          </listitem>
-        </itemizedlist>
-      </para>
-    </sect2>
-  </sect1>
 
-  <sect1 id="release-5.4.0">
+         <itemizedlist>
-    <title>Release 5.4.0</title>
-    <para><emphasis>Thu 15 March, 2023</emphasis></para>
-    <para>
-      &repmgr; 5.4.0 is a major release.
-    </para>
-    <para>
-      This release provides support for cloning standbys using backups taken with <ulink url="http://www.pgbarman.org">barman</ulink>
-      with the use of <ulink url="https://github.com/EnterpriseDB/pg-backup-api">pg-backup-api</ulink>.
-    </para>
-    <para>
-      Minor fixes to the documentation.
-    </para>
-  </sect1>
-
-  <sect1 id="release-5.3.3">
-    <title>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>:
@@ -272,23 +38,22 @@
             </para>
            </listitem>
 
-
            <listitem>
-            <para>
+             <para>
-              &repmgrd;: rename internal shared library functions to minimize the
+               <command><link linkend="repmgr-node-rejoin">repmgr node rejoin</link></command>:
-              risk of clashes with other shared libraries.
+               emit rejoin target note information as <literal>NOTICE</literal>.
-            </para>
+             </para>
-            <para>
+             <para>
-              This does not affect user-facing SQL functions. Howe
+               This makes it clearer what &repmgr; is trying to do.
-            </para>
+             </para>
-          </listitem>
+           </listitem>
-
           <listitem>
             <para>
               &repmgrd;: ensure short option <option>-s</option> is accepted.
             </para>
           </listitem>
-        </itemizedlist>
+
+         </itemizedlist>
       </para>
     </sect2>
   </sect1>

doc/appendix-support.xml

@@ -7,13 +7,13 @@
   </indexterm>
 
   <para>
-    <ulink url="https://www.enterprisedb.com/">EDB</ulink> provides 24x7
+    <ulink url="https://2ndquadrant.com/">2ndQuadrant</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://www.enterprisedb.com/support/postgresql-support-overview-get-the-most-out-of-postgresql">Support Center</ulink>
+    For further details see: <ulink url="https://2ndquadrant.com/en/support/">https://2ndquadrant.com/en/support/</ulink>
   </para>
 
   <para>

doc/cloning-standbys.xml

@@ -15,7 +15,7 @@
 
    <para>
     <xref linkend="repmgr-standby-clone"/> can use
-    <ulink url="https://www.enterprisedb.com/">EDB</ulink>'s
+    <ulink url="https://www.2ndquadrant.com/">2ndQuadrant</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>
@@ -197,7 +197,7 @@ description = "Main cluster"
    <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 the replication configuration to
+    setting <varname>restore_command</varname> in <filename>recovery.conf</filename> to
     a valid shell command which can retrieve a specified WAL file from the archive.
    </para>
    <para>
@@ -225,109 +225,6 @@ description = "Main cluster"
    </note>
 
   </sect2>
-
-  <sect2 id="cloning-from-barman-pg_backupapi-mode" xreflabel="Using Barman through its API (pg-backup-api)">
-    <title>Using Barman through its API (pg-backup-api)</title>
-    <indexterm>
-      <primary>cloning</primary>
-      <secondary>pg-backup-api</secondary>
-    </indexterm>
-
-    <para>
-      You can find information on how to install and setup pg-backup-api in
-      <ulink url="https://www.enterprisedb.com/docs/supported-open-source/barman/pg-backup-api/">the pg-backup-api
-      documentation</ulink>.
-    </para>
-
-    <para>
-      This mode (`pg-backupapi`) was introduced in v5.4.0 as a way to further integrate with Barman letting Barman
-      handle the restore. This also reduces the ssh keys that need to share between the backup and postgres nodes.
-      As long as you have access to the API service by HTTP calls, you could perform recoveries right away.
-      You just need to instruct Barman through the API which backup you need and on which node the backup needs to
-      to be restored on.
-    </para>
-
-    <para>
-      In order to enable <literal>pg_backupapi mode</literal> support for <command>repmgr standby clone</command>,
-      you need the following lines in repmgr.conf:
-      <itemizedlist spacing="compact" mark="bullet">
-        <listitem><para>pg_backupapi_host: Where pg-backup-api is hosted</para></listitem>
-        <listitem><para>pg_backupapi_node_name: Name of the server as understood by Barman</para></listitem>
-        <listitem><para>pg_backupapi_remote_ssh_command: How Barman will be connecting as to the node</para></listitem>
-        <listitem><para>pg_backupapi_backup_id: ID of the existing backup you need to restore</para></listitem>
-      </itemizedlist>
-
-      This is an example of how repmgr.conf would look like:
-
-      <programlisting>
-        pg_backupapi_host = '192.168.122.154'
-        pg_backupapi_node_name = 'burrito'
-        pg_backupapi_remote_ssh_command = 'ssh john_doe@192.168.122.1'
-        pg_backupapi_backup_id = '20230223T093201'
-      </programlisting>
-    </para>
-
-    <para>
-      <literal>pg_backupapi_host</literal> is the variable name that enables this mode, and when you set it,
-      all the rest of the above variables are required. Also, remember that this service is just an interface
-      between Barman and repmgr, hence if something fails during a recovery, you should check Barman's logs upon
-      why the process couldn't finish properly.
-    </para>
-
-    <note>
-      <simpara>
-        Despite in Barman you can define shortcuts like "lastest" or "oldest", they are not supported for the
-        time being in pg-backup-api. These shortcuts will be supported in a future release.
-      </simpara>
-     </note>
-
-    <para>
-      This is a real example of repmgr's output cloning with the API. Note that during this operation, we stopped
-      the service for a little while and repmgr had to retry but that doesn't affect the final outcome. The primary
-      is listening on localhost's port 6001:
-
-      <programlisting>
-$ repmgr -f ~/nodes/node_3/repmgr.conf standby clone -U repmgr -p 6001 -h localhost
-NOTICE: destination directory "/home/mario/nodes/node_3/data" provided
-INFO: Attempting to use `pg_backupapi` new restore mode
-INFO: connecting to source node
-DETAIL: connection string is: user=repmgr port=6001 host=localhost
-DETAIL: current installation size is 8541 MB
-DEBUG: 1 node records returned by source node
-DEBUG: connecting to: "user=repmgr dbname=repmgr host=localhost port=6001 connect_timeout=2 fallback_application_name=repmgr options=-csearch_path="
-DEBUG: upstream_node_id determined as 1
-INFO: Attempting to use `pg_backupapi` new restore mode
-INFO: replication slot usage not requested;  no replication slot will be set up for this standby
-NOTICE: starting backup (using pg_backupapi)...
-INFO: Success creating the task: operation id '20230309T150647'
-INFO: status IN_PROGRESS
-INFO: status IN_PROGRESS
-Incorrect reply received for that operation ID.
-INFO: Retrying...
-INFO: status IN_PROGRESS
-INFO: status IN_PROGRESS
-INFO: status IN_PROGRESS
-INFO: status IN_PROGRESS
-INFO: status IN_PROGRESS
-INFO: status IN_PROGRESS
-INFO: status IN_PROGRESS
-INFO: status IN_PROGRESS
-INFO: status IN_PROGRESS
-INFO: status IN_PROGRESS
-INFO: status IN_PROGRESS
-INFO: status IN_PROGRESS
-INFO: status IN_PROGRESS
-INFO: status IN_PROGRESS
-INFO: status IN_PROGRESS
-INFO: status DONE
-NOTICE: standby clone (from pg_backupapi) complete
-NOTICE: you can now start your PostgreSQL server
-HINT: for example: pg_ctl -D /home/mario/nodes/node_3/data start
-HINT: after starting the server, you need to register this standby with "repmgr standby register"
-      </programlisting>
-
-    </para>
-  </sect2> <!--END cloning-from-barman-pg_backupapi-mode !-->
  </sect1>
 
  <sect1 id="cloning-replication-slots" xreflabel="Cloning and replication slots">
@@ -402,7 +299,7 @@ HINT: after starting the server, you need to register this standby with "repmgr
      build up indefinitely, possibly leading to server failure.
     </simpara>
     <simpara>
-     As an alternative we recommend using EDB's <ulink url="https://www.pgbarman.org/">Barman</ulink>,
+     As an alternative we recommend using 2ndQuadrant'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.
@@ -431,9 +328,9 @@ HINT: after starting the server, you need to register this standby with "repmgr
     &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 a replication configuration file to point to it. Note
+    &repmgr; will create <filename>recovery.conf</filename> to point to it. Note
     that if <literal>--upstream-node-id</literal> is not explicitly provided,
-    &repmgr; will set the standby's replication configuration to
+    &repmgr; will set the standby's <filename>recovery.conf</filename> to
     point to the primary node.
    </para>
    <para>
@@ -495,7 +392,7 @@ HINT: after starting the server, you need to register this standby with "repmgr
      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 explicitly set the upstream's <varname>primary_conninfo</varname> string
-     in the replication configuration.
+     in <filename>recovery.conf</filename>.
     </simpara>
    </tip>
  </sect1>
@@ -594,12 +491,12 @@ HINT: after starting the server, you need to register this standby with "repmgr
     </note>
 
     <para>
-     If, for whatever reason, you wish to include the password in the replication configuration file,
+     If, for whatever reason, you wish to include the password in <filename>recovery.conf</filename>,
      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 the replication configuration. Note that <varname>PGPASSWORD</varname>
+     string in <filename>recovery.conf</filename>. Note that <varname>PGPASSWORD</varname>
-     will need to be set during any action which causes the replication configuration file to be
+     will need to be set during any action which causes <filename>recovery.conf</filename> to be
      rewritten, e.g. <xref linkend="repmgr-standby-follow"/>.
     </para>
    </sect2>
@@ -611,7 +508,7 @@ HINT: after starting the server, you need to register this standby with "repmgr
      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 the replication configuration. This
+     replication connections and generating <filename>recovery.conf</filename>. 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"/>.

doc/configuration-file-optional-settings.xml

@@ -10,8 +10,8 @@
   <note>
     <simpara>
       This section documents a subset of optional configuration settings; for a full
-      and annotated view of all configuration options see the
+      for a full and annotated view of all configuration options see the
-      <ulink url="https://raw.githubusercontent.com/EnterpriseDB/repmgr/master/repmgr.conf.sample">sample repmgr.conf file</ulink>
+      see the <ulink url="https://raw.githubusercontent.com/EnterpriseDB/repmgr/master/repmgr.conf.sample">sample repmgr.conf file</ulink>
     </simpara>
   </note>
 

doc/configuration-file.xml

@@ -164,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/EnterpriseDB/repmgr/master/repmgr.conf.sample">repmgr.conf.sample</ulink>.
+      <ulink url="https://raw.githubusercontent.com/2ndQuadrant/repmgr/master/repmgr.conf.sample">repmgr.conf.sample</ulink>.
     </para>
     <para>
       For &repmgrd;-specific settings, see <xref linkend="repmgrd-configuration"/>.
@@ -262,7 +262,7 @@ conninfo='host=node1 user=repmgr dbname=repmgr connect_timeout=2'</programlistin
 
     <indexterm>
       <primary>repmgr.conf</primary>
-      <secondary>PostgreSQL major version upgrades</secondary>
+      <secondary>ostgreSQL major version upgrades</secondary>
     </indexterm>
 
     <para>

doc/configuration-permissions.xml

@@ -7,194 +7,19 @@
   </indexterm>
 
   <para>
-    If the &repmgr; database user (the PostgreSQL user defined in the
+    &repmgr; requires that the database defined in the <varname>conninfo</varname>
-    <varname>conninfo</varname> setting is a superuser, no further user permissions need
+    setting contains the <literal>repmgr</literal> extension. The database user defined in the
-    to be granted.
+    <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>
 
-  <sect2 id="configuration-permissions-no-superuser" xreflabel="Non-super user permissions">
+  <para>
-    <title>repmgr user as a non-superuser</title>
+    Alternatively, the extension can be created manually by a superuser
-    <para>
+    (with &quot;<command>CREATE EXTENSION repmgr</command>&quot;) before executing
-      In principle the &repmgr; database user does not need to be a superuser.
+    <link linkend="repmgr-primary-register">repmgr primary register</link>.
-      In this case the &repmgr; will need to be granted execution permissions on certain
+  </para>
-      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>
-        PostgreSQL 15 introduced the <varname>pg_checkpoint</varname> predefined role which allows a 
-        non-superuser &repmgr; database user to perform a CHECKPOINT command.
-      </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.
-              From PostgreSQL 15 the <varname>pg_checkpoint</varname> predefined role removes the need of
-              superuser permissions to perform <command>CHECKPOINT</command> command.
-            </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>. Until PostgreSQL 14 <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.
-              From PostgreSQL 15 a specific ALTER SYSTEM privilege can be granted with e.g.
-              <command>GRANT ALTER SYSTEM ON PARAMETER wal_retrieve_retry_interval TO repmgr</command>.
-            </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/event-notifications.xml

@@ -95,8 +95,7 @@
  </para>
 
  <para>
-   The following parameters are provided for a subset of event notifications; their meaning may
+   The following parameters are provided for a subset of event notifications:
-   change according to context:
  </para>
 
  <variablelist>
@@ -109,9 +108,6 @@
     <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>
@@ -137,7 +133,7 @@
 
  <para>
   The values provided for <literal>%c</literal> and <literal>%a</literal>
-  may contain spaces, so should always be quoted.
+  will probably contain spaces, so should always be quoted.
  </para>
 
  <para>

doc/install-packages.xml

@@ -22,15 +22,16 @@
 
   <para>
 	&repmgr; RPM packages for RedHat/CentOS variants and Fedora are available from the
-	<ulink url="https://www.enterprisedb.com">EDB</ulink>
+	<ulink url="https://2ndquadrant.com">2ndQuadrant</ulink>
-	<ulink url="https://dl.enterprisedb.com/">public repository</ulink>; see following
+	<ulink url="https://dl.2ndquadrant.com/">public repository</ulink>; see following
 	section for details.
   </para>
   <note>
     <para>
-      Currently the <ulink url="https://www.enterprisedb.com">EDB</ulink>
+      Currently the <ulink url="https://2ndquadrant.com">2ndQuadrant</ulink>
-	  <ulink url="https://dl.enterprisedb.com/">public repository</ulink> provides
+	  <ulink url="https://dl.2ndquadrant.com/">public repository</ulink> provides
-      support for RedHat/CentOS versions 6,7 and 8.
+      support for RedHat/CentOS versions 5, 6 and 7. Support for version 8 is
+      available via the PGDG repository; see below for details.
     </para>
   </note>
   <para>
@@ -44,7 +45,7 @@
   <note>
     <para>
       &repmgr; RPM packages are designed to be compatible with the community-provided PostgreSQL packages
-      and EDB's PostgreSQL Extended Server (formerly 2ndQPostgres).
+      and 2ndQuadrant's <ulink url="https://www.2ndquadrant.com/en/resources/2ndqpostgres/">2ndQPostgres</ulink>.
       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.
@@ -63,16 +64,16 @@
 
 
   <sect3 id="installation-packages-redhat-2ndq">
-    <title>EDB public RPM yum repository</title>
+    <title>2ndQuadrant public RPM yum repository</title>
 
     <para>
-      <ulink url="https://www.enterprisedb.com/">EDB</ulink> provides a dedicated <literal>yum</literal>
+      <ulink url="https://2ndquadrant.com/">2ndQuadrant</ulink> provides a dedicated <literal>yum</literal>
-      <ulink url="https://dl.enterprisedb.com/">public repository</ulink> for EDB software,
+      <ulink url="https://dl.2ndquadrant.com/">public repository</ulink> for 2ndQuadrant 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.enterprisedb.com/">homepage</ulink>. Specific instructions
+      <ulink url="https://dl.2ndquadrant.com/">homepage</ulink>. Specific instructions
       for installing &repmgr; follow below.
     </para>
     <para>
@@ -82,46 +83,57 @@
 	<listitem>
 	  <para>
 	    Locate the repository RPM for your PostgreSQL version from the list at:
-	    <ulink url="https://dl.enterprisedb.com/">https://dl.enterprisedb.com/</ulink>
+	    <ulink url="https://dl.2ndquadrant.com/">https://dl.2ndquadrant.com/</ulink>
-	  </para>
-	</listitem>
-
-    <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 14 on Rocky Linux 8, execute:
-	    <programlisting>
-curl https://dl.enterprisedb.com/default/release/get/14/rpm | sudo bash</programlisting>
-	  </para>
-
-	  <para>
-	    Verify that the repository is installed with:
-	    <programlisting>
-sudo dnf repolist</programlisting>
-	    The output should contain two entries like this:
-	    <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>repmgr14</literal>):
+            Install the repository definition for your distribution and PostgreSQL version
+	    (this enables the 2ndQuadrant repository as a source of &repmgr; packages).
+	  </para>
+	  <para>
+	    For example, for PostgreSQL 11 on CentOS, execute:
+	    <programlisting>
+curl https://dl.2ndquadrant.com/default/release/get/11/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>
+	    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>
+	  </para>
+	</listitem>
+
+        <listitem>
+          <para>
+            Install the &repmgr; version appropriate for your PostgreSQL version (e.g. <literal>repmgr10</literal>):
             <programlisting>
-sudo dnf install repmgr14</programlisting>
+sudo yum install repmgr11</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>
-dnf search repmgr</programlisting>
+yum search repmgr</programlisting>
-            </para>
-            <para>
-              In CentOS 7 and earlier, use <literal>yum</literal> instead of <literal>dnf</literal>.
             </para>
           </tip>
 
@@ -133,7 +145,7 @@ dnf search repmgr</programlisting>
       <emphasis>Compatibility with PGDG Repositories</emphasis>
     </para>
     <para>
-      The EDB &repmgr; yum repository packages use the same definitions and file system layout as the
+      The 2ndQuadrant &repmgr; yum repository packages use the same definitions and file system layout as the
       main PGDG repository.
     </para>
     <para>
@@ -142,42 +154,36 @@ dnf search repmgr</programlisting>
       the packages are installed from.
     </para>
     <para>
-      To ensure the EDB repository is always prioritised, set the <literal>priority</literal> option
+      To ensure the 2ndQuadrant repository is always prioritised, install <literal>yum-plugin-priorities</literal>
-      in the repository configuration file (e.g. <filename>/etc/yum.repos.d/2ndquadrant-dl-default-release-pg14.repo</filename>
+      and set the repository priorities accordingly.
-      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>dnf --showduplicates list</command>
+      To install a specific package version, execute <command>yum --showduplicates list</command>
       for the package in question:
       <programlisting>
-[root@localhost ~]# dnf --showduplicates list repmgr10
+[root@localhost ~]# yum --showduplicates list repmgr11
-Last metadata expiration check: 0:09:15 ago on Fri 11 Mar 2022 01:09:19 AM UTC.
+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
 Installed Packages
-repmgr10.x86_64                            5.3.1-1.el8                              @2ndquadrant-dl-default-release-pg10
+repmgr11.x86_64                        4.4.0-1.rhel7                         @pgdg11
 Available Packages
-repmgr10.x86_64                            5.0.0-1.rhel8                            pgdg10
+repmgr11.x86_64                        4.2-1.el7                             2ndquadrant-dl-default-release-pg11
-repmgr10.x86_64                            5.1.0-1.el8                              2ndquadrant-dl-default-release-pg10
+repmgr11.x86_64                        4.2-2.el7                             2ndquadrant-dl-default-release-pg11
-repmgr10.x86_64                            5.1.0-1.rhel8                            pgdg10
+repmgr11.x86_64                        4.3-1.el7                             2ndquadrant-dl-default-release-pg11
-repmgr10.x86_64                            5.1.0-2.el8                              2ndquadrant-dl-default-release-pg10
+repmgr11.x86_64                        4.4-1.el7                             2ndquadrant-dl-default-release-pg11</programlisting>
-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 ~]# dnf install repmgr10-5.3.0-1.el8</programlisting>
+[root@localhost ~]# yum install repmgr11-4.3-1.el7</programlisting>
     </para>
+
     <para>
       <emphasis>Installing old packages</emphasis>
     </para>
@@ -185,6 +191,7 @@ repmgr10.x86_64                            5.3.1-1.el8
       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>
@@ -210,16 +217,16 @@ repmgr10.x86_64                            5.3.1-1.el8
   </para>
 
   <sect3 id="installation-packages-debian-ubuntu-2ndq">
-    <title>EDB public apt repository for Debian/Ubuntu</title>
+    <title>2ndQuadrant public apt repository for Debian/Ubuntu</title>
 
     <para>
-      <ulink url="https://www.enterprisedb.com/">EDB</ulink> provides a
+      <ulink url="https://2ndquadrant.com/">2ndQuadrant</ulink> provides a
-      <ulink url="https://dl.enterprisedb.com/">public apt repository</ulink> for EDB software,
+      <ulink url="https://dl.2ndquadrant.com/">public apt repository</ulink> for 2ndQuadrant software,
       including &repmgr;.
     </para>
     <para>
       General instructions for using this repository can be found on its
-      <ulink url="https://dl.enterprisedb.com/">homepage</ulink>. Specific instructions
+      <ulink url="https://dl.2ndquadrant.com/">homepage</ulink>. Specific instructions
       for installing &repmgr; follow below.
     </para>
 
@@ -232,9 +239,9 @@ repmgr10.x86_64                            5.3.1-1.el8
 	    <listitem>
 	      <para>
             Install the repository definition for your distribution and PostgreSQL version
-	        (this enables the EDB repository as a source of &repmgr; packages) by executing:
+	        (this enables the 2ndQuadrant repository as a source of &repmgr; packages) by executing:
             <programlisting>
-              curl https://dl.enterprisedb.com/default/release/get/deb | sudo bash</programlisting>
+              curl https://dl.2ndquadrant.com/default/release/get/deb | sudo bash</programlisting>
 	      </para>
           <note>
             <para>

doc/install-requirements.xml

@@ -108,34 +108,14 @@
             <entry>
               Supported PostgreSQL versions
             </entry>
-            <entry>
-              Notes
-            </entry>
           </row>
         </thead>
 
         <tbody>
-          <row>
-            <entry>
-              &repmgr; 5.4
-            </entry>
-            <entry>
-              (dev)
-            </entry>
-            <entry>
-              <link linkend="release-current">&repmgrversion;</link> (&releasedate;)
-            </entry>
-            <entry>
-              9.4, 9.5, 9.6, 10, 11, 12, 13, 15
-            </entry>
-            <entry>
-              &nbsp;
-            </entry>
-          </row>
 
           <row>
             <entry>
-              &repmgr; 5.3
+              &repmgr; 5.2
             </entry>
             <entry>
               YES
@@ -143,30 +123,9 @@
             <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>
@@ -182,9 +141,6 @@
             <entry>
               9.3, 9.4, 9.5, 9.6, 10, 11, 12
             </entry>
-            <entry>
-              &nbsp;
-            </entry>
           </row>
 
           <row>
@@ -200,9 +156,6 @@
             <entry>
               9.3, 9.4, 9.5, 9.6, 10, 11, 12
             </entry>
-            <entry>
-              &nbsp;
-            </entry>
           </row>
 
 
@@ -219,9 +172,6 @@
             <entry>
               9.3, 9.4, 9.5, 9.6, 10, 11
             </entry>
-            <entry>
-              &nbsp;
-            </entry>
           </row>
 
           <row>
@@ -237,9 +187,6 @@
             <entry>
               9.3, 9.4, 9.5, 9.6
             </entry>
-            <entry>
-              &nbsp;
-            </entry>
           </row>
 
           <row>
@@ -255,9 +202,6 @@
             <entry>
               9.0, 9.1, 9.2, 9.3, 9.4
             </entry>
-            <entry>
-              &nbsp;
-            </entry>
           </row>
         </tbody>
 

doc/legal.xml

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

doc/quickstart.xml

@@ -405,10 +405,9 @@
   </programlisting>
   <para>
    This has cloned the PostgreSQL data directory files from the primary <literal>node1</literal>
-   using PostgreSQL's <command>pg_basebackup</command> utility. Replication configuration
+   using PostgreSQL's <command>pg_basebackup</command> utility. A <filename>recovery.conf</filename>
-   containing the correct parameters to start streaming from this primary server will be
+   file containing the correct parameters to start streaming from this primary server will be created
-   automatically appended to <filename>postgresql.auto.conf</filename>. (In PostgreSQL 11
+   automatically.
-   and earlier the file <filename>recovery.conf</filename> will be created).
   </para>
   <note>
    <simpara>
@@ -482,10 +481,9 @@
     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>postgresql.auto.conf</filename>
+   Note that the <varname>conninfo</varname> value is that generated in <filename>recovery.conf</filename>
-   (PostgreSQL 11 and earlier: <filename>recovery.conf</filename>) and will differ slightly from the primary's
+   and will differ slightly from the primary's <varname>conninfo</varname> as set in <filename>repmgr.conf</filename> -
-   <varname>conninfo</varname> as set in <filename>repmgr.conf</filename> - among others it will contain the
+   among others it will contain the connecting node's name as <varname>application_name</varname>.
-   connecting node's name as <varname>application_name</varname>.
   </para>
  </sect1>
 

doc/repmgr-node-check.xml

@@ -125,29 +125,12 @@
         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>

doc/repmgr-node-rejoin.xml

@@ -73,16 +73,16 @@
       </varlistentry>
 
       <varlistentry>
-        <term><option>--force-rewind</option></term>
+        <term><option>--force-rewind[=/path/to/pg_rewind]</option></term>
         <listitem>
           <para>
             Execute <application>pg_rewind</application>.
           </para>
           <para>
-            See <xref linkend="repmgr-node-rejoin-pg-rewind"/> for more details on using
+            It is only necessary to provide the <application>pg_rewind</application> path
-            <application>pg_rewind</application>.
+            if using PostgreSQL 9.4, and <application>pg_rewind</application>
+            is not installed in the PostgreSQL <filename>bin</filename> directory.
           </para>
-
         </listitem>
       </varlistentry>
 
@@ -261,6 +261,8 @@
     <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.4.
     </para>
     <note>
       <para>
@@ -269,10 +271,6 @@
         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>
@@ -384,29 +382,6 @@
     DETAIL: node 2 is now attached to node 3</programlisting>
       </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">
@@ -451,7 +426,7 @@
 
    <warning>
      <para>
-       In all PostgreSQL released before February 2021, <application>pg_rewind</application>
+       In all current PostgreSQL versions (as of September 2020), <application>pg_rewind</application>
        contains a corner-case bug which affects standbys in a very specific situation.
      </para>
      <para>
@@ -481,7 +456,8 @@
      <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.
+       has been successfully submitted and will be included the next PostgreSQL minor release round, scheduled for
+       February 2021.
      </para>
      <para>
        As a workaround, start the primary server the standby was previously attached to,
@@ -499,7 +475,7 @@
   <refsect1>
     <title>See also</title>
     <para>
-     <xref linkend="repmgr-standby-follow"/>, <xref linkend="repmgr-standby-switchover"/>
+     <xref linkend="repmgr-standby-follow"/>
     </para>
   </refsect1>
 </refentry>

doc/repmgr-node-service.xml

@@ -77,8 +77,7 @@
           </para>
           <para>
             Note that a superuser connection is required to be able to execute the
-            <command>CHECKPOINT</command> command. From PostgreSQL 15 the <varname>pg_checkpoint</varname>
+             <command>CHECKPOINT</command> command.
-            predefined role removes the need for superuser permissions to perform <command>CHECKPOINT</command> command.
           </para>
         </listitem>
      </varlistentry>

doc/repmgr-standby-clone.xml

@@ -332,12 +332,6 @@ pg_basebackup_options='--waldir=/path/to/wal-directory'</programlisting>
             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>
 
@@ -405,15 +399,11 @@ pg_basebackup_options='--waldir=/path/to/wal-directory'</programlisting>
       </varlistentry>
 
       <varlistentry>
-        <term><option>-S</option>/<option>--superuser</option></term>
+        <term><option>--superuser</option></term>
         <listitem>
           <para>
-            The name of a valid PostgreSQL superuser can  be provided with this option.
+            If the &repmgr; user is not a superuser, the name of a valid superuser must
-          </para>
+            be provided with this option.
-          <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>

doc/repmgr-standby-switchover.xml

@@ -64,13 +64,6 @@
 
   <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
@@ -79,8 +72,7 @@
     <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. From PostgreSQL 15 the <varname>pg_checkpoint</varname>
+      provided with the <option>-S</option>/<option>--superuser</option>.
-      predefined role removes the need for superuser permissions to perform <command>CHECKPOINT</command> command.
     </para>
     <para>
       If &repmgr; is unable to execute the <command>CHECKPOINT</command> command, the switchover
@@ -155,12 +147,9 @@
           <para>
             Use <application>pg_rewind</application> to reintegrate the old primary if necessary
             (and the prerequisites for using <application>pg_rewind</application> are met).
-          </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>

doc/repmgr.xml

@@ -18,7 +18,7 @@
  <title>repmgr &repmgrversion; Documentation</title>
 
  <bookinfo>
-  <corpauthor>EDB</corpauthor>
+  <corpauthor>EnterpriseDB Corporation</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.4 - PostgreSQL 15.
+   use with PostgreSQL 9.4 - PostgreSQL 13.
    </para>
    <para>
      &repmgr; is being continually developed and we strongly recommend using the
@@ -38,18 +38,19 @@
 
    <para>
     &repmgr; is developed by
-    <ulink url="https://www.enterprisedb.com/">EDB</ulink>
+    <ulink url="https://2ndquadrant.com">2ndQuadrant (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/EnterpriseDB/repmgr">github</ulink>
     or <ulink url="https://groups.google.com/group/repmgr">the mailing list/forum</ulink>.
-    Multiple EDB customers contribute funding to make &repmgr; development possible.
+    Multiple 2ndQuadrant (EDB) customers contribute funding
+    to make repmgr development possible.
    </para>
 
    <para>
-     &repmgr; is fully supported by EDB's
+     &repmgr; is fully supported by 2ndQuadrant (EDB)'s
-     <ulink url="https://www.enterprisedb.com/support/postgresql-support-overview-get-the-most-out-of-postgresql">24/7 Production Support</ulink>.
+     <ulink url="https://www.2ndquadrant.com/en/support/support-postgresql/">24/7 Production Support</ulink>.
-     EDB, a Major Sponsor of the PostgreSQL project, continues to maintain &repmgr;.
+     EnterpriseDB Corporation, a Major Sponsor of the PostgreSQL project, continues to maintain &repmgr;.
      We welcome participation from other organisations and individual developers.
    </para>
   </abstract>

doc/repmgrd-automatic-failover.xml

@@ -81,15 +81,11 @@
  </para>
  <note>
    <simpara>
-     A PostgreSQL instance can only accommodate a single witness server.
+     &repmgr; 3.3 and earlier provided a <command>repmgr create witness</command>
-   </simpara>
+     command, which would automatically create a PostgreSQL instance. However
-   <simpara>
+     this often resulted in an unsatisfactory, hard-to-customise instance.
-     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"/>.
@@ -279,9 +275,7 @@
   <note>
     <para>
       <option>standby_disconnect_on_failover</option> is available with PostgreSQL 9.5 and later.
-      Until PostgreSQL 14 this requires that the <literal>repmgr</literal> database user is a superuser.
+      Additionally this requires that the <literal>repmgr</literal> database user is a superuser.
-      From PostgreSQL 15 a specific ALTER SYSTEM privilege can be granted to the <literal>repmgr</literal> database
-      user with e.g. <command>GRANT ALTER SYSTEM ON PARAMETER wal_retrieve_retry_interval TO repmgr</command>.
     </para>
   </note>
   <para>

doc/repmgrd-configuration.xml

@@ -345,18 +345,14 @@
             </indexterm>
 
             <para>
-              Indicates a preferred priority (default: <literal>100</literal>) for promoting nodes.
+              Indicates a preferred priority (default: <literal>100</literal>) for promoting nodes;
+			  a value of zero prevents the node being promoted to primary.
             </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>
 
@@ -489,32 +485,6 @@
           </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>
@@ -1083,29 +1053,6 @@ 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-overview.xml

@@ -29,7 +29,7 @@
 
        <listitem>
          <simpara>
-           option to execute custom scripts (&quot;<link linkend="event-notifications">event notifications</link>&quot;)
+           option to execute custom scripts (&quot;<link linkend="event-notifications">event notifications</link>
            at different points in the failover sequence
          </simpara>
        </listitem>

doc/switchover.xml

@@ -242,12 +242,21 @@
       </simpara>
     </note>
     <para>
-      For more details on <application>pg_rewind</application>, see section <xref linkend="repmgr-node-rejoin-pg-rewind"/>
+      For more details on <application>pg_rewind</application>, see:
-      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 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>
   </sect2>
 
 

doc/upgrading-repmgr.xml

@@ -71,12 +71,6 @@
 	  <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:
 
@@ -111,17 +105,15 @@
 	</para>
 
 	<para>
-	  A PostgreSQL restart is usually <emphasis>not</emphasis> required for minor version upgrades
+	  A PostgreSQL restart is <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>5.3</literal>) must be
+	    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
+	    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>)
+	    &repmgr; &quot;minor versions&quot; (e.g. <literal>4.2.1</literal>)  on different nodes,
-		on different nodes, we strongly recommend updating all nodes to the latest minor version.
+	    we strongly recommend updating all nodes to the latest minor version.
 	  </para>
     </note>
 

errcode.h

@@ -49,6 +49,5 @@
 #define ERR_NODE_STATUS 25
 #define ERR_REPMGRD_PAUSE 26
 #define ERR_REPMGRD_SERVICE 27
-#define ERR_PGBACKUPAPI_SERVICE 28
 
 #endif							/* _ERRCODE_H_ */

pgbackupapi.c

@@ -1,147 +0,0 @@
-/*
- * pgbackupapi.c
- * 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 <string.h>
-
-#include <curl/curl.h>
-#include <json-c/json.h>
-
-#include "repmgr.h"
-#include "pgbackupapi.h"
-
-
-size_t receive_operations_cb(void *content, size_t size, size_t nmemb, char *buffer) {
-	short int max_chars_to_copy = MAX_BUFFER_LENGTH -2;
-	short int i = 0;
-	int operation_length = 0;
-	json_object *value;
-
-	json_object *root = json_tokener_parse(content);
-	json_object *operations = json_object_object_get(root, "operations");
-
-	operation_length = strlen(json_object_get_string(operations));
-	if (operation_length < max_chars_to_copy) {
-		max_chars_to_copy = operation_length;
-	}
-
-	strncpy(buffer, json_object_get_string(operations), max_chars_to_copy);
-
-	fprintf(stdout, "Success! The following operations were found\n");
-	for (i=0; i<json_object_array_length(operations); i++) {
-		value = json_object_array_get_idx(operations, i);
-		printf("%s\n", json_object_get_string(value));
-	}
-	return size * nmemb;
-}
-
-char * define_base_url(operation_task *task) {
-	char *format = "http://%s:7480/servers/%s/operations";
-	char *url = malloc(MAX_BUFFER_LENGTH);
-
-	snprintf(url, MAX_BUFFER_LENGTH-1, format, task->host, task->node_name);
-
-	//`url` is freed on the function that called this
-	return url;
-}
-
-CURLcode get_operations_on_server(CURL *curl, operation_task *task) {
-	char buffer[MAX_BUFFER_LENGTH];
-	char *url = define_base_url(task);
-	CURLcode ret;
-
-	curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, receive_operations_cb);
-	curl_easy_setopt(curl, CURLOPT_WRITEDATA, &buffer);
-	curl_easy_setopt(curl, CURLOPT_URL, url);
-
-	ret = curl_easy_perform(curl);
-	free(url);
-
-	return ret;
-}
-
-size_t receive_operation_id(void *content, size_t size, size_t nmemb, char *buffer) {
-	json_object *root = json_tokener_parse(content);
-	json_object *operation = json_object_object_get(root, "operation_id");
-
-	if (operation != NULL) {
-		strncpy(buffer, json_object_get_string(operation), MAX_BUFFER_LENGTH-2);
-	}
-
-	return size * nmemb;
-}
-
-
-CURLcode create_new_task(CURL *curl, operation_task *task) {
-	PQExpBufferData payload;
-	char *url = define_base_url(task);
-	CURLcode ret;
-	json_object *root = json_object_new_object();
-	struct curl_slist *chunk = NULL;
-
-	json_object_object_add(root, "operation_type", json_object_new_string(task->operation_type));
-	json_object_object_add(root, "backup_id", json_object_new_string(task->backup_id));
-	json_object_object_add(root, "remote_ssh_command", json_object_new_string(task->remote_ssh_command));
-	json_object_object_add(root, "destination_directory", json_object_new_string(task->destination_directory));
-
-	initPQExpBuffer(&payload);
-	appendPQExpBufferStr(&payload, json_object_to_json_string(root));
-
-	chunk = curl_slist_append(chunk, "Content-type: application/json");
-	curl_easy_setopt(curl, CURLOPT_HTTPHEADER, chunk);
-	curl_easy_setopt(curl, CURLOPT_URL, url);
-	curl_easy_setopt(curl, CURLOPT_POSTFIELDS, payload.data);
-	curl_easy_setopt(curl, CURLOPT_FAILONERROR, 1L);
-	//curl_easy_setopt(curl, CURLOPT_VERBOSE, 1L);
-	curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, receive_operation_id);
-	curl_easy_setopt(curl, CURLOPT_WRITEDATA, task->operation_id);
-	ret = curl_easy_perform(curl);
-	free(url);
-	termPQExpBuffer(&payload);
-
-	return ret;
-}
-
-
-size_t receive_operation_status(void *content, size_t size, size_t nmemb, char *buffer) {
-	json_object *root = json_tokener_parse(content);
-	json_object *status = json_object_object_get(root, "status");
-	if (status != NULL) {
-		strncpy(buffer, json_object_get_string(status), MAX_BUFFER_LENGTH-2);
-	}
-	else {
-		fprintf(stderr, "Incorrect reply received for that operation ID.\n");
-		strcpy(buffer, "\0");
-	}
-	return size * nmemb;
-}
-
-CURLcode get_status_of_operation(CURL *curl, operation_task *task) {
-	CURLcode ret;
-	char *url = define_base_url(task);
-
-	strcat(url, "/");
-	strcat(url, task->operation_id);
-	curl_easy_setopt(curl, CURLOPT_URL, url);
-	curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, receive_operation_status);
-	curl_easy_setopt(curl, CURLOPT_WRITEDATA, task->operation_status);
-
-	ret = curl_easy_perform(curl);
-	free(url);
-
-	return ret;
-}

pgbackupapi.h

@@ -1,46 +0,0 @@
-/*
- * pgbackupapi.h
- * 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 <curl/curl.h>
-#include <json-c/json.h>
-
-typedef struct operation_task {
-        char *backup_id;
-        char *destination_directory;
-        char *operation_type;
-	char *operation_id;
-	char *operation_status;
-        char *remote_ssh_command;
-	char *host;
-	char *node_name;
-} operation_task;
-
-//Default simplebuffer size in most of operations
-#define MAX_BUFFER_LENGTH 72
-
-//Callbacks to send/receive data from pg-backup-api endpoints
-size_t receive_operations_cb(void *content, size_t size, size_t nmemb, char *buffer);
-size_t receive_operation_id(void *content, size_t size, size_t nmemb, char *buffer);
-size_t receive_operation_status(void *content, size_t size, size_t nmemb, char *buffer);
-
-//Functions that implement the logic and know what to do and how to comunnicate wuth the API
-CURLcode get_operations_on_server(CURL *curl, operation_task *task);
-CURLcode create_new_task(CURL *curl, operation_task *task);
-CURLcode get_status_of_operation(CURL *curl, operation_task *task);
-
-//Helper to make simpler to read the handler where we set the URL
-char * define_base_url(operation_task *task);

repmgr--4.2--4.3.sql

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

repmgr--5.2--5.3.sql

@@ -1,64 +0,0 @@
--- 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.3--5.4.sql

@@ -1,2 +0,0 @@
--- 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

@@ -1,192 +0,0 @@
--- 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

@@ -1,192 +0,0 @@
--- 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.3.sql

@@ -1,245 +0,0 @@
--- 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-node.c

@@ -35,7 +35,6 @@
 static bool copy_file(const char *src_file, const char *dest_file);
 static void format_archive_dir(PQExpBufferData *archive_dir);
 static t_server_action parse_server_action(const char *action);
-static const char *output_repmgrd_status(CheckStatus status);
 
 static void exit_optformat_error(const char *error, int errcode);
 
@@ -53,11 +52,9 @@ static CheckStatus do_node_check_role(PGconn *conn, OutputMode mode, t_node_info
 static CheckStatus do_node_check_slots(PGconn *conn, OutputMode mode, t_node_info *node_info, CheckStatusList *list_output);
 static CheckStatus do_node_check_missing_slots(PGconn *conn, OutputMode mode, t_node_info *node_info, CheckStatusList *list_output);
 static CheckStatus do_node_check_data_directory(PGconn *conn, OutputMode mode, t_node_info *node_info, CheckStatusList *list_output);
-static CheckStatus do_node_check_repmgrd(PGconn *conn, OutputMode mode, t_node_info *node_info, CheckStatusList *list_output);
 static CheckStatus do_node_check_replication_config_owner(PGconn *conn, OutputMode mode, t_node_info *node_info, CheckStatusList *list_output);
 static CheckStatus do_node_check_db_connection(PGconn *conn, OutputMode mode);
 
-
 /*
  * NODE STATUS
  *
@@ -944,16 +941,6 @@ do_node_check(void)
 		exit(return_code);
 	}
 
-	if (runtime_options.repmgrd == true)
-	{
-		return_code = do_node_check_repmgrd(conn,
-											runtime_options.output_mode,
-											&node_info,
-											NULL);
-		PQfinish(conn);
-		exit(return_code);
-	}
-
 	if (runtime_options.replication_config_owner == true)
 	{
 		return_code = do_node_check_replication_config_owner(conn,
@@ -1327,7 +1314,7 @@ do_node_check_downstream(PGconn *conn, OutputMode mode, t_node_info *node_info,
 			continue;
 		}
 
-		if (is_downstream_node_attached_quiet(conn, cell->node_info->node_name, NULL) != NODE_ATTACHED)
+		if (is_downstream_node_attached(conn, cell->node_info->node_name, NULL) != NODE_ATTACHED)
 		{
 			missing_nodes_count++;
 			item_list_append_format(&missing_nodes,
@@ -1395,32 +1382,49 @@ do_node_check_downstream(PGconn *conn, OutputMode mode, t_node_info *node_info,
 	{
 		case OM_NAGIOS:
 			{
+				printf("REPMGR_DOWNSTREAM_SERVERS %s: %s | ",
+					   output_check_status(status),
+					   details.data);
+
 				if (missing_nodes_count)
 				{
 					ItemListCell *missing_cell = NULL;
 					bool		first = true;
 
-					appendPQExpBufferStr(&details, " (missing: ");
+					printf("missing: ");
-
 					for (missing_cell = missing_nodes.head; missing_cell; missing_cell = missing_cell->next)
 					{
 						if (first == false)
-							appendPQExpBufferStr(&details, ", ");
+							printf(", ");
 						else
 							first = false;
 
 						if (first == false)
-							appendPQExpBufferStr(&details, missing_cell->string);
+							printf("%s", missing_cell->string);
 					}
-
-					appendPQExpBufferChar(&details, ')');
 				}
 
-				printf("REPMGR_DOWNSTREAM_SERVERS %s: %s | attached=%i, missing=%i\n",
+				if (expected_nodes_count - missing_nodes_count)
-					   output_check_status(status),
+				{
-					   details.data,
+					ItemListCell *attached_cell = NULL;
-					   expected_nodes_count - missing_nodes_count,
+					bool		first = true;
-					   missing_nodes_count);
+
+					if (missing_nodes_count)
+						printf("; ");
+					printf("attached: ");
+					for (attached_cell = attached_nodes.head; attached_cell; attached_cell = attached_cell->next)
+					{
+						if (first == false)
+							printf(", ");
+						else
+							first = false;
+
+						if (first == false)
+							printf("%s", attached_cell->string);
+					}
+				}
+				printf("\n");
+
 			}
 			break;
 		case OM_CSV:
@@ -1518,7 +1522,7 @@ do_node_check_upstream(PGconn *conn, OutputMode mode, t_node_info *node_info, Ch
 	{
 		case OM_NAGIOS:
 			{
-				printf("REPMGR_UPSTREAM_SERVER %s: %s\n",
+				printf("REPMGR_UPSTREAM_SERVER %s: %s | ",
 					   output_check_status(status),
 					   details.data);
 			}
@@ -2020,6 +2024,7 @@ do_node_check_missing_slots(PGconn *conn, OutputMode mode, t_node_info *node_inf
 	return status;
 }
 
+
 CheckStatus
 do_node_check_data_directory(PGconn *conn, OutputMode mode, t_node_info *node_info, CheckStatusList *list_output)
 {
@@ -2154,53 +2159,6 @@ do_node_check_data_directory(PGconn *conn, OutputMode mode, t_node_info *node_in
 	return status;
 }
 
-CheckStatus
-do_node_check_repmgrd(PGconn *conn, OutputMode mode, t_node_info *node_info, CheckStatusList *list_output)
-{
-	CheckStatus status = CHECK_STATUS_OK;
-
-	if (mode == OM_CSV && list_output == NULL)
-	{
-		log_error(_("--csv output not provided with --repmgrd option"));
-		PQfinish(conn);
-		exit(ERR_BAD_CONFIG);
-	}
-
-	status = get_repmgrd_status(conn);
-	switch (mode)
-	{
-		case OM_OPTFORMAT:
-			printf("--repmgrd=%s\n",
-				   output_check_status(status));
-			break;
-		case OM_NAGIOS:
-			printf("REPMGRD %s: %s\n",
-				   output_check_status(status),
-				   output_repmgrd_status(status));
-
-			break;
-		case OM_CSV:
-		case OM_TEXT:
-			if (list_output != NULL)
-			{
-				check_status_list_set(list_output,
-									  "repmgrd",
-									  status,
-									  output_repmgrd_status(status));
-			}
-			else
-			{
-				printf("%s (%s)\n",
-					   output_check_status(status),
-					   output_repmgrd_status(status));
-			}
-		default:
-			break;
-	}
-
-	return status;
-}
-
 /*
  * This is not included in the general list output
  */
@@ -2365,25 +2323,18 @@ do_node_service(void)
 			conn = establish_db_connection_by_params(&source_conninfo, true);
 		}
 
-		if (can_execute_checkpoint(conn) == false)
+		if (is_superuser_connection(conn, NULL) == false)
 		{
 			if (runtime_options.dry_run == true)
 			{
-				log_warning(_("a CHECKPOINT would be issued here but no authorized connection is available"));
+				log_warning(_("a CHECKPOINT would be issued here but no superuser connection is available"));
 			}
 			else
 			{
-				log_warning(_("an authorized connection is required to issue a CHECKPOINT"));
+				log_warning(_("a superuser connection is required to issue a CHECKPOINT"));
 			}
 
-			if (PQserverVersion(conn) >= 150000)
+			log_hint(_("provide a superuser with -S/--superuser"));
-			{
-				log_hint(_("provide a superuser with -S/--superuser or grant pg_checkpoint role to repmgr user"));
-			}
-			else
-			{
-				log_hint(_("provide a superuser with -S/--superuser"));
-			}
 		}
 		else
 		{
@@ -2869,8 +2820,7 @@ do_node_rejoin(void)
 				log_notice(_("temporarily removing \"standby.signal\""));
 				log_detail(_("this is required so pg_rewind can fix the unclean shutdown"));
 
-				make_standby_signal_path(config_file_options.data_directory,
+				make_standby_signal_path(standby_signal_file_path);
-										 standby_signal_file_path);
 
 				if (unlink(standby_signal_file_path) < 0 && errno != ENOENT)
 				{
@@ -2895,7 +2845,7 @@ do_node_rejoin(void)
 				 * of whether the pg_rewind operation failed.
 				 */
 				log_notice(_("recreating \"standby.signal\""));
-				write_standby_signal(config_file_options.data_directory);
+				write_standby_signal();
 			}
 
 			if (ret == false)
@@ -3619,25 +3569,6 @@ copy_file(const char *src_file, const char *dest_file)
 }
 
 
-static const char *
-output_repmgrd_status(CheckStatus status)
-{
-	switch (status)
-	{
-		case CHECK_STATUS_OK:
-			return "repmgrd running";
-		case CHECK_STATUS_WARNING:
-			return "repmgrd running but paused";
-		case CHECK_STATUS_CRITICAL:
-			return "repmgrd not running";
-		case CHECK_STATUS_UNKNOWN:
-			return "repmgrd status unknown";
-	}
-
-	return "UNKNOWN";
-}
-
-
 void
 do_node_help(void)
 {
@@ -3680,7 +3611,6 @@ do_node_help(void)
 	printf(_("    --role                    check node has expected role\n"));
 	printf(_("    --slots                   check for inactive replication slots\n"));
 	printf(_("    --missing-slots           check for missing replication slots\n"));
-	printf(_("    --repmgrd                 check if repmgrd is running\n"));
 	printf(_("    --data-directory-config   check repmgr's data directory configuration\n"));
 
 	puts("");

repmgr-action-standby.c

@@ -20,8 +20,6 @@
  */
 
 #include <sys/stat.h>
-#include <time.h>
-#include <unistd.h>
 
 #include "repmgr.h"
 #include "dirutil.h"
@@ -30,7 +28,7 @@
 
 #include "repmgr-client-global.h"
 #include "repmgr-action-standby.h"
-#include "pgbackupapi.h"
+
 
 typedef struct TablespaceDataListCell
 {
@@ -96,8 +94,6 @@ static char barman_command_buf[MAXLEN] = "";
  * be run and which of the available users, which will be one
  * of the repmgr user, the replication user (if available) or
  * the superuser (if available).
- *
- * This is determined in check_source_server().
  */
 static t_user_type SettingsUser = REPMGR_USER;
 
@@ -114,7 +110,6 @@ static void check_recovery_type(PGconn *conn);
 static void initialise_direct_clone(t_node_info *local_node_record, t_node_info *upstream_node_record);
 static int	run_basebackup(t_node_info *node_record);
 static int	run_file_backup(t_node_info *node_record);
-static int	run_pg_backupapi(t_node_info *node_record);
 
 static void copy_configuration_files(bool delete_after_copy);
 
@@ -178,6 +173,21 @@ do_standby_clone(void)
 
 	initialize_conninfo_params(&recovery_conninfo, false);
 
+	/*
+	 * --replication-conf-only provided - we'll handle that separately
+	 */
+	if (runtime_options.replication_conf_only == true)
+	{
+		return _do_create_replication_conf();
+	}
+
+	/*
+	 * conninfo params for the actual upstream node (which might be different
+	 * to the node we're cloning from) to write to recovery.conf
+	 */
+
+	mode = get_standby_clone_mode();
+
 	/*
 	 * Copy the provided data directory; if a configuration file was provided,
 	 * use the (mandatory) value from that; if -D/--pgdata was provided, use
@@ -205,19 +215,6 @@ do_standby_clone(void)
 		exit(ERR_BAD_CONFIG);
 	}
 
-	/*
-	 * --replication-conf-only provided - we'll handle that separately
-	 */
-	if (runtime_options.replication_conf_only == true)
-	{
-		return _do_create_replication_conf();
-	}
-
-	/*
-	 * conninfo params for the actual upstream node (which might be different
-	 * to the node we're cloning from) to write to recovery.conf
-	 */
-	mode = get_standby_clone_mode();
 
 	if (mode == barman)
 	{
@@ -673,15 +670,6 @@ do_standby_clone(void)
 			log_hint(_("consider using the -c/--fast-checkpoint option"));
 		}
 
-		if (mode == pg_basebackup)
-		{
-			/*
-			 * In --dry-run mode, this will just output the pg_basebackup command which
-			 * would be executed.
-			 */
-			run_basebackup(&local_node_record);
-		}
-
 		PQfinish(source_conn);
 
 		log_info(_("all prerequisites for \"standby clone\" are met"));
@@ -689,18 +677,19 @@ do_standby_clone(void)
 		exit(SUCCESS);
 	}
 
+	if (mode != barman)
+	{
+		initialise_direct_clone(&local_node_record, &upstream_node_record);
+	}
+
 	switch (mode)
 	{
 		case pg_basebackup:
-			initialise_direct_clone(&local_node_record, &upstream_node_record);
 			log_notice(_("starting backup (using pg_basebackup)..."));
 			break;
 		case barman:
 			log_notice(_("retrieving backup from Barman..."));
 			break;
-		case pg_backupapi:
-			log_notice(_("starting backup (using pg_backupapi)..."));
-			break;
 		default:
 			/* should never reach here */
 			log_error(_("unknown clone mode"));
@@ -722,9 +711,6 @@ do_standby_clone(void)
 		case barman:
 			r = run_file_backup(&local_node_record);
 			break;
-		case pg_backupapi:
-			r = run_pg_backupapi(&local_node_record);
-			break;
 		default:
 			/* should never reach here */
 			log_error(_("unknown clone mode"));
@@ -818,6 +804,7 @@ do_standby_clone(void)
 	}
 
 	/* Write the recovery.conf file */
+
 	if (create_recovery_file(&local_node_record,
 							 &recovery_conninfo,
 							 source_server_version_num,
@@ -849,9 +836,6 @@ do_standby_clone(void)
 		case barman:
 			log_notice(_("standby clone (from Barman) complete"));
 			break;
-		case pg_backupapi:
-			log_notice(_("standby clone (from pg_backupapi) complete"));
-			break;
 	}
 
 	/*
@@ -943,9 +927,6 @@ do_standby_clone(void)
 		case barman:
 			appendPQExpBufferStr(&event_details, "barman");
 			break;
-		case pg_backupapi:
-			appendPQExpBufferStr(&event_details, "pg_backupapi");
-			break;
 	}
 
 	appendPQExpBuffer(&event_details,
@@ -1557,7 +1538,7 @@ _do_create_replication_conf(void)
 		}
 		else
 		{
-			if (write_standby_signal(local_data_directory) == false)
+			if (write_standby_signal() == false)
 			{
 				log_error(_("unable to write \"standby.signal\" file"));
 			}
@@ -2018,7 +1999,7 @@ do_standby_register(void)
 		/* only do this if record does not exist */
 		if (record_status != RECORD_FOUND)
 		{
-			log_warning(_("--upstream-node-id not supplied, assuming upstream node is primary (node ID: %i)"),
+			log_warning(_("--upstream-node-id not supplied, assuming upstream node is primary (node ID %i)"),
 						primary_node_id);
 
 			/* check our standby is connected */
@@ -3357,9 +3338,10 @@ do_standby_follow_internal(PGconn *primary_conn, PGconn *follow_target_conn, t_n
 			update_node_record_slot_name(primary_conn, config_file_options.node_id, local_node_record.slot_name);
 		}
 
+
 		if (create_replication_slot(follow_target_conn,
 									local_node_record.slot_name,
-									follow_target_node_record,
+									NULL,
 									output) == false)
 		{
 			log_error("%s", output->data);
@@ -3662,9 +3644,8 @@ do_standby_switchover(void)
 	PQExpBufferData remote_command_str;
 	PQExpBufferData command_output;
 	PQExpBufferData node_rejoin_options;
-	PQExpBufferData logmsg;
+	PQExpBufferData errmsg;
 	PQExpBufferData detailmsg;
-	PQExpBufferData event_details;
 
 	int			r,
 				i;
@@ -3681,9 +3662,6 @@ do_standby_switchover(void)
 	/* store list of configuration files on the demotion candidate */
 	KeyValueList remote_config_files = {NULL, NULL};
 
-	/* temporary log file for "repmgr node rejoin" on the demotion candidate */
-	char		node_rejoin_log[MAXPGPATH] = "";
-
 	NodeInfoList sibling_nodes = T_NODE_INFO_LIST_INITIALIZER;
 	SiblingNodeStats sibling_nodes_stats = T_SIBLING_NODES_STATS_INITIALIZER;
 
@@ -3826,24 +3804,24 @@ do_standby_switchover(void)
 	 * the demotion candidate as the rejoin will fail if we are unable to to write to that.
 	 */
 
-	initPQExpBuffer(&logmsg);
+	initPQExpBuffer(&errmsg);
 	initPQExpBuffer(&detailmsg);
 
 	if (check_replication_config_owner(PQserverVersion(local_conn),
 									   config_file_options.data_directory,
-									   &logmsg, &detailmsg) == false)
+									   &errmsg, &detailmsg) == false)
 	{
-		log_error("%s", logmsg.data);
+		log_error("%s", errmsg.data);
 		log_detail("%s", detailmsg.data);
 
-		termPQExpBuffer(&logmsg);
+		termPQExpBuffer(&errmsg);
 		termPQExpBuffer(&detailmsg);
 
 		PQfinish(local_conn);
 		exit(ERR_BAD_CONFIG);
 	}
 
-	termPQExpBuffer(&logmsg);
+	termPQExpBuffer(&errmsg);
 	termPQExpBuffer(&detailmsg);
 
 	/* check remote server connection and retrieve its record */
@@ -4791,7 +4769,6 @@ do_standby_switchover(void)
 
 		repmgrd_info = (RepmgrdInfo **) pg_malloc0(sizeof(RepmgrdInfo *) * all_nodes.node_count);
 
-		log_notice(_("attempting to pause repmgrd on %i nodes"), all_nodes.node_count);
 		for (cell = all_nodes.head; cell; cell = cell->next)
 		{
 			repmgrd_info[i] = pg_malloc0(sizeof(RepmgrdInfo));
@@ -4820,7 +4797,7 @@ do_standby_switchover(void)
 					unreachable_node_count++;
 
 					item_list_append_format(&repmgrd_connection_errors,
-											_("unable to connect to node \"%s\" (ID: %i):\n%s"),
+											_("unable to connect to node \"%s\" (ID %i):\n%s"),
 											cell->node_info->node_name,
 											cell->node_info->node_id,
 											PQerrorMessage(cell->node_info->conn));
@@ -4851,9 +4828,8 @@ do_standby_switchover(void)
 
 			initPQExpBuffer(&msg);
 			appendPQExpBuffer(&msg,
-							  _("unable to connect to %i of %i node(s), unable to pause all repmgrd instances"),
+							  _("unable to connect to %i node(s), unable to pause all repmgrd instances"),
-							  unreachable_node_count,
+							  unreachable_node_count);
-							  all_nodes.node_count);
 
 			initPQExpBuffer(&detail);
 
@@ -4904,7 +4880,7 @@ do_standby_switchover(void)
 				 */
 				if (repmgrd_info[i]->pg_running == false)
 				{
-					log_warning(_("node \"%s\" (ID: %i) unreachable, unable to pause repmgrd"),
+					log_warning(_("node \"%s\" (ID %i) unreachable, unable to pause repmgrd"),
 								cell->node_info->node_name,
 								cell->node_info->node_id);
 					i++;
@@ -4917,7 +4893,7 @@ do_standby_switchover(void)
 				 */
 				if (repmgrd_info[i]->running == false)
 				{
-					log_notice(_("repmgrd not running on node \"%s\" (ID: %i), not pausing"),
+					log_warning(_("repmgrd not running on node \"%s\" (ID %i)"),
 								cell->node_info->node_name,
 								cell->node_info->node_id);
 					i++;
@@ -4938,14 +4914,14 @@ do_standby_switchover(void)
 
 				if (runtime_options.dry_run == true)
 				{
-					log_info(_("would pause repmgrd on node \"%s\" (ID: %i)"),
+					log_info(_("would pause repmgrd on node \"%s\" (ID %i)"),
 							 cell->node_info->node_name,
 							 cell->node_info->node_id);
 				}
 				else
 				{
 					/* XXX check result  */
-					log_debug("pausing repmgrd on node \"%s\" (ID: %i)",
+					log_debug("pausing repmgrd on node \"%s\" (ID %i)",
 							 cell->node_info->node_name,
 							 cell->node_info->node_id);
 
@@ -5245,18 +5221,6 @@ do_standby_switchover(void)
 			  format_lsn(replication_info.last_wal_receive_lsn),
 			  format_lsn(remote_last_checkpoint_lsn));
 
-	/*
-	 * optionally add a delay before promoting the standby; this is mainly
-	 * useful for testing (e.g. for reappearance of the original primary) and
-	 * is not documented.
-	 */
-	if (config_file_options.promote_delay > 0)
-	{
-		log_debug("sleeping %i seconds before promoting standby",
-				  config_file_options.promote_delay);
-		sleep(config_file_options.promote_delay);
-	}
-
 	/*
 	 * Promote standby (local node).
 	 *
@@ -5288,7 +5252,7 @@ do_standby_switchover(void)
 			checkpoint_conn = superuser_conn;
 		}
 
-		if (can_execute_checkpoint(checkpoint_conn) == true)
+		if (is_superuser_connection(checkpoint_conn, NULL) == true)
 		{
 			log_notice(_("issuing CHECKPOINT on node \"%s\" (ID: %i) "),
 					   config_file_options.node_name,
@@ -5297,16 +5261,7 @@ do_standby_switchover(void)
 		}
 		else
 		{
-			log_warning(_("no authorized connection available, unable to issue CHECKPOINT"));
+			log_warning(_("no superuser connection available, unable to issue CHECKPOINT"));
-
-			if (PQserverVersion(local_conn) >= 150000)
-			{
-				log_hint(_("provide a superuser with -S/--superuser or grant pg_checkpoint role to repmgr user"));
-			}
-			else
-			{
-				log_hint(_("provide a superuser with -S/--superuser"));
-			}
 		}
 	}
 
@@ -5391,21 +5346,6 @@ do_standby_switchover(void)
 		pfree(conninfo_normalized);
 	}
 
-	/* */
-	snprintf(node_rejoin_log, MAXPGPATH,
-#if defined(__i386__) || defined(__i386)
-			 "/tmp/node-rejoin.%u.log",
-			 (unsigned)time(NULL)
-#else
-			 "/tmp/node-rejoin.%lu.log",
-			 (unsigned long)time(NULL)
-#endif
-		);
-
-	appendPQExpBuffer(&remote_command_str,
-					  " > %s 2>&1 && echo \"1\" || echo \"0\"",
-					  node_rejoin_log);
-
 	termPQExpBuffer(&node_rejoin_options);
 
 	log_debug("executing:\n  %s", remote_command_str.data);
@@ -5419,161 +5359,78 @@ do_standby_switchover(void)
 
 	termPQExpBuffer(&remote_command_str);
 
-	initPQExpBuffer(&logmsg);
+	/* TODO: verify this node's record was updated correctly */
-	initPQExpBuffer(&detailmsg);
 
-	/* This is failure to execute the ssh command */
 	if (command_success == false)
 	{
 		log_error(_("rejoin failed with error code %i"), r);
-		switchover_success = false;
-
-		appendPQExpBuffer(&logmsg,
-						  _("unable to execute \"repmgr node rejoin\" on demotion candidate \"%s\" (ID: %i)"),
-						  remote_node_record.node_name,
-						  remote_node_record.node_id);
-		appendPQExpBufferStr(&detailmsg,
-							 command_output.data);
 
+		create_event_notification_extended(local_conn,
+										   &config_file_options,
+										   config_file_options.node_id,
+										   "standby_switchover",
+										   false,
+										   command_output.data,
+										   &event_info);
 	}
 	else
 	{
-		standy_join_status join_success = JOIN_UNKNOWN;
+		PQExpBufferData event_details;
+		standy_join_status join_success = check_standby_join(local_conn,
+															 &local_node_record,
+															 &remote_node_record);
 
-		/* "rempgr node rejoin" failed on the demotion candidate */
+		initPQExpBuffer(&event_details);
-		if (command_output.data[0] == '0')
+
+		switch (join_success) {
+			case JOIN_FAIL_NO_PING:
+				appendPQExpBuffer(&event_details,
+								  _("node \"%s\" (ID: %i) promoted to primary, but demote node \"%s\" (ID: %i) did not beome available"),
+								  config_file_options.node_name,
+								  config_file_options.node_id,
+								  remote_node_record.node_name,
+								  remote_node_record.node_id);
+				switchover_success = false;
+
+				break;
+			case JOIN_FAIL_NO_REPLICATION:
+				appendPQExpBuffer(&event_details,
+								  _("node \"%s\" (ID: %i) promoted to primary, but demote node \"%s\" (ID: %i) did not connect to the new primary"),
+								  config_file_options.node_name,
+								  config_file_options.node_id,
+								  remote_node_record.node_name,
+								  remote_node_record.node_id);
+				switchover_success = false;
+				break;
+			case JOIN_SUCCESS:
+				appendPQExpBuffer(&event_details,
+								  _("node \"%s\" (ID: %i) promoted to primary, node \"%s\" (ID: %i) demoted to standby"),
+								  config_file_options.node_name,
+								  config_file_options.node_id,
+								  remote_node_record.node_name,
+								  remote_node_record.node_id);
+		}
+
+		create_event_notification_extended(local_conn,
+										   &config_file_options,
+										   config_file_options.node_id,
+										   "standby_switchover",
+										   switchover_success,
+										   event_details.data,
+										   &event_info);
+		if (switchover_success == true)
 		{
-			appendPQExpBuffer(&logmsg,
+			log_notice("%s", event_details.data);
-							  _("execution of \"repmgr node rejoin\" on demotion candidate \"%s\" (ID: %i) failed"),
-							  remote_node_record.node_name,
-							  remote_node_record.node_id);
-
-			/*
-			 * Speculatively check if the demotion candidate has been restarted, e.g. by
-			 * an external watchdog process which isn't aware a switchover is happening.
-			 * This falls into the category "thing outside of our control which shouldn't
-			 * happen, but if it does, make it easier to find out what happened".
-			 */
-			remote_conn = establish_db_connection(remote_node_record.conninfo, false);
-
-			if (PQstatus(remote_conn) == CONNECTION_OK)
-			{
-				if (get_recovery_type(remote_conn) == RECTYPE_PRIMARY)
-				{
-					appendPQExpBuffer(&detailmsg,
-									  _("PostgreSQL instance on demotion candidate \"%s\" (ID: %i) is running as a primary\n"),
-									  remote_node_record.node_name,
-									  remote_node_record.node_id);
-					log_warning("%s", detailmsg.data);
-				}
-			}
-			PQfinish(remote_conn);
-
-			appendPQExpBuffer(&detailmsg,
-							  "check log file \"%s\" on \"%s\" for details",
-							  node_rejoin_log,
-							  remote_node_record.node_name);
-
-			switchover_success = false;
-			join_success = JOIN_COMMAND_FAIL;
 		}
 		else
 		{
-			join_success = check_standby_join(local_conn,
+			log_error("%s", event_details.data);
-											  &local_node_record,
-											  &remote_node_record);
-
-
-
-			switch (join_success) {
-				case JOIN_FAIL_NO_PING:
-					appendPQExpBuffer(&logmsg,
-									  _("node \"%s\" (ID: %i) promoted to primary, but demotion candidate \"%s\" (ID: %i) did not become available"),
-									  config_file_options.node_name,
-									  config_file_options.node_id,
-									  remote_node_record.node_name,
-									  remote_node_record.node_id);
-
-					switchover_success = false;
-
-					break;
-				case JOIN_FAIL_NO_REPLICATION:
-					appendPQExpBuffer(&logmsg,
-									  _("node \"%s\" (ID: %i) promoted to primary, but demotion candidate \"%s\" (ID: %i) did not connect to the new primary"),
-									  config_file_options.node_name,
-									  config_file_options.node_id,
-									  remote_node_record.node_name,
-									  remote_node_record.node_id);
-					switchover_success = false;
-					break;
-				case JOIN_SUCCESS:
-					appendPQExpBuffer(&logmsg,
-									  _("node \"%s\" (ID: %i) promoted to primary, node \"%s\" (ID: %i) demoted to standby"),
-									  config_file_options.node_name,
-									  config_file_options.node_id,
-									  remote_node_record.node_name,
-									  remote_node_record.node_id);
-					break;
-				/* check_standby_join() does not return this */
-				case JOIN_COMMAND_FAIL:
-					break;
-				/* should never happen*/
-				case JOIN_UNKNOWN:
-					appendPQExpBuffer(&logmsg,
-									  "unable to determine success of node rejoin action for demotion candidate \"%s\" (ID: %i)",
-									  remote_node_record.node_name,
-									  remote_node_record.node_id);
-					switchover_success = false;
-					break;
-			}
-
-			if (switchover_success == false)
-			{
-				appendPQExpBuffer(&detailmsg,
-								  "check the PostgreSQL log file on  demotion candidate \"%s\" (ID: %i)",
-								  remote_node_record.node_name,
-								  remote_node_record.node_id);
-			}
 		}
+		termPQExpBuffer(&event_details);
 	}
 
-	if (switchover_success == true)
-	{
-		/* TODO: verify demotion candidates's node record was updated correctly */
-
-		log_notice("%s", logmsg.data);
-	}
-	else
-	{
-		log_error("%s", logmsg.data);
-	}
-
-	initPQExpBuffer(&event_details);
-
-	appendPQExpBufferStr(&event_details, logmsg.data);
-
-	if (detailmsg.data[0] != '\0')
-	{
-		log_detail("%s", detailmsg.data);
-		appendPQExpBuffer(&event_details, "\n%s",
-						  detailmsg.data);
-	}
-
-
-	create_event_notification_extended(local_conn,
-									   &config_file_options,
-									   config_file_options.node_id,
-									   "standby_switchover",
-									   switchover_success,
-									   event_details.data,
-									   &event_info);
-
-	termPQExpBuffer(&event_details);
-	termPQExpBuffer(&logmsg);
-	termPQExpBuffer(&detailmsg);
 	termPQExpBuffer(&command_output);
 
-
 	/*
 	 * If --siblings-follow specified, attempt to make them follow the new
 	 * primary
@@ -5686,7 +5543,7 @@ do_standby_switchover(void)
 
 				if (repmgrd_info[i]->paused == true && runtime_options.repmgrd_force_unpause == false)
 				{
-					log_debug("repmgrd on node \"%s\" (ID: %i) paused before switchover, --repmgrd-force-unpause not provided, not unpausing",
+					log_debug("repmgrd on node \"%s\" (ID %i) paused before switchover, --repmgrd-force-unpause not provided, not unpausing",
 							  cell->node_info->node_name,
 							  cell->node_info->node_id);
 
@@ -5694,7 +5551,7 @@ do_standby_switchover(void)
 					continue;
 				}
 
-				log_debug("unpausing repmgrd on node \"%s\" (ID: %i)",
+				log_debug("unpausing repmgrd on node \"%s\" (ID %i)",
 						  cell->node_info->node_name,
 						  cell->node_info->node_id);
 
@@ -5705,7 +5562,7 @@ do_standby_switchover(void)
 					if (repmgrd_pause(cell->node_info->conn, false) == false)
 					{
 						item_list_append_format(&repmgrd_unpause_errors,
-												_("unable to unpause node \"%s\" (ID: %i)"),
+												_("unable to unpause node \"%s\" (ID %i)"),
 												cell->node_info->node_name,
 												cell->node_info->node_id);
 						error_node_count++;
@@ -5714,7 +5571,7 @@ do_standby_switchover(void)
 				else
 				{
 					item_list_append_format(&repmgrd_unpause_errors,
-											_("unable to connect to node \"%s\" (ID: %i):\n%s"),
+											_("unable to connect to node \"%s\" (ID %i):\n%s"),
 											cell->node_info->node_name,
 											cell->node_info->node_id,
 											PQerrorMessage(cell->node_info->conn));
@@ -5802,18 +5659,20 @@ check_source_server()
 	}
 
 	/*
-	 * The server version check will also serve as a sanity-check that we can
+	 * If a connection was established, perform some sanity checks on the
-	 * actually execute queries on this connection.
+	 * provided upstream connection.
 	 */
+
 	source_server_version_num = check_server_version(source_conn, "primary", true, NULL);
 
 	/*
-	 * The cluster size is nice to have, but not essential to know, so only display
+	 * It's not essential to know the cluster size, but useful to sanity-check
-	 * something if the user has sufficient permissions to retrieve the size of
+	 * we can actually run a query before going any further.
-	 * all databases.
 	 */
-	if (get_cluster_size(source_conn, cluster_size) == true)
+	if (get_cluster_size(source_conn, cluster_size) == false)
-		log_detail(_("current installation size is %s"),
+		exit(ERR_DB_QUERY);
+
+	log_detail(_("current installation size is %s"),
 			   cluster_size);
 
 	/*
@@ -6996,13 +6855,6 @@ run_basebackup(t_node_info *node_record)
 
 	termPQExpBuffer(&params);
 
-	if (runtime_options.dry_run == true)
-	{
-		log_info(_("would execute:\n  %s"), script.data);
-		termPQExpBuffer(&script);
-		return SUCCESS;
-	}
-
 	log_info(_("executing:\n  %s"), script.data);
 
 	/*
@@ -7788,117 +7640,6 @@ stop_backup:
 }
 
 
-/*
- * Perform a call to pg_backupapi endpoint to ask barman to write the backup
- * for us. This will ensure that no matter the format on-disk of new backups,
- * barman will always find a way how to read and write them.
- * From repmgr 4 this is only used for Barman backups.
- */
-static int
-run_pg_backupapi(t_node_info *local_node_record)
-{
-	int r = ERR_PGBACKUPAPI_SERVICE;
-	long http_return_code = 0;
-	short seconds_to_sleep = 3;
-	operation_task *task = malloc(sizeof(operation_task));
-	CURL *curl = curl_easy_init();
-	CURLcode ret;
-
-	check_pg_backupapi_standby_clone_options();
-
-	task->host = malloc(strlen(config_file_options.pg_backupapi_host)+1);
-	task->remote_ssh_command = malloc(strlen(config_file_options.pg_backupapi_remote_ssh_command)+1);
-	task->node_name = malloc(strlen(config_file_options.pg_backupapi_node_name)+1);
-	task->operation_type = malloc(strlen(DEFAULT_STANDBY_PG_BACKUPAPI_OP_TYPE)+1);
-	task->backup_id = malloc(strlen(config_file_options.pg_backupapi_backup_id)+1);
-	task->destination_directory = malloc(strlen(local_data_directory)+1);
-
-	task->operation_id = malloc(MAX_BUFFER_LENGTH);
-	task->operation_status = malloc(MAX_BUFFER_LENGTH);
-
-	strcpy(task->host, config_file_options.pg_backupapi_host);
-	strcpy(task->remote_ssh_command, config_file_options.pg_backupapi_remote_ssh_command);
-	strcpy(task->node_name, config_file_options.pg_backupapi_node_name);
-	strcpy(task->operation_type, DEFAULT_STANDBY_PG_BACKUPAPI_OP_TYPE);
-	strcpy(task->backup_id, config_file_options.pg_backupapi_backup_id);
-	strcpy(task->destination_directory, local_data_directory);
-	strcpy(task->operation_id, "\0");
-
-	ret = create_new_task(curl, task);
-
-	if ((ret != CURLE_OK) || (strlen(task->operation_id) == 0)) {
-		curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &http_return_code);
-		if (499 > http_return_code && http_return_code >= 400) {
-			log_error("Cannot find backup '%s' for node '%s'.", task->backup_id, task->node_name);
-		} else {
-			log_error("whilst reaching out pg_backup service: %s\n", curl_easy_strerror(ret));
-		}
-        }
-	else
-	{
-		log_info("Success creating the task: operation id '%s'", task->operation_id);
-
-		//We call init again because previous call included POST calls
-		curl_easy_cleanup(curl);
-		curl = curl_easy_init();
-		while (true)
-		{
-			ret = get_status_of_operation(curl, task);
-			if (strlen(task->operation_status) == 0) {
-				log_info("Retrying...");
-			}
-			else
-			{
-				log_info("status %s", task->operation_status);
-			}
-			if (strcmp(task->operation_status, "FAILED") == 0) {
-				break;
-			}
-			if (strcmp(task->operation_status, "DONE") == 0) {
-				r = SUCCESS;
-				break;
-			}
-
-			sleep(seconds_to_sleep);
-		}
-	}
-
-	curl_easy_cleanup(curl);
-	free(task);
-	return r;
-}
-
-/*
- * pg_backupapi mode is enabled when config_file_options.pg_backupapi_host is set hence, we
- * should also check the other required variables too.
- */
-
-void check_pg_backupapi_standby_clone_options() {
-
-	bool error = false;
-
-	if (*config_file_options.pg_backupapi_remote_ssh_command == '\0') {
-		log_hint("Check config: remote ssh command is required");
-		error = true;
-	}
-	if (*config_file_options.pg_backupapi_node_name == '\0') {
-		log_hint("Check config: node name is required");
-		error = true;
-	}
-	if (*config_file_options.pg_backupapi_backup_id == '\0') {
-		log_hint("Check config: backup_id is required");
-		error = true;
-	}
-
-	if (error == true) {
-		log_error("Please fix the errors and try again");
-		exit(ERR_BAD_CONFIG);
-	}
-
-}
-
-
-
 static char *
 make_barman_ssh_command(char *buf)
 {
@@ -8277,9 +8018,9 @@ create_recovery_file(t_node_info *node_record, t_conninfo_param_list *primary_co
 		free(escaped);
 	}
 
-	/*
+
-	 * Caller requests the generated file to be written into a buffer
+
-	 */
+
 	if (as_file == false)
 	{
 		/* create file in buffer */
@@ -8299,17 +8040,20 @@ create_recovery_file(t_node_info *node_record, t_conninfo_param_list *primary_co
 		return true;
 	}
 
+
 	/*
 	 * PostgreSQL 12 and later: modify postgresql.auto.conf
+	 *
 	 */
 	if (server_version_num >= 120000)
 	{
+
 		if (modify_auto_conf(dest, &recovery_config) == false)
 		{
 			return false;
 		}
 
-		if (write_standby_signal(dest) == false)
+		if (write_standby_signal() == false)
 		{
 			return false;
 		}

repmgr-action-standby.h

@@ -30,6 +30,6 @@ extern void do_standby_help(void);
 
 extern bool do_standby_follow_internal(PGconn *primary_conn, PGconn *follow_target_conn, t_node_info *follow_target_node_record, PQExpBufferData *output, int general_error_code, int *error_code);
 
-void check_pg_backupapi_standby_clone_options(void);
+
 
 #endif							/* _REPMGR_ACTION_STANDBY_H_ */

repmgr-client-global.h

@@ -120,7 +120,6 @@ typedef struct
 	bool		missing_slots;
 	bool		has_passfile;
 	bool		replication_connection;
-	bool		repmgrd;
 	bool		data_directory_config;
 	bool		replication_config_owner;
 	bool		db_connection;
@@ -176,7 +175,7 @@ typedef struct
 		/* "node status" options */ \
 		false, \
 		/* "node check" options */ \
-		false, false, false, false, false, false, false, false,	false, false, false, false, false, \
+		false, false, false, false, false, false, false, false,	false, false, false, false, \
 		/* "node rejoin" options */ \
 		"", \
 		/* "node service" options */ \
@@ -193,8 +192,7 @@ typedef struct
 typedef enum
 {
 	barman,
-	pg_basebackup,
+	pg_basebackup
-	pg_backupapi
 } standy_clone_mode;
 
 typedef enum
@@ -221,9 +219,7 @@ typedef enum
 
 typedef enum
 {
-	JOIN_UNKNOWN = -1,
 	JOIN_SUCCESS,
-	JOIN_COMMAND_FAIL,
 	JOIN_FAIL_NO_PING,
 	JOIN_FAIL_NO_REPLICATION
 } standy_join_status;
@@ -286,8 +282,8 @@ extern void get_node_config_directory(char *config_dir_buf);
 extern void get_node_data_directory(char *data_dir_buf);
 extern void init_node_record(t_node_info *node_record);
 extern bool can_use_pg_rewind(PGconn *conn, const char *data_directory, PQExpBufferData *reason);
-extern void make_standby_signal_path(const char *data_dir, char *buf);
+extern void make_standby_signal_path(char *buf);
-extern bool write_standby_signal(const char *data_dir);
+extern bool write_standby_signal(void);
 
 extern bool create_replication_slot(PGconn *conn, char *slot_name, t_node_info *upstream_node_record, PQExpBufferData *error_msg);
 extern bool drop_replication_slot_if_exists(PGconn *conn, int node_id, char *slot_name);

repmgr-client.c

@@ -51,7 +51,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <pwd.h>
 #include <unistd.h>
 #include <sys/stat.h>
 #include <signal.h>
@@ -90,22 +89,17 @@ char		pg_bindir[MAXPGPATH] = "";
  */
 t_node_info target_node_info = T_NODE_INFO_INITIALIZER;
 
-/* set by the first call to _determine_replication_slot_user() */
+/* used by create_replication_slot() */
 static t_user_type ReplicationSlotUser = USER_TYPE_UNKNOWN;
 
 /* Collate command line errors and warnings here for friendlier reporting */
 static ItemList cli_errors = {NULL, NULL};
 static ItemList cli_warnings = {NULL, NULL};
 
-
 static void _determine_replication_slot_user(PGconn *conn,
 											 t_node_info *upstream_node_record,
 											 char **replication_user);
 
-static PGconn *_get_replication_slot_connection(PGconn *conn,
-												char *replication_user,
-												bool *use_replication_protocol);
-
 int
 main(int argc, char **argv)
 {
@@ -555,10 +549,6 @@ main(int argc, char **argv)
 				runtime_options.data_directory_config = true;
 				break;
 
-			case OPT_REPMGRD:
-				runtime_options.repmgrd = true;
-				break;
-
 			case OPT_REPLICATION_CONFIG_OWNER:
 				runtime_options.replication_config_owner = true;
 				break;
@@ -3096,14 +3086,9 @@ get_standby_clone_mode(void)
 
 	if (*config_file_options.barman_host != '\0' && runtime_options.without_barman == false)
 		mode = barman;
-	else {
+	else
-		if (*config_file_options.pg_backupapi_host != '\0') {
+		mode = pg_basebackup;
-			log_info("Attempting to use `pg_backupapi` new restore mode");
+
-			mode = pg_backupapi;
-		}
-		else
-			mode = pg_basebackup;
-	}
 	return mode;
 }
 
@@ -3197,11 +3182,6 @@ copy_remote_files(char *host, char *remote_user, char *remote_path,
 								 " --exclude=pg_xlog/* --exclude=pg_log/*");
 		}
 
-		/*
-		 * From PostgreSQL 15, the core server no longer uses pg_stat_tmp,
-		 * but some extensions (e.g. pg_stat_statements) may still do, so
-		 * keep excluding it.
-		 */
 		appendPQExpBufferStr(&rsync_flags,
 							 " --exclude=pg_stat_tmp/*");
 
@@ -3639,8 +3619,8 @@ can_use_pg_rewind(PGconn *conn, const char *data_directory, PQExpBufferData *rea
 	/* "full_page_writes" must be on in any case */
 	if (guc_set(conn, "full_page_writes", "=", "off"))
 	{
-		appendPQExpBufferStr(reason,
+		appendPQExpBuffer(reason,
-							 _("\"full_page_writes\" must be set to \"on\""));
+						  _("\"full_page_writes\" must be set to \"on\""));
 
 		can_use = false;
 	}
@@ -3658,18 +3638,18 @@ can_use_pg_rewind(PGconn *conn, const char *data_directory, PQExpBufferData *rea
 		if (data_checksum_version == UNKNOWN_DATA_CHECKSUM_VERSION)
 		{
 			if (can_use == false)
-				appendPQExpBufferStr(reason, "; ");
+				appendPQExpBuffer(reason, "; ");
 
-			appendPQExpBufferStr(reason,
+			appendPQExpBuffer(reason,
-								 _("\"wal_log_hints\" is set to \"off\" but unable to determine data checksum version"));
+							  _("\"wal_log_hints\" is set to \"off\" but unable to determine data checksum version"));
 			can_use = false;
 		}
 		else if (data_checksum_version == 0)
 		{
 			if (can_use == false)
-				appendPQExpBufferStr(reason, "; ");
+				appendPQExpBuffer(reason, "; ");
 
-			appendPQExpBufferStr(reason,
+			appendPQExpBuffer(reason,
 							  _("\"wal_log_hints\" is set to \"off\" and data checksums are disabled"));
 
 			can_use = false;
@@ -3681,11 +3661,11 @@ can_use_pg_rewind(PGconn *conn, const char *data_directory, PQExpBufferData *rea
 
 
 void
-make_standby_signal_path(const char *data_dir, char *buf)
+make_standby_signal_path(char *buf)
 {
 	snprintf(buf, MAXPGPATH,
 			 "%s/%s",
-			 data_dir,
+			 config_file_options.data_directory,
 			 STANDBY_SIGNAL_FILE);
 }
 
@@ -3693,15 +3673,13 @@ make_standby_signal_path(const char *data_dir, char *buf)
  * create standby.signal (PostgreSQL 12 and later)
  */
 bool
-write_standby_signal(const char *data_dir)
+write_standby_signal(void)
 {
 	char	    standby_signal_file_path[MAXPGPATH] = "";
 	FILE	   *file;
 	mode_t		um;
 
-	Assert(data_dir != NULL);
+	make_standby_signal_path(standby_signal_file_path);
-
-	make_standby_signal_path(data_dir, standby_signal_file_path);
 
 	/* Set umask to 0600 */
 	um = umask((~(S_IRUSR | S_IWUSR)) & (S_IRWXG | S_IRWXO));
@@ -3749,7 +3727,6 @@ create_replication_slot(PGconn *conn, char *slot_name, t_node_info *upstream_nod
 	char *replication_user = NULL;
 
 	_determine_replication_slot_user(conn, upstream_node_record, &replication_user);
-
 	/*
 	 * If called in --dry-run context, if the replication slot user is not the
 	 * repmgr user, attempt to validate the connection.
@@ -3761,7 +3738,7 @@ create_replication_slot(PGconn *conn, char *slot_name, t_node_info *upstream_nod
 			case USER_TYPE_UNKNOWN:
 				log_error("unable to determine user for replication slot creation");
 				return false;
-			case REPMGR_USER:
+			case  REPMGR_USER:
 				log_info(_("replication slots will be created by user \"%s\""),
 						 PQuser(conn));
 				return true;
@@ -3807,12 +3784,65 @@ create_replication_slot(PGconn *conn, char *slot_name, t_node_info *upstream_nod
 				PQfinish(superuser_conn);
 			}
 		}
+
 	}
 
-	slot_conn = _get_replication_slot_connection(conn, replication_user, &use_replication_protocol);
+	/*
+	 * If we can't create a replication slot with the connection provided to
+	 * the function, create an connection with appropriate permissions.
+	 */
+	switch (ReplicationSlotUser)
+	{
+		case USER_TYPE_UNKNOWN:
+			log_error("unable to determine user for replication slot creation");
+			return false;
+		case  REPMGR_USER:
+			slot_conn = conn;
+			log_info(_("creating replication slot as user \"%s\""),
+					 PQuser(conn));
+			break;
 
-	if (slot_conn == NULL)
+		case REPLICATION_USER_NODE:
-		return false;
+		case REPLICATION_USER_OPT:
+		{
+			slot_conn = duplicate_connection(conn,
+											 replication_user,
+											 true);
+			if (slot_conn == NULL || PQstatus(slot_conn) != CONNECTION_OK)
+			{
+				log_error(_("unable to create replication connection as user \"%s\""),
+						  runtime_options.replication_user);
+				log_detail("%s", PQerrorMessage(slot_conn));
+
+				PQfinish(slot_conn);
+					return false;
+			}
+			use_replication_protocol = true;
+			log_info(_("creating replication slot as replication user \"%s\""),
+					 replication_user);
+		}
+			break;
+
+		case SUPERUSER:
+		{
+			slot_conn = duplicate_connection(conn,
+											 runtime_options.superuser,
+											 false);
+			if (slot_conn == NULL || PQstatus(slot_conn )!= CONNECTION_OK)
+			{
+				log_error(_("unable to create super connection as user \"%s\""),
+						  runtime_options.superuser);
+				log_detail("%s", PQerrorMessage(slot_conn));
+
+				PQfinish(slot_conn);
+
+				return false;
+			}
+			log_info(_("creating replication slot as superuser \"%s\""),
+					 runtime_options.superuser);
+		}
+			break;
+	}
 
 	if (use_replication_protocol == true)
 	{
@@ -3855,53 +3885,34 @@ drop_replication_slot_if_exists(PGconn *conn, int node_id, char *slot_name)
 
 	if (record_status != RECORD_FOUND)
 	{
-		/* no slot, no problem */
+		/* this is not a bad good thing */
 		log_verbose(LOG_INFO,
 					_("slot \"%s\" does not exist on node %i, nothing to remove"),
 					slot_name, node_id);
 		return true;
 	}
 
-	if (slot_info.active == true)
+	if (slot_info.active == false)
 	{
-		/*
+		if (drop_replication_slot_sql(conn, slot_name) == true)
-		 * If an active replication slot exists, bail out as we have a problem
-		 * we can't solve here.
-		 */
-		log_warning(_("replication slot \"%s\" is still active on node %i"), slot_name, node_id);
-		success = false;
-	}
-	else
-	{
-		/*
-		 * Create the appropriate connection with which to drop the slot
-		 */
-
-		bool use_replication_protocol = false;
-		PGconn *slot_conn = _get_replication_slot_connection(conn,
-															 replication_user,
-															 &use_replication_protocol);
-
-		if (use_replication_protocol == true)
-		{
-			success = drop_replication_slot_replprot(slot_conn, slot_name);
-		}
-		else
-		{
-			success = drop_replication_slot_sql(slot_conn, slot_name);
-		}
-
-		if (success == true)
 		{
 			log_notice(_("replication slot \"%s\" deleted on node %i"), slot_name, node_id);
 		}
 		else
 		{
 			log_error(_("unable to delete replication slot \"%s\" on node %i"), slot_name, node_id);
+			success = false;
 		}
+	}
 
-		if (slot_conn != conn)
+	/*
-			PQfinish(slot_conn);
+	 * If an active replication slot exists, call Houston as we have a
+	 * problem.
+	 */
+	else
+	{
+		log_warning(_("replication slot \"%s\" is still active on node %i"), slot_name, node_id);
+		success = false;
 	}
 
 	return success;
@@ -3963,88 +3974,10 @@ _determine_replication_slot_user(PGconn *conn, t_node_info *upstream_node_record
 			ReplicationSlotUser = REPLICATION_USER_NODE;
 			*replication_user = upstream_node_record->repluser;
 		}
-		else
-		{
-			/* This should never happen */
-			log_error("unable to determine replication slot user");
-			if (upstream_node_record != NULL)
-			{
-				log_debug("%i %s %s", upstream_node_record->node_id, upstream_node_record->repluser, PQuser(conn));
-			}
-			else
-			{
-				log_debug("upstream_node_record not provided");
-			}
-		}
 	}
 }
 
 
-static PGconn *
-_get_replication_slot_connection(PGconn *conn, char *replication_user, bool *use_replication_protocol)
-{
-	PGconn *slot_conn = NULL;
-	/*
-	 * If we can't create a replication slot with the connection provided to
-	 * the function, create an connection with appropriate permissions.
-	 */
-	switch (ReplicationSlotUser)
-	{
-		case USER_TYPE_UNKNOWN:
-			log_error("unable to determine user for managing replication slots");
-			return NULL;
-
-		case  REPMGR_USER:
-			slot_conn = conn;
-			log_verbose(LOG_INFO, _("managing replication slot as user \"%s\""),
-						PQuser(conn));
-			break;
-
-		case REPLICATION_USER_NODE:
-		case REPLICATION_USER_OPT:
-		{
-			slot_conn = duplicate_connection(conn,
-											 replication_user,
-											 true);
-			if (slot_conn == NULL || PQstatus(slot_conn) != CONNECTION_OK)
-			{
-				log_error(_("unable to manage replication connection as replication user \"%s\""),
-						  runtime_options.replication_user);
-				log_detail("%s", PQerrorMessage(slot_conn));
-
-				PQfinish(slot_conn);
-				return NULL;
-			}
-			*use_replication_protocol = true;
-			log_verbose(LOG_INFO, _("managing replication slot as replication user \"%s\""),
-						replication_user);
-		}
-		break;
-
-		case SUPERUSER:
-		{
-			slot_conn = duplicate_connection(conn,
-											 runtime_options.superuser,
-											 false);
-			if (slot_conn == NULL || PQstatus(slot_conn )!= CONNECTION_OK)
-			{
-				log_error(_("unable to create superuser connection as user \"%s\""),
-						  runtime_options.superuser);
-				log_detail("%s", PQerrorMessage(slot_conn));
-
-				PQfinish(slot_conn);
-
-				return NULL;
-			}
-			log_verbose(LOG_INFO, _("creating replication slot as superuser \"%s\""),
-						runtime_options.superuser);
-		}
-		break;
-	}
-
-	return slot_conn;
-}
-
 bool
 check_replication_slots_available(int node_id, PGconn* conn)
 {

repmgr-client.h

@@ -100,7 +100,6 @@
 #define OPT_DB_CONNECTION				   1047
 #define OPT_VERIFY_BACKUP				   1048
 #define OPT_RECOVERY_MIN_APPLY_DELAY       1049
-#define OPT_REPMGRD						   1050
 
 /* These options are for internal use only */
 #define OPT_CONFIG_ARCHIVE_DIR			   2001
@@ -194,7 +193,6 @@ static struct option long_options[] =
 	{"role", no_argument, NULL, OPT_ROLE},
 	{"slots", no_argument, NULL, OPT_SLOTS},
 	{"missing-slots", no_argument, NULL, OPT_MISSING_SLOTS},
-	{"repmgrd", no_argument, NULL, OPT_REPMGRD},
 	{"has-passfile", no_argument, NULL, OPT_HAS_PASSFILE},
 	{"replication-connection", no_argument, NULL, OPT_REPL_CONN},
 	{"data-directory-config", no_argument, NULL, OPT_DATA_DIRECTORY_CONFIG},

repmgr.c

@@ -80,36 +80,67 @@ typedef struct repmgrdSharedState
 
 static repmgrdSharedState *shared_state = NULL;
 
-#if (PG_VERSION_NUM >= 150000)
-static shmem_request_hook_type prev_shmem_request_hook = NULL;
-#endif
 static shmem_startup_hook_type prev_shmem_startup_hook = NULL;
 
-void		_PG_init(void);
 
-#if (PG_VERSION_NUM >= 150000)
+void		_PG_init(void);
-static void repmgr_shmem_request(void);
+void		_PG_fini(void);
-#endif
+
 static void repmgr_shmem_startup(void);
 
-PG_FUNCTION_INFO_V1(repmgr_set_local_node_id);
+Datum		set_local_node_id(PG_FUNCTION_ARGS);
-PG_FUNCTION_INFO_V1(repmgr_get_local_node_id);
+PG_FUNCTION_INFO_V1(set_local_node_id);
-PG_FUNCTION_INFO_V1(repmgr_standby_set_last_updated);
+
-PG_FUNCTION_INFO_V1(repmgr_standby_get_last_updated);
+Datum		get_local_node_id(PG_FUNCTION_ARGS);
-PG_FUNCTION_INFO_V1(repmgr_set_upstream_last_seen);
+PG_FUNCTION_INFO_V1(get_local_node_id);
-PG_FUNCTION_INFO_V1(repmgr_get_upstream_last_seen);
+
-PG_FUNCTION_INFO_V1(repmgr_get_upstream_node_id);
+Datum		standby_set_last_updated(PG_FUNCTION_ARGS);
-PG_FUNCTION_INFO_V1(repmgr_set_upstream_node_id);
+PG_FUNCTION_INFO_V1(standby_set_last_updated);
-PG_FUNCTION_INFO_V1(repmgr_notify_follow_primary);
+
-PG_FUNCTION_INFO_V1(repmgr_get_new_primary);
+Datum		standby_get_last_updated(PG_FUNCTION_ARGS);
-PG_FUNCTION_INFO_V1(repmgr_reset_voting_status);
+PG_FUNCTION_INFO_V1(standby_get_last_updated);
+
+Datum		set_upstream_last_seen(PG_FUNCTION_ARGS);
+PG_FUNCTION_INFO_V1(set_upstream_last_seen);
+
+Datum		get_upstream_last_seen(PG_FUNCTION_ARGS);
+PG_FUNCTION_INFO_V1(get_upstream_last_seen);
+
+Datum		get_upstream_node_id(PG_FUNCTION_ARGS);
+PG_FUNCTION_INFO_V1(get_upstream_node_id);
+
+Datum		set_upstream_node_id(PG_FUNCTION_ARGS);
+PG_FUNCTION_INFO_V1(set_upstream_node_id);
+
+Datum		notify_follow_primary(PG_FUNCTION_ARGS);
+PG_FUNCTION_INFO_V1(notify_follow_primary);
+
+Datum		get_new_primary(PG_FUNCTION_ARGS);
+PG_FUNCTION_INFO_V1(get_new_primary);
+
+Datum		reset_voting_status(PG_FUNCTION_ARGS);
+PG_FUNCTION_INFO_V1(reset_voting_status);
+
+Datum		set_repmgrd_pid(PG_FUNCTION_ARGS);
 PG_FUNCTION_INFO_V1(set_repmgrd_pid);
+
+Datum		get_repmgrd_pid(PG_FUNCTION_ARGS);
 PG_FUNCTION_INFO_V1(get_repmgrd_pid);
+
+Datum		get_repmgrd_pidfile(PG_FUNCTION_ARGS);
 PG_FUNCTION_INFO_V1(get_repmgrd_pidfile);
+
+Datum		repmgrd_is_running(PG_FUNCTION_ARGS);
 PG_FUNCTION_INFO_V1(repmgrd_is_running);
+
+Datum		repmgrd_pause(PG_FUNCTION_ARGS);
 PG_FUNCTION_INFO_V1(repmgrd_pause);
+
+Datum		repmgrd_is_paused(PG_FUNCTION_ARGS);
 PG_FUNCTION_INFO_V1(repmgrd_is_paused);
-PG_FUNCTION_INFO_V1(repmgr_get_wal_receiver_pid);
+
+Datum		get_wal_receiver_pid(PG_FUNCTION_ARGS);
+PG_FUNCTION_INFO_V1(get_wal_receiver_pid);
 
 
 /*
@@ -121,47 +152,35 @@ _PG_init(void)
 	if (!process_shared_preload_libraries_in_progress)
 		return;
 
-#if (PG_VERSION_NUM < 150000)
 	RequestAddinShmemSpace(MAXALIGN(sizeof(repmgrdSharedState)));
 
 #if (PG_VERSION_NUM >= 90600)
 	RequestNamedLWLockTranche(TRANCHE_NAME, 1);
 #else
 	RequestAddinLWLocks(1);
-#endif
 #endif
 
 	/*
 	 * Install hooks.
 	 */
-#if (PG_VERSION_NUM >= 150000)
-	prev_shmem_request_hook = shmem_request_hook;
-	shmem_request_hook = repmgr_shmem_request;
-#endif
-
 	prev_shmem_startup_hook = shmem_startup_hook;
 	shmem_startup_hook = repmgr_shmem_startup;
-
 }
 
-#if (PG_VERSION_NUM >= 150000)
+
 /*
- * shmem_requst_hook: request shared memory
+ * Module unload callback
  */
-static void
+void
-repmgr_shmem_request(void)
+_PG_fini(void)
 {
-	if (prev_shmem_request_hook)
+	/* Uninstall hook */
-		prev_shmem_request_hook();
+	shmem_startup_hook = prev_shmem_startup_hook;
-
-	RequestAddinShmemSpace(MAXALIGN(sizeof(repmgrdSharedState)));
-
-	RequestNamedLWLockTranche(TRANCHE_NAME, 1);
 }
-#endif
+
 
 /*
- * shmem_startup hook: allocate or attach to shared memory
+ * shmem_startup hook: allocate or attach to shared memory,
  */
 static void
 repmgr_shmem_startup(void)
@@ -214,7 +233,7 @@ repmgr_shmem_startup(void)
 /* ==================== */
 
 Datum
-repmgr_set_local_node_id(PG_FUNCTION_ARGS)
+set_local_node_id(PG_FUNCTION_ARGS)
 {
 	int			local_node_id = UNKNOWN_NODE_ID;
 	int			stored_node_id = UNKNOWN_NODE_ID;
@@ -284,7 +303,7 @@ repmgr_set_local_node_id(PG_FUNCTION_ARGS)
 
 
 Datum
-repmgr_get_local_node_id(PG_FUNCTION_ARGS)
+get_local_node_id(PG_FUNCTION_ARGS)
 {
 	int			local_node_id = UNKNOWN_NODE_ID;
 
@@ -301,7 +320,7 @@ repmgr_get_local_node_id(PG_FUNCTION_ARGS)
 
 /* update and return last updated with current timestamp */
 Datum
-repmgr_standby_set_last_updated(PG_FUNCTION_ARGS)
+standby_set_last_updated(PG_FUNCTION_ARGS)
 {
 	TimestampTz last_updated = GetCurrentTimestamp();
 
@@ -318,7 +337,7 @@ repmgr_standby_set_last_updated(PG_FUNCTION_ARGS)
 
 /* get last updated timestamp */
 Datum
-repmgr_standby_get_last_updated(PG_FUNCTION_ARGS)
+standby_get_last_updated(PG_FUNCTION_ARGS)
 {
 	TimestampTz last_updated;
 
@@ -335,7 +354,7 @@ repmgr_standby_get_last_updated(PG_FUNCTION_ARGS)
 
 
 Datum
-repmgr_set_upstream_last_seen(PG_FUNCTION_ARGS)
+set_upstream_last_seen(PG_FUNCTION_ARGS)
 {
 	int			upstream_node_id = UNKNOWN_NODE_ID;
 
@@ -358,7 +377,7 @@ repmgr_set_upstream_last_seen(PG_FUNCTION_ARGS)
 
 
 Datum
-repmgr_get_upstream_last_seen(PG_FUNCTION_ARGS)
+get_upstream_last_seen(PG_FUNCTION_ARGS)
 {
 	long		secs;
 	int			microsecs;
@@ -392,7 +411,7 @@ repmgr_get_upstream_last_seen(PG_FUNCTION_ARGS)
 
 
 Datum
-repmgr_get_upstream_node_id(PG_FUNCTION_ARGS)
+get_upstream_node_id(PG_FUNCTION_ARGS)
 {
 	int			upstream_node_id = UNKNOWN_NODE_ID;
 
@@ -407,7 +426,7 @@ repmgr_get_upstream_node_id(PG_FUNCTION_ARGS)
 }
 
 Datum
-repmgr_set_upstream_node_id(PG_FUNCTION_ARGS)
+set_upstream_node_id(PG_FUNCTION_ARGS)
 {
 	int			upstream_node_id = UNKNOWN_NODE_ID;
 	int			local_node_id = UNKNOWN_NODE_ID;
@@ -443,7 +462,7 @@ repmgr_set_upstream_node_id(PG_FUNCTION_ARGS)
 
 
 Datum
-repmgr_notify_follow_primary(PG_FUNCTION_ARGS)
+notify_follow_primary(PG_FUNCTION_ARGS)
 {
 	int			primary_node_id = UNKNOWN_NODE_ID;
 
@@ -486,7 +505,7 @@ repmgr_notify_follow_primary(PG_FUNCTION_ARGS)
 
 
 Datum
-repmgr_get_new_primary(PG_FUNCTION_ARGS)
+get_new_primary(PG_FUNCTION_ARGS)
 {
 	int			new_primary_node_id = UNKNOWN_NODE_ID;
 
@@ -508,7 +527,7 @@ repmgr_get_new_primary(PG_FUNCTION_ARGS)
 
 
 Datum
-repmgr_reset_voting_status(PG_FUNCTION_ARGS)
+reset_voting_status(PG_FUNCTION_ARGS)
 {
 	if (!shared_state)
 		PG_RETURN_NULL();
@@ -716,7 +735,7 @@ repmgrd_is_paused(PG_FUNCTION_ARGS)
 
 
 Datum
-repmgr_get_wal_receiver_pid(PG_FUNCTION_ARGS)
+get_wal_receiver_pid(PG_FUNCTION_ARGS)
 {
 	int wal_receiver_pid;
 

repmgr.conf.sample

@@ -12,7 +12,7 @@
 #
 # For details on the configuration file format see the documentation at:
 #
-#  https://repmgr.org/docs/current/configuration-file.html#CONFIGURATION-FILE-FORMAT
+#   https://repmgr.org/docs/current/configuration-file.html#CONFIGURATION-FILE-FORMAT
 #
 # =============================================================================
 # Required configuration items
@@ -69,14 +69,14 @@
 #------------------------------------------------------------------------------
 
 #replication_user='repmgr'	 # User to make replication connections with, if not set
-				 # defaults to the user defined in "conninfo".
+				 #  defaults to the user defined in "conninfo".
 
 #replication_type='physical'	 # Must "physical" (the default).
 
 #location='default'		 # An arbitrary string defining the location of the node; this
 				 # is used during failover to check visibility of the
 				 # current primary node. For further details see:
-				 #  https://repmgr.org/docs/current/repmgrd-network-split.html
+				 #   https://repmgr.org/docs/current/repmgrd-network-split.html
 
 #use_replication_slots=no	 # whether to use physical replication slots
 				 # NOTE: when using replication slots,
@@ -181,8 +181,8 @@
 
 #pg_ctl_options=''			# Options to append to "pg_ctl"
 #pg_basebackup_options=''		# Options to append to "pg_basebackup"
-					# (Note: when cloning from Barman, repmgr will honour any
+                                        # (Note: when cloning from Barman, repmgr will honour any
-					# --waldir/--xlogdir setting present in "pg_basebackup_options"
+                                        # --waldir/--xlogdir setting present in "pg_basebackup_options"
 #rsync_options=''			# Options to append to "rsync"
 ssh_options='-q -o ConnectTimeout=10'	# Options to append to "ssh"
 
@@ -212,8 +212,8 @@ ssh_options='-q -o ConnectTimeout=10'	# Options to append to "ssh"
 
 #recovery_min_apply_delay=		# If provided, "recovery_min_apply_delay" will be set to
 					# this value (PostgreSQL 9.4 and later). Value can be
-					# an integer representing milliseconds, or a string
+                                        # an integer representing milliseconds, or a string
-					# representing a period of time (e.g. '5 min').
+                                        # representing a period of time (e.g. '5 min').
 
 
 #------------------------------------------------------------------------------
@@ -299,7 +299,7 @@ ssh_options='-q -o ConnectTimeout=10'	# Options to append to "ssh"
 					# a value of zero prevents the node being promoted to primary
 					# (default: 100)
 
-#connection_check_type='ping'		# How to check availability of the upstream node; valid options:
+#connection_check_type=ping		# How to check availability of the upstream node; valid options:
 					#  'ping': use PQping() to check if the node is accepting connections
 					#  'connection': attempt to make a new connection to the node
 					#  'query': execute an SQL statement on the node via the existing connection
@@ -314,7 +314,7 @@ ssh_options='-q -o ConnectTimeout=10'	# Options to append to "ssh"
 #follow_command=''			# command repmgrd executes when instructing a standby to follow a new primary;
 					# use something like:
 					#
-					#     repmgr standby follow -f /etc/repmgr.conf --upstream-node-id=%n
+					#     repmgr standby follow -f /etc/repmgr.conf -W --upstream-node-id=%n
 					#
 #primary_notification_timeout=60	# Interval (in seconds) which repmgrd on a standby
 					# will wait for a notification from the new primary,
@@ -337,34 +337,24 @@ ssh_options='-q -o ConnectTimeout=10'	# Options to append to "ssh"
 					# "--no-pid-file" will force PID file creation to be skipped.
 					# Note: there is normally no need to set this, particularly if
 					# repmgr was installed from packages.
-#repmgrd_exit_on_inactive_node=false	# If "true", and the node record is marked as "inactive", abort repmgrd startup
 #standby_disconnect_on_failover=false	# If "true", in a failover situation wait for all standbys to
 					# disconnect their WAL receivers before electing a new primary
-					# Can be true in PostgreSQL 9.5 and later only. Until PostgreSQL 14 repmgr user must be a superuser to use this.
+					# (PostgreSQL 9.5 and later only; repmgr user must be a superuser for this)
-					# From PostgreSQL 15 repmgr must be a superuser or have 'ALTER SYSTEM wal_retrieve_retry_interval' privilege.
-					# (see: https://repmgr.org/docs/current/repmgrd-standby-disconnection-on-failover.html )
 #sibling_nodes_disconnect_timeout=30	# If "standby_disconnect_on_failover" is true, the maximum length of time
-					# (in seconds) to wait for other standbys to confirm they have disconnected their
+					#  (in seconds) to wait for other standbys to confirm they have disconnected their
 					# WAL receivers
 #primary_visibility_consensus=false	# If "true", only continue with failover if no standbys have seen
 					# the primary node recently. *Must* be the same on all nodes.
 #always_promote=false			# Always promote a node, even if repmgr metadata is outdated
-#failover_validation_command=''	# Script to execute for an external mechanism to validate the failover
+#failover_validation_command=''		# Script to execute for an external mechanism to validate the failover
-					# decision made by repmgrd. Each of the following parameter placeholders
+					# decision made by repmgrd. One or both of the following parameter placeholders
-					# should be provided, which will be replaced by repmgrd with the appropriate value:
+					# should be provided, which will be replaced by repmgrd with the appropriate
-					#   %n (node_id)
+					# value: %n (node_id), %a (node_name). *Must* be the same on all nodes.
-					#   %a (node_name)
-					#   %v (number of visible nodes)
-					#   %u (number of shared upstream nodes)
-					#   %t (total number of nodes)
-					# *Must* be the same on all nodes.
 #election_rerun_interval=15		# if "failover_validation_command" is set, and the command returns
 					# an error, pause the specified amount of seconds before rerunning the election.
-
+					#
-# The following items are relevant for repmgrd running on the primary,
+					# The following items are relevant for repmgrd running on the primary,
-# and will be ignored on non-primary nodes.
+					# and will be ignored on non-primary nodes
-# (see: https://repmgr.org/docs/current/repmgrd-primary-child-disconnection.html )
-
 #child_nodes_check_interval=5		# Interval (in seconds) to check for attached child nodes (standbys)
 #child_nodes_connected_min_count=-1	# Minimum number of child nodes which must remain connected, otherwise
 					# disconnection command will be triggered
@@ -372,7 +362,6 @@ ssh_options='-q -o ConnectTimeout=10'	# Options to append to "ssh"
 					# (ignored if "child_nodes_connected_min_count" set)
 #child_nodes_disconnect_timeout=30	# Interval between child node disconnection and disconnection command execution
 #child_nodes_disconnect_command=''	# Command to execute if child node disconnection detected
-#child_nodes_connected_include_witness=false	# Whether to count the witness node (if in use) as a child node when determining whether to execute child_nodes_disconnect_command.
 
 #------------------------------------------------------------------------------
 # service control commands
@@ -395,20 +384,20 @@ ssh_options='-q -o ConnectTimeout=10'	# Options to append to "ssh"
 #
 # For example, to use systemd, you can set
 #
-#    service_start_command = 'sudo systemctl start postgresql-16'
+#    service_start_command = 'sudo systemctl start postgresql-9.6'
 #    (...)
 #
 # and then use the following sudoers configuration:
 #
 #    # this is required when running sudo over ssh without -t:
 #    Defaults:postgres !requiretty
-#    postgres ALL = NOPASSWD: /usr/bin/systemctl stop postgresql-16, \
+#    postgres ALL = NOPASSWD: /usr/bin/systemctl stop postgresql-9.6, \
-#        /usr/bin/systemctl start postgresql-16, \
+#	/usr/bin/systemctl start postgresql-9.6, \
-#        /usr/bin/systemctl restart postgresql-16
+#	/usr/bin/systemctl restart postgresql-9.6
 #
 # Debian/Ubuntu users: use "sudo pg_ctlcluster" to execute service control commands.
 #
-# For further details, see: https://repmgr.org/docs/current/configuration-file-service-commands.html
+# For more details, see: https://repmgr.org/docs/current/configuration-service-commands.html
 
 #service_start_command = ''
 #service_stop_command = ''
@@ -451,3 +440,4 @@ ssh_options='-q -o ConnectTimeout=10'	# Options to append to "ssh"
 					# "repmgr standby switchover" to warn about potential
 					# issues with shutting down the demotion candidate.
 
+

repmgr.control

@@ -1,7 +1,8 @@
 # repmgr extension
 comment = 'Replication manager for PostgreSQL'
-default_version = '5.4'
+default_version = '5.2'
 module_pathname = '$libdir/repmgr'
 relocatable = false
 schema = repmgr
 
+

repmgr.h

@@ -116,7 +116,6 @@
 #define DEFAULT_STANDBY_FOLLOW_TIMEOUT       30  /* seconds */
 #define DEFAULT_STANDBY_FOLLOW_RESTART       false
 #define DEFAULT_SHUTDOWN_CHECK_TIMEOUT       60  /* seconds */
-#define DEFAULT_STANDBY_PG_BACKUPAPI_OP_TYPE "recovery"
 #define DEFAULT_STANDBY_RECONNECT_TIMEOUT    60  /* seconds */
 #define DEFAULT_NODE_REJOIN_TIMEOUT          60  /* seconds */
 #define DEFAULT_ARCHIVE_READY_WARNING        16  /* WAL files */
@@ -136,7 +135,6 @@
 #define DEFAULT_ASYNC_QUERY_TIMEOUT          60  /* seconds */
 #define DEFAULT_PRIMARY_NOTIFICATION_TIMEOUT 60  /* seconds */
 #define DEFAULT_REPMGRD_STANDBY_STARTUP_TIMEOUT -1 /*seconds */
-#define DEFAULT_REPMGRD_EXIT_ON_INACTIVE_NODE false,
 #define DEFAULT_STANDBY_DISCONNECT_ON_FAILOVER false
 #define DEFAULT_SIBLING_NODES_DISCONNECT_TIMEOUT 30 /* seconds */
 #define DEFAULT_CONNECTION_CHECK_TYPE        CHECK_PING

repmgr_version.h.in

@@ -1,7 +1,5 @@
 #define REPMGR_VERSION_DATE ""
-#define REPMGR_VERSION "5.4dev"
+#define REPMGR_VERSION "5.2.1"
-#define REPMGR_VERSION_NUM 50400
+#define REPMGR_VERSION_NUM 50201
-#define REPMGR_EXTENSION_VERSION "5.4"
+#define REPMGR_RELEASE_DATE "2020-12-07"
-#define REPMGR_EXTENSION_NUM 50400
-#define REPMGR_RELEASE_DATE "2022-XX-XX"
 #define PG_ACTUAL_VERSION_NUM 

repmgrd-physical.c

@@ -169,126 +169,45 @@ handle_sigint_physical(SIGNAL_ARGS)
 /* perform some sanity checks on the node's configuration */
 
 void
-do_physical_node_check(PGconn *conn)
+do_physical_node_check(void)
 {
 	/*
-	 * If node record is "inactive"; if not, attempt to set it to "active".
+	 * Check if node record is active - if not, and `failover=automatic`, the
+	 * node won't be considered as a promotion candidate; this often happens
+	 * when a failed primary is recloned and the node was not re-registered,
+	 * giving the impression failover capability is there when it's not. In
+	 * this case abort with an error and a hint about registering.
 	 *
-	 * Usually it will have become inactive due to e.g. a standby being shut down
+	 * If `failover=manual`, repmgrd can continue to passively monitor the
-	 * while repmgrd was running in an unpaused state. In this case it's
+	 * node, but we should nevertheless issue a warning and the same hint.
-	 * perfectly reasonable to automatically mark the node as "active".
 	 */
 
 	if (local_node_info.active == false)
 	{
 		char	   *hint = "Check that \"repmgr (primary|standby) register\" was executed for this node";
-		RecoveryType recovery_type = get_recovery_type(conn);
 
-		/*
+		switch (config_file_options.failover)
-		 * If the local node's recovery status is incompatible with its registered
-		 * status, e.g. registered as primary but running as a standby, refuse to start.
-		 *
-		 * This typically happens when a failed primary is recloned but the node was not
-		 * re-registered, leaving the cluster in a potentially ambiguous state. In
-		 * this case it would not be possible or desirable to attempt to set the
-		 * node to active; the user should ensure the cluster is in the correct state.
-		 */
-		if (recovery_type != RECTYPE_UNKNOWN && local_node_info.type != UNKNOWN)
 		{
-			bool	require_reregister = false;
+			/* "failover" is an enum, all values should be covered here */
-			PQExpBufferData event_details;
-			initPQExpBuffer(&event_details);
 
-			if (recovery_type == RECTYPE_STANDBY && local_node_info.type != STANDBY)
+			case FAILOVER_AUTOMATIC:
-			{
+				log_error(_("this node is marked as inactive and cannot be used as a failover target"));
-				appendPQExpBuffer(&event_details,
-								  _("node is registered as a %s but running as a standby"),
-								  get_node_type_string(local_node_info.type));
-
-				require_reregister = true;
-			}
-			else if (recovery_type == RECTYPE_PRIMARY && local_node_info.type == STANDBY)
-			{
-				log_error(_("node is registered as a standby but running as a %s"), get_node_type_string(local_node_info.type));
-				require_reregister = true;
-			}
-
-			if (require_reregister == true)
-			{
-				log_error("%s", event_details.data);
 				log_hint(_("%s"), hint);
 
 				create_event_notification(NULL,
 										  &config_file_options,
 										  config_file_options.node_id,
-										  "repmgrd_start",
+										  "repmgrd_shutdown",
 										  false,
-										  event_details.data);
+										  "node is inactive and cannot be used as a failover target");
 
-				termPQExpBuffer(&event_details);
 				terminate(ERR_BAD_CONFIG);
-			}
+				break;
 
-			termPQExpBuffer(&event_details);
+			case FAILOVER_MANUAL:
-		}
+				log_warning(_("this node is marked as inactive and will be passively monitored only"));
-
+				log_hint(_("%s"), hint);
-		/*
+				break;
-		 * Attempt to set node record active (unless explicitly configured not to)
-		 */
-		log_notice(_("setting node record for node \"%s\" (ID: %i) to \"active\""),
-				   local_node_info.node_name,
-				   local_node_info.node_id);
-
-		if (config_file_options.repmgrd_exit_on_inactive_node == false)
-		{
-			PGconn *primary_conn = get_primary_connection(conn, NULL, NULL);
-			bool	success = true;
-
-			if (PQstatus(primary_conn) != CONNECTION_OK)
-			{
-				log_error(_("unable to connect to the primary node to activate the node record"));
-				success = false;
-			}
-			else
-			{
-				success = update_node_record_set_active(primary_conn, local_node_info.node_id, true);
-				PQfinish(primary_conn);
-			}
-
-			if (success == true)
-			{
-				local_node_info.active = true;
-			}
-		}
-
-		/*
-		 * Corner-case where it was not possible to set the node to "active"
-		 */
-		if (local_node_info.active == false)
-		{
-			switch (config_file_options.failover)
-			{
-				/* "failover" is an enum, all values should be covered here */
-
-				case FAILOVER_AUTOMATIC:
-					log_error(_("this node is marked as inactive and cannot be used as a failover target"));
-					log_hint(_("%s"), hint);
-
-					create_event_notification(NULL,
-											  &config_file_options,
-											  config_file_options.node_id,
-											  "repmgrd_start",
-											  false,
-											  "node is inactive and cannot be used as a failover target");
-
-					terminate(ERR_BAD_CONFIG);
-					break;
-
-				case FAILOVER_MANUAL:
-					log_warning(_("this node is marked as inactive and will be passively monitored only"));
-					log_hint(_("%s"), hint);
-					break;
-			}
 		}
 	}
 
@@ -585,7 +504,6 @@ monitor_streaming_primary(void)
 
 			if (is_server_available(local_node_info.conninfo) == true)
 			{
-				close_connection(&local_conn);
 				local_conn = establish_db_connection(local_node_info.conninfo, false);
 
 				if (PQstatus(local_conn) != CONNECTION_OK)
@@ -1587,22 +1505,22 @@ monitor_streaming_standby(void)
 					/* TODO: possibly add pre-action event here */
 					if (upstream_node_info.type == STANDBY)
 					{
-						create_event_notification(primary_conn,
+						create_event_record(primary_conn,
-												  &config_file_options,
+											&config_file_options,
-												  config_file_options.node_id,
+											config_file_options.node_id,
-												  "repmgrd_upstream_disconnect",
+											"repmgrd_upstream_disconnect",
-												  true,
+											true,
-												  event_details.data);
+											event_details.data);
 					}
 					else
 					{
 						/* primary connection lost - script notification only */
-						create_event_notification(NULL,
+						create_event_record(NULL,
-												  &config_file_options,
+											&config_file_options,
-												  config_file_options.node_id,
+											config_file_options.node_id,
-												  "repmgrd_upstream_disconnect",
+											"repmgrd_upstream_disconnect",
-												  true,
+											true,
-												  event_details.data);
+											event_details.data);
 					}
 
 					log_warning("%s", event_details.data);
@@ -1814,10 +1732,7 @@ monitor_streaming_standby(void)
 			if (upstream_check_result == true)
 			{
 				if (config_file_options.connection_check_type != CHECK_QUERY)
-				{
-					close_connection(&upstream_conn);
 					upstream_conn = establish_db_connection(upstream_node_info.conninfo, false);
-				}
 
 				if (PQstatus(upstream_conn) == CONNECTION_OK)
 				{
@@ -1898,7 +1813,6 @@ monitor_streaming_standby(void)
 						int			former_upstream_node_id = local_node_info.upstream_node_id;
 						NodeInfoList sibling_nodes = T_NODE_INFO_LIST_INITIALIZER;
 						PQExpBufferData event_details;
-						t_event_info event_info = T_EVENT_INFO_INITIALIZER;
 
 						update_node_record_set_primary(local_conn,  local_node_info.node_id);
 						record_status = get_node_record(local_conn, local_node_info.node_id, &local_node_info);
@@ -1911,16 +1825,12 @@ monitor_streaming_standby(void)
 						initPQExpBuffer(&event_details);
 						appendPQExpBufferStr(&event_details,
 											 _("promotion command failed but promotion completed successfully"));
-
+						create_event_notification(local_conn,
-						event_info.node_id = former_upstream_node_id;
+												  &config_file_options,
-
+												  local_node_info.node_id,
-						create_event_notification_extended(local_conn,
+												  "repmgrd_failover_promote",
-														   &config_file_options,
+												  true,
-														   local_node_info.node_id,
+												  event_details.data);
-														   "repmgrd_failover_promote",
-														   true,
-														   event_details.data,
-														   &event_info);
 
 						termPQExpBuffer(&event_details);
 
@@ -2382,29 +2292,6 @@ monitor_streaming_witness(void)
 			log_warning(_("unable to retrieve node record from primary"));
 		}
 
-		/* refresh local node record from the primary */
-		record_status = get_node_record(primary_conn, config_file_options.node_id, &local_node_info);
-
-		if (record_status != RECORD_FOUND)
-		{
-			log_error(_("no metadata record found for this node on the current primary - terminating"));
-			log_hint(_("check that 'repmgr witness register' was executed for this node"));
-			close_connection(&primary_conn);
-			close_connection(&local_conn);
-			terminate(ERR_BAD_CONFIG);
-		}
-
-		/*
-		 * It's possible that the primary changed while the witness repmgrd was not
-		 * running. This does not affect the functionality of the witness repmgrd, but
-		 * does mean outdated node metadata will be displayed, so update that.
-		 */
-		if (local_node_info.upstream_node_id != primary_node_id)
-		{
-			update_node_record_set_upstream(primary_conn, local_node_info.node_id, primary_node_id);
-			local_node_info.upstream_node_id = primary_node_id;
-		}
-
 		initPQExpBuffer(&event_details);
 
 		appendPQExpBuffer(&event_details,
@@ -2493,12 +2380,12 @@ monitor_streaming_witness(void)
 									  _("unable to connect to primary node \"%s\" (ID: %i)"),
 									  upstream_node_info.node_name, upstream_node_info.node_id);
 
-					create_event_notification(NULL,
+					create_event_record(NULL,
-											  &config_file_options,
+										&config_file_options,
-											  config_file_options.node_id,
+										config_file_options.node_id,
-											  "repmgrd_upstream_disconnect",
+										"repmgrd_upstream_disconnect",
-											  true,
+										true,
-											  event_details.data);
+										event_details.data);
 					termPQExpBuffer(&event_details);
 				}
 
@@ -2573,10 +2460,8 @@ monitor_streaming_witness(void)
 			if (check_upstream_connection(&primary_conn, upstream_node_info.conninfo, NULL) == true)
 			{
 				if (config_file_options.connection_check_type != CHECK_QUERY)
-				{
-					close_connection(&primary_conn);
 					primary_conn = establish_db_connection(upstream_node_info.conninfo, false);
-				}
+
 				if (PQstatus(primary_conn) == CONNECTION_OK)
 				{
 					PQExpBufferData event_details;
@@ -2873,7 +2758,6 @@ do_primary_failover(void)
 	bool final_result = false;
 	NodeInfoList sibling_nodes = T_NODE_INFO_LIST_INITIALIZER;
 	int new_primary_id = UNKNOWN_NODE_ID;
-	bool standby_disconnect_on_failover = false;
 
 	/*
 	 * Double-check status of the local connection
@@ -2886,20 +2770,20 @@ do_primary_failover(void)
 	 */
 	if (config_file_options.standby_disconnect_on_failover == true)
 	{
-		/*
+		NodeInfoListCell *cell = NULL;
-		 * Determine whether we can actually disable the walsender; this depends
+		NodeInfoList check_sibling_nodes = T_NODE_INFO_LIST_INITIALIZER;
-		 * on PostgreSQL version and user permissions.
+		int i;
-		 */
-		standby_disconnect_on_failover = can_disable_walsender(local_conn);
 
-		if (standby_disconnect_on_failover == true)
+		bool sibling_node_wal_receiver_connected = false;
+
+		if (PQserverVersion(local_conn) < 90500)
+		{
+			log_warning(_("\"standby_disconnect_on_failover\" specified, but not available for this PostgreSQL version"));
+			/* TODO: format server version */
+			log_detail(_("available from PostgreSQL 9.5, this PostgreSQL version is %i"), PQserverVersion(local_conn));
+		}
+		else
 		{
-			NodeInfoListCell *cell = NULL;
-			NodeInfoList check_sibling_nodes = T_NODE_INFO_LIST_INITIALIZER;
-			int i;
-
-			bool sibling_node_wal_receiver_connected = false;
-
 			disable_wal_receiver(local_conn);
 
 			/*
@@ -2983,7 +2867,7 @@ do_primary_failover(void)
 	log_debug("election result: %s", _print_election_result(election_result));
 
 	/* Reenable WAL receiver, if disabled */
-	if (standby_disconnect_on_failover == true)
+	if (config_file_options.standby_disconnect_on_failover == true)
 	{
 		/* adjust "wal_retrieve_retry_interval" but don't wait for WAL receiver to start */
 		enable_wal_receiver(local_conn, false);
@@ -3091,6 +2975,7 @@ do_primary_failover(void)
 
 				t_node_info new_primary = T_NODE_INFO_INITIALIZER;
 				RecordStatus record_status = RECORD_NOT_FOUND;
+				PGconn	   *new_primary_conn;
 
 				record_status = get_node_record(local_conn, new_primary_id, &new_primary);
 
@@ -3102,7 +2987,6 @@ do_primary_failover(void)
 				else
 				{
 					PQExpBufferData event_details;
-					PGconn	   *new_primary_conn;
 
 					initPQExpBuffer(&event_details);
 					appendPQExpBuffer(&event_details,
@@ -3123,6 +3007,7 @@ do_primary_failover(void)
 											  event_details.data);
 					close_connection(&new_primary_conn);
 					termPQExpBuffer(&event_details);
+
 				}
 				failover_state = FAILOVER_STATE_REQUIRES_MANUAL_FAILOVER;
 			}
@@ -3789,7 +3674,6 @@ promote_self(void)
 
 	{
 		PQExpBufferData event_details;
-		t_event_info event_info = T_EVENT_INFO_INITIALIZER;
 
 		/* update own internal node record */
 		record_status = get_node_record(local_conn, local_node_info.node_id, &local_node_info);
@@ -3806,16 +3690,13 @@ promote_self(void)
 						  failed_primary.node_name,
 						  failed_primary.node_id);
 
-		event_info.node_id = failed_primary.node_id;
-
 		/* local_conn is now the primary connection */
-		create_event_notification_extended(local_conn,
+		create_event_notification(local_conn,
-										   &config_file_options,
+								  &config_file_options,
-										   local_node_info.node_id,
+								  local_node_info.node_id,
-										   "repmgrd_failover_promote",
+								  "repmgrd_failover_promote",
-										   true,
+								  true,
-										   event_details.data,
+								  event_details.data);
-										   &event_info);
 
 		termPQExpBuffer(&event_details);
 	}

repmgrd-physical.h

@@ -19,7 +19,7 @@
 #ifndef _REPMGRD_PHYSICAL_H_
 #define _REPMGRD_PHYSICAL_H_
 
-void		do_physical_node_check(PGconn *conn);
+void		do_physical_node_check(void);
 
 void		monitor_streaming_primary(void);
 void		monitor_streaming_standby(void);

repmgrd.c

@@ -396,14 +396,13 @@ main(int argc, char **argv)
 		 * extension is the latest available according to "pg_available_extensions" -
 		 * - does our (major) version match that?
 		 */
-		log_verbose(LOG_DEBUG, "expected extension version: %i; extension version: %i",
+		log_verbose(LOG_DEBUG, "binary version: %i; extension version: %i",
-					REPMGR_EXTENSION_NUM, extversions.installed_version_num);
+					REPMGR_VERSION_NUM, extversions.installed_version_num);
-		if ((REPMGR_EXTENSION_NUM/100) < (extversions.installed_version_num / 100))
+		if ((REPMGR_VERSION_NUM/100) < (extversions.installed_version_num / 100))
 		{
 			log_error(_("this \"repmgr\" version is older than the installed \"repmgr\" extension version"));
-			log_detail(_("\"repmgr\" version %s providing extension version %s is installed but extension is version %s"),
+			log_detail(_("\"repmgr\" version %s is installed but extension is version %s"),
 					   REPMGR_VERSION,
-					   REPMGR_EXTENSION_VERSION,
 					   extversions.installed_version);
 			log_hint(_("update the repmgr binaries to match the installed extension version"));
 
@@ -411,12 +410,11 @@ main(int argc, char **argv)
 			exit(ERR_BAD_CONFIG);
 		}
 
-		if ((REPMGR_EXTENSION_NUM/100) > (extversions.installed_version_num / 100))
+		if ((REPMGR_VERSION_NUM/100) > (extversions.installed_version_num / 100))
 		{
 			log_error(_("this \"repmgr\" version is newer than the installed \"repmgr\" extension version"));
-			log_detail(_("\"repmgr\" version %s providing extension version %s is installed but extension is version %s"),
+			log_detail(_("\"repmgr\" version %s is installed but extension is version %s"),
 					   REPMGR_VERSION,
-					   REPMGR_EXTENSION_VERSION,
 					   extversions.installed_version);
 			log_hint(_("update the installed extension version by executing \"ALTER EXTENSION repmgr UPDATE\" in the repmgr database"));
 
@@ -479,7 +477,7 @@ main(int argc, char **argv)
 		switch (config_file_options.replication_type)
 		{
 			case REPLICATION_TYPE_PHYSICAL:
-				log_hint(_("check that 'repmgr (primary|standby|witness) register' was executed for this node"));
+				log_hint(_("check that 'repmgr (primary|standby) register' was executed for this node"));
 				break;
 		}
 
@@ -512,7 +510,7 @@ main(int argc, char **argv)
 		log_debug("node id is %i, upstream node id is %i",
 				  local_node_info.node_id,
 				  local_node_info.upstream_node_id);
-		do_physical_node_check(local_conn);
+		do_physical_node_check();
 	}
 
 	if (daemonize == true)

strutil.c

@@ -369,6 +369,7 @@ check_status_list_free(CheckStatusList *list)
 }
 
 
+
 const char *
 output_check_status(CheckStatus status)
 {