Replace 9.4 with 10, as that's the minimal version we support now with 5.4.1

Signed-off-by: Martín Marqués <martin.marques@enterprisedb.com>

.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,4 +1,4 @@
-5.4.1   2023-??-??
+5.4.1   2023-07-04
         repmgrd: ensure witness node metadata is updated (Ian)
 
 5.4.0   2023-03-16

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
-10 to 16.
+The most recent `repmgr` version (5.3.2) supports all PostgreSQL versions from
+9.5 to 15. PostgreSQL 9.4 is also supported, with some restrictions.
 
 `repmgr` is distributed under the GNU GPL 3 and maintained by EnterpriseDB.
 
@@ -56,6 +56,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
@@ -67,14 +69,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

configure.in

@@ -1,8 +1,8 @@
-AC_INIT([repmgr], [5.4.0], [repmgr@googlegroups.com], [repmgr], [https://repmgr.org/])
+AC_INIT([repmgr],[5.4.1],[repmgr@googlegroups.com],[repmgr],[https://www.repmgr.org/])
 
 AC_COPYRIGHT([Copyright (c) 2010-2021, EnterpriseDB Corporation])
 
-AC_CONFIG_HEADER(config.h)
+AC_CONFIG_HEADERS([config.h])
 
 AC_ARG_VAR([PG_CONFIG], [Location to find pg_config for target PostgreSQL (default PATH)])
 

dbutils.c

@@ -1852,51 +1852,6 @@ get_wal_receiver_pid(PGconn *conn)
 /* =============================== */
 
 
-/*
- * 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)
 {
@@ -1958,47 +1913,15 @@ can_disable_walsender(PGconn *conn)
 	if (is_superuser_connection(conn, NULL) == true)
 		return true;
 
-	PQExpBufferData query;
-	PGresult   *res;
-	bool		has_alter_system_priv = false;
+	/*
+	 * As of PostgreSQL 14, it is not possible for a non-superuser
+	 * to execute ALTER SYSTEM, so further checks are superfluous.
+	 * This will need modifying for PostgreSQL 15.
+	 */
+	log_warning(_("\"standby_disconnect_on_failover\" specified, but repmgr user is not a superuser"));
+	log_detail(_("superuser permission required to disable standbys on failover"));
 
-	/* 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;
+	return false;
 }
 
 /*
@@ -2024,13 +1947,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);
 	}
@@ -2537,10 +2460,7 @@ get_repmgr_extension_status(PGconn *conn, t_extension_versions *extversions)
 /* node management functions */
 /* ========================= */
 
-/*
- * Assumes the connection can execute CHECKPOINT command.
- * A check can be executed via 'can_execute_checkpoint' function.
- */
+/* assumes superuser connection */
 void
 checkpoint(PGconn *conn)
 {

dbutils.h

@@ -453,7 +453,6 @@ 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);

doc/appendix-release-notes.xml

@@ -18,9 +18,9 @@
   <!-- remember to update the release date in ../repmgr_version.h.in -->
   <sect1 id="release-5.4.1">
     <title id="release-current">Release 5.4.1</title>
-    <para><emphasis>??? ?? ??????, 202?</emphasis></para>
+    <para><emphasis>Tue 04 July, 2023</emphasis></para>
     <para>
-      &repmgr; 5.4.1 is a minor release providing ...
+      &repmgr; 5.4.1 is a minor release providing a fix for witness metadata update
     </para>
     <sect2>
       <title>Bug fixes</title>

doc/configuration-permissions.xml

@@ -79,10 +79,6 @@
         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>
@@ -152,8 +148,6 @@
               <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>,
@@ -165,10 +159,8 @@
             <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
+              <filename>repmgr.conf</filename>. <command>ALTER SYSTEM</command> can only be executed by
               a superuser; if the &repmgr; user is not a superuser, this functionality will not be available.
-              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>

doc/install-requirements.xml

@@ -14,7 +14,7 @@
   </para>
 
   <para>
-   &repmgr; &repmgrversion; is compatible with all PostgreSQL versions from 9.4. See
+   &repmgr; &repmgrversion; is compatible with all PostgreSQL versions from 10. See
    section <link linkend="install-compatibility-matrix">&repmgr; compatibility matrix</link>
    for an overview of version compatibility.
   </para>
@@ -120,13 +120,13 @@
               &repmgr; 5.4
             </entry>
             <entry>
-              (dev)
+              YES
             </entry>
             <entry>
               <link linkend="release-current">&repmgrversion;</link> (&releasedate;)
             </entry>
             <entry>
-              9.4, 9.5, 9.6, 10, 11, 12, 13, 15
+              10, 11, 12, 13, 14, 15, 16
             </entry>
             <entry>
               &nbsp;

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>
-            predefined role removes the need for superuser permissions to perform <command>CHECKPOINT</command> command.
+             <command>CHECKPOINT</command> command.
           </para>
         </listitem>
      </varlistentry>

doc/repmgr-standby-switchover.xml

@@ -79,8 +79,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>
-      predefined role removes the need for superuser permissions to perform <command>CHECKPOINT</command> command.
+      provided with the <option>-S</option>/<option>--superuser</option> option.
     </para>
     <para>
       If &repmgr; is unable to execute the <command>CHECKPOINT</command> command, the switchover

doc/repmgr.xml

@@ -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 10 - PostgreSQL 16.
    </para>
    <para>
      &repmgr; is being continually developed and we strongly recommend using the

doc/repmgrd-automatic-failover.xml

@@ -279,9 +279,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.
-      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>.
+      Additionally this requires that the <literal>repmgr</literal> database user is a superuser.
     </para>
   </note>
   <para>

repmgr-action-node.c

@@ -2365,25 +2365,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 or grant pg_checkpoint role to repmgr user"));
-			}
-			else
-			{
-				log_hint(_("provide a superuser with -S/--superuser"));
-			}
+			log_hint(_("provide a superuser with -S/--superuser"));
 		}
 		else
 		{

repmgr-action-standby.c

@@ -5288,7 +5288,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 +5297,7 @@ do_standby_switchover(void)
 		}
 		else
 		{
-			log_warning(_("no authorized 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"));
-			}
+			log_warning(_("no superuser connection available, unable to issue CHECKPOINT"));
 		}
 	}
 

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
@@ -76,7 +76,7 @@
 #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
-					# --waldir/--xlogdir setting present in "pg_basebackup_options"
+                                        # (Note: when cloning from Barman, repmgr will honour any
+                                        # --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
-					# representing a period of time (e.g. '5 min').
+                                        # an integer representing milliseconds, or a string
+                                        # 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
@@ -340,31 +340,22 @@ ssh_options='-q -o ConnectTimeout=10'	# Options to append to "ssh"
 #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.
-					# 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 )
+					# (PostgreSQL 9.5 and later only; repmgr user must be a superuser for this)
 #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
-					# decision made by repmgrd. Each of the following parameter placeholders
-					# should be provided, which will be replaced by repmgrd with the appropriate value:
-					#   %n (node_id)
-					#   %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.
+#failover_validation_command=''		# Script to execute for an external mechanism to validate the failover
+					# 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: %n (node_id), %a (node_name). *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,
-# and will be ignored on non-primary nodes.
-# (see: https://repmgr.org/docs/current/repmgrd-primary-child-disconnection.html )
-
+					#
+					# The following items are relevant for repmgrd running on the primary,
+					# and will be ignored on non-primary nodes
 #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 +363,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 +385,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, \
-#        /usr/bin/systemctl start postgresql-16, \
-#        /usr/bin/systemctl restart postgresql-16
+#    postgres ALL = NOPASSWD: /usr/bin/systemctl stop postgresql-9.6, \
+#	/usr/bin/systemctl start postgresql-9.6, \
+#	/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-file-service-commands.html
 
 #service_start_command = ''
 #service_stop_command = ''
@@ -451,3 +441,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_version.h.in

@@ -1,7 +1,7 @@
 #define REPMGR_VERSION_DATE ""
-#define REPMGR_VERSION "5.4dev"
-#define REPMGR_VERSION_NUM 50400
+#define REPMGR_VERSION "5.4.1"
+#define REPMGR_VERSION_NUM 50401
 #define REPMGR_EXTENSION_VERSION "5.4"
 #define REPMGR_EXTENSION_NUM 50400
-#define REPMGR_RELEASE_DATE "2022-XX-XX"
+#define REPMGR_RELEASE_DATE "2023-07-04"
 #define PG_ACTUAL_VERSION_NUM