4.4beta2

This ensures the provided path matches the path PostgreSQL reports as its
data directory.

HISTORY

@@ -6,6 +6,8 @@
           an existing directory is being overwritten (Ian)
         repmgr: improve "--dry-run" behaviour for "standby promote" and
           "standby switchover" (Ian)
+        repmgr: when running "standby clone" with the "--upstream-conninfo" option
+          ensure that "application_name" is set correctly in "primary_conninfo" (Ian)
         repmgr: ensure "--dry-run" together with --force when running "standby clone"
           in barman mode does not modify an existing data directory (Ian)
         repmgr: improve "--dry-run" output when running "standby clone" in
@@ -21,6 +23,7 @@
         repmgr: prevent a witness server being registered on the cluster primary (John)
         repmgr: ensure BDR2-specific functionality cannot be used on
           BDR3 and later (Ian)
+        repmgr: canonicalize the data directory path (Ian)
         repmgrd: monitor standbys attached to primary (Ian)
         repmgrd: add "primary visibility consensus" functionality (Ian)
         repmgrd: fix memory leak which occurs while the monitored PostgreSQL

configfile.c

@@ -502,10 +502,15 @@ _parse_config(t_configuration_options *options, ItemList *error_list, ItemList *
 		else if (strcmp(name, "conninfo") == 0)
 			strncpy(options->conninfo, value, MAXLEN);
 		else if (strcmp(name, "data_directory") == 0)
+		{
 			strncpy(options->data_directory, value, MAXPGPATH);
+			canonicalize_path(options->data_directory);
+		}
 		else if (strcmp(name, "config_directory") == 0)
+		{
 			strncpy(options->config_directory, value, MAXPGPATH);
-
+			canonicalize_path(options->config_directory);
+		}
 		else if (strcmp(name, "replication_user") == 0)
 		{
 			if (strlen(value) < sizeof(options->replication_user))

dbutils.c

@@ -2092,9 +2092,9 @@ get_repmgr_extension_status(PGconn *conn, t_extension_versions *extversions)
 	appendPQExpBufferStr(&query,
 						 "	  SELECT ae.name, e.extname, "
 						 "           ae.default_version, "
-						 "           (((ae.default_version::NUMERIC::INT) * 10000) + (ae.default_version::NUMERIC - ae.default_version::NUMERIC::INT) * 1000)::INT AS available, "
+						 "           (((FLOOR(ae.default_version::NUMERIC)::INT) * 10000) + (ae.default_version::NUMERIC - FLOOR(ae.default_version::NUMERIC)::INT) * 1000)::INT AS available, "
 						 "           ae.installed_version, "
-						 "           (((ae.installed_version::NUMERIC::INT) * 10000) + (ae.installed_version::NUMERIC - ae.installed_version::NUMERIC::INT) * 1000)::INT AS installed "
+						 "           (((FLOOR(ae.installed_version::NUMERIC)::INT) * 10000) + (ae.installed_version::NUMERIC - FLOOR(ae.installed_version::NUMERIC)::INT) * 1000)::INT AS installed "
 						 "     FROM pg_catalog.pg_available_extensions ae "
 						 "LEFT JOIN pg_catalog.pg_extension e "
 						 "       ON e.extname=ae.name "

doc/appendix-release-notes.xml

@@ -221,6 +221,14 @@
             </para>
           </listitem>
 
+		  <listitem>
+			<para>
+              &repmgr;: when executing <link linkend="repmgr-standby-clone"><command>repmgr standby clone</command></link>
+              with the <option>--upstream-conninfo</option>, ensure that <varname>application_name</varname>
+              is set correctly in <varname>primary_conninfo</varname>.
+            </para>
+          </listitem>
+
 		  <listitem>
 			<para>
               &repmgr;: when executing <link linkend="repmgr-standby-switchover"><command>repmgr standby switchover</command></link>,
@@ -229,6 +237,16 @@
 			</para>
 		  </listitem>
 
+          <listitem>
+            <para>
+              &repmgr;: canonicalize the data directory path when parsing the configuration file, so
+              the provided path matches the path PostgreSQL reports as its data directory.
+              Otherwise, if e.g. the data directory is configured with a trailing slash,
+              <link linkend="repmgr-node-check"><command>repmgr node check --data-directory-config</command></link>
+              will return a spurious error.
+            </para>
+          </listitem>
+
 		  <listitem>
 			<para>
               &repmgrd;: fix memory leak which occurs while the monitored PostgreSQL node is <emphasis>not</emphasis>

doc/configuration-file-required-settings.xml

@@ -96,33 +96,6 @@
   </variablelist>
  </para>
 
-  <para>
-    For a full list of annotated configuration items, see the file
-    <ulink url="https://raw.githubusercontent.com/2ndQuadrant/repmgr/master/repmgr.conf.sample">repmgr.conf.sample</ulink>.
-  </para>
-  <para>
-    For &repmgrd;-specific settings, see <xref linkend="repmgrd-configuration"/>.
-  </para>
 
-  <note>
-    <para>
-    The following parameters in the configuration file can be overridden with
-    command line options:
-    <itemizedlist>
-     <listitem>
-       <simpara>
-         <literal>-L/--log-level</literal> overrides <literal>log_level</literal> in
-         <filename>repmgr.conf</filename>
-       </simpara>
-     </listitem>
-     <listitem>
-       <simpara>
-         <literal>-b/--pg_bindir</literal> overrides <literal>pg_bindir</literal> in
-         <filename>repmgr.conf</filename>
-       </simpara>
-     </listitem>
-    </itemizedlist>
-    </para>
-  </note>
 
 </sect1>

doc/configuration-file.xml

@@ -62,6 +62,70 @@ data_directory = /var/lib/pgsql/11/data</programlisting>
   </sect2>
 
 
+  <sect2 id="configuration-file-items" xreflabel="configuration file items">
+
+    <title>Configuration file items</title>
+    <para>
+      The following sections document some sections of the configuration file:
+       <itemizedlist>
+          <listitem>
+            <simpara>
+              <xref linkend="configuration-file-settings"/>
+            </simpara>
+          </listitem>
+
+          <listitem>
+            <simpara>
+              <xref linkend="configuration-file-optional-settings"/>
+            </simpara>
+          </listitem>
+
+          <listitem>
+            <simpara>
+              <xref linkend="configuration-file-log-settings"/>
+            </simpara>
+          </listitem>
+
+
+          <listitem>
+            <simpara>
+              <xref linkend="configuration-file-service-commands"/>
+            </simpara>
+          </listitem>
+
+       </itemizedlist>
+
+    </para>
+    <para>
+      For a full list of annotated configuration items, see the file
+      <ulink url="https://raw.githubusercontent.com/2ndQuadrant/repmgr/master/repmgr.conf.sample">repmgr.conf.sample</ulink>.
+    </para>
+    <para>
+      For &repmgrd;-specific settings, see <xref linkend="repmgrd-configuration"/>.
+    </para>
+
+    <note>
+      <para>
+        The following parameters in the configuration file can be overridden with
+        command line options:
+        <itemizedlist>
+          <listitem>
+            <simpara>
+              <literal>-L/--log-level</literal> overrides <literal>log_level</literal> in
+              <filename>repmgr.conf</filename>
+            </simpara>
+          </listitem>
+          <listitem>
+            <simpara>
+              <literal>-b/--pg_bindir</literal> overrides <literal>pg_bindir</literal> in
+              <filename>repmgr.conf</filename>
+            </simpara>
+          </listitem>
+        </itemizedlist>
+      </para>
+    </note>
+
+  </sect2>
 
   <sect2 id="configuration-file-location" xreflabel="configuration file location">
   <title>Configuration file location</title>

doc/configuration.xml

@@ -305,6 +305,7 @@
 
   &configuration-file;
   &configuration-file-required-settings;
+  &configuration-file-optional-settings;
   &configuration-file-log-settings;
   &configuration-file-service-commands;
 

doc/filelist.xml

@@ -18,6 +18,7 @@
 <!ENTITY configuration      SYSTEM "configuration.xml">
 <!ENTITY configuration-file      SYSTEM "configuration-file.xml">
 <!ENTITY configuration-file-required-settings      SYSTEM "configuration-file-required-settings.xml">
+<!ENTITY configuration-file-optional-settings      SYSTEM "configuration-file-optional-settings.xml">
 <!ENTITY configuration-file-log-settings      SYSTEM "configuration-file-log-settings.xml">
 <!ENTITY configuration-file-service-commands   SYSTEM "configuration-file-service-commands.xml">
 <!ENTITY cloning-standbys  SYSTEM "cloning-standbys.xml">

doc/repmgr-standby-clone.xml

@@ -326,9 +326,13 @@
         <term><option>--upstream-conninfo</option></term>
         <listitem>
           <para>
-            <literal>primary_conninfo</literal> value to write in recovery.conf
+            <literal>primary_conninfo</literal> value to write in <filename>recovery.conf</filename>
             when the intended upstream server does not yet exist.
           </para>
+          <para>
+            Note that &repmgr; may modify the provided value, in particular to set the
+            correct <literal>application_name</literal>.
+          </para>
         </listitem>
       </varlistentry>
 

doc/repmgrd-automatic-failover.xml

@@ -55,7 +55,7 @@
    </para>
  </note>
  <para>
-   For more complex replication scenarios,e.g. with multiple datacentres, it may
+   For more complex replication scenarios, e.g. with multiple datacentres, it may
    be preferable to use location-based failover, which ensures that only nodes
    in the same location as the primary will ever be promotion candidates;
    see <xref linkend="repmgrd-network-split"/> for more details.

repmgr--4.0.sql

@@ -78,8 +78,6 @@ CREATE VIEW repmgr.show_nodes AS
 LEFT JOIN repmgr.nodes un
        ON un.node_id = n.upstream_node_id;
 
-
-/* XXX update upgrade scripts! */
 CREATE TABLE repmgr.voting_term (
   term INT NOT NULL
 );

repmgr--4.1.sql

@@ -78,8 +78,6 @@ CREATE VIEW repmgr.show_nodes AS
 LEFT JOIN repmgr.nodes un
        ON un.node_id = n.upstream_node_id;
 
-
-/* XXX update upgrade scripts! */
 CREATE TABLE repmgr.voting_term (
   term INT NOT NULL
 );

repmgr--4.2.sql

@@ -78,8 +78,6 @@ CREATE VIEW repmgr.show_nodes AS
 LEFT JOIN repmgr.nodes un
        ON un.node_id = n.upstream_node_id;
 
-
-/* XXX update upgrade scripts! */
 CREATE TABLE repmgr.voting_term (
   term INT NOT NULL
 );

repmgr--4.3.sql

@@ -78,8 +78,6 @@ CREATE VIEW repmgr.show_nodes AS
 LEFT JOIN repmgr.nodes un
        ON un.node_id = n.upstream_node_id;
 
-
-/* XXX update upgrade scripts! */
 CREATE TABLE repmgr.voting_term (
   term INT NOT NULL
 );

repmgr--4.4.sql

@@ -78,8 +78,6 @@ CREATE VIEW repmgr.show_nodes AS
 LEFT JOIN repmgr.nodes un
        ON un.node_id = n.upstream_node_id;
 
-
-/* XXX update upgrade scripts! */
 CREATE TABLE repmgr.voting_term (
   term INT NOT NULL
 );

repmgr-action-standby.c

@@ -112,7 +112,7 @@ static void get_barman_property(char *dst, char *name, char *local_repmgr_direct
 static int	get_tablespace_data_barman(char *, TablespaceDataList *);
 static char *make_barman_ssh_command(char *buf);
 
-static bool create_recovery_file(t_node_info *node_record, t_conninfo_param_list *recovery_conninfo, char *dest, bool as_file);
+static bool create_recovery_file(t_node_info *node_record, t_conninfo_param_list *primary_conninfo, char *dest, bool as_file);
 static void write_primary_conninfo(PQExpBufferData *dest, t_conninfo_param_list *param_list);
 static bool check_sibling_nodes(NodeInfoList *sibling_nodes, SiblingNodeStats *sibling_nodes_stats);
 static bool check_free_wal_senders(int available_wal_senders, SiblingNodeStats *sibling_nodes_stats, bool *dry_run_success);
@@ -2991,57 +2991,22 @@ do_standby_follow_internal(PGconn *primary_conn, PGconn *follow_target_conn, t_n
 		}
 	}
 
-	/* Initialise connection parameters to write as `primary_conninfo` */
-	initialize_conninfo_params(&recovery_conninfo, false);
-
-	/* We ignore any application_name set in the primary's conninfo */
-	parse_conninfo_string(follow_target_node_record->conninfo, &recovery_conninfo, &errmsg, true);
-
+	/*
+	 * store the original upstream node id so we can delete the
+	 * replication slot, if exists
+	 */
+	if (local_node_record.upstream_node_id != UNKNOWN_NODE_ID)
 	{
-		t_conninfo_param_list local_node_conninfo = T_CONNINFO_PARAM_LIST_INITIALIZER;
-		bool		parse_success;
+		original_upstream_node_id = local_node_record.upstream_node_id;
+	}
+	else
+	{
+		original_upstream_node_id = follow_target_node_record->node_id;
+	}
 
-		initialize_conninfo_params(&local_node_conninfo, false);
-
-		parse_success = parse_conninfo_string(local_node_record.conninfo, &local_node_conninfo, &errmsg, false);
-
-		if (parse_success == false)
-		{
-			/*
-			 * this shouldn't happen, but if it does we'll plough on
-			 * regardless
-			 */
-			log_warning(_("unable to parse conninfo string \"%s\":\n  %s"),
-						local_node_record.conninfo, errmsg);
-		}
-		else
-		{
-			char	   *application_name = param_get(&local_node_conninfo, "application_name");
-
-			if (application_name != NULL && strlen(application_name))
-				param_set(&recovery_conninfo, "application_name", application_name);
-		}
-
-		free_conninfo_params(&local_node_conninfo);
-
-		/*
-		 * store the original upstream node id so we can delete the
-		 * replication slot, if exists
-		 */
-		if (local_node_record.upstream_node_id != UNKNOWN_NODE_ID)
-		{
-			original_upstream_node_id = local_node_record.upstream_node_id;
-		}
-		else
-		{
-			original_upstream_node_id = follow_target_node_record->node_id;
-		}
-
-
-		if (config_file_options.use_replication_slots && runtime_options.host_param_provided == false && original_upstream_node_id != UNKNOWN_NODE_ID)
-		{
-			remove_old_replication_slot = true;
-		}
+	if (config_file_options.use_replication_slots && runtime_options.host_param_provided == false && original_upstream_node_id != UNKNOWN_NODE_ID)
+	{
+		remove_old_replication_slot = true;
 	}
 
 	/* Fetch original upstream's record */
@@ -3066,6 +3031,12 @@ do_standby_follow_internal(PGconn *primary_conn, PGconn *follow_target_conn, t_n
 		}
 	}
 
+	/* Initialise connection parameters to write as "primary_conninfo" */
+	initialize_conninfo_params(&recovery_conninfo, false);
+
+	/* We ignore any application_name set in the primary's conninfo */
+	parse_conninfo_string(follow_target_node_record->conninfo, &recovery_conninfo, &errmsg, true);
+
 	/* Set the application name to this node's name */
 	param_set(&recovery_conninfo, "application_name", config_file_options.node_name);
 
@@ -6942,11 +6913,11 @@ check_recovery_type(PGconn *conn)
  * Creates a recovery.conf file for a standby
  *
  * A database connection pointer is required for escaping primary_conninfo
- * parameters. When cloning from Barman and --no-upstream-connection ) this
- * might not be available.
+ * parameters. When cloning from Barman and --no-upstream-connection supplied,
+ * this might not be available.
  */
-bool
-create_recovery_file(t_node_info *node_record, t_conninfo_param_list *recovery_conninfo, char *dest, bool as_file)
+static bool
+create_recovery_file(t_node_info *node_record, t_conninfo_param_list *primary_conninfo, char *dest, bool as_file)
 {
 	PQExpBufferData recovery_file_buf;
 	char		recovery_file_path[MAXPGPATH] = "";
@@ -6961,29 +6932,7 @@ create_recovery_file(t_node_info *node_record, t_conninfo_param_list *recovery_c
 						 "standby_mode = 'on'\n");
 
 	/* primary_conninfo = '...' */
-
-	/*
-	 * the user specified --upstream-conninfo string - copy that
-	 */
-	if (strlen(runtime_options.upstream_conninfo))
-	{
-		char	   *escaped = escape_recovery_conf_value(runtime_options.upstream_conninfo);
-
-		appendPQExpBuffer(&recovery_file_buf,
-						  "primary_conninfo = '%s'\n",
-						  escaped);
-
-		free(escaped);
-	}
-
-	/*
-	 * otherwise use the conninfo inferred from the upstream connection and/or
-	 * node record
-	 */
-	else
-	{
-		write_primary_conninfo(&recovery_file_buf, recovery_conninfo);
-	}
+	write_primary_conninfo(&recovery_file_buf, primary_conninfo);
 
 	/* recovery_target_timeline = 'latest' */
 	appendPQExpBufferStr(&recovery_file_buf,

repmgr.conf.sample

@@ -51,7 +51,6 @@
 
 
 # =============================================================================
-
 # Optional configuration items
 # =============================================================================
 
@@ -68,16 +67,16 @@
 # Replication settings
 #------------------------------------------------------------------------------
 
-#replication_user='repmgr'	 # User to make replication connections with, if not set defaults
-				 # to the user defined in "conninfo".
+#replication_user='repmgr'	 # User to make replication connections with, if not set
+				 #  defaults to the user defined in "conninfo".
 
-#replication_type=physical	 # Must be one of 'physical' or 'bdr'.
+#replication_type=physical	 # Must be one of "physical" or "bdr".
 				 # NOTE: "bdr" can only be used with BDR 2.x
 
-#location=default		 # arbitrary string defining the location of the node; this
-				 # is used during failover to check visibilty of the
-				 # current primary node. See the 'repmgrd' documentation
-				 # in README.md for further details.
+#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
 
 #use_replication_slots=no	 # whether to use physical replication slots
 				 # NOTE: when using replication slots,

repmgr_version.h.in

@@ -1,3 +1,3 @@
 #define REPMGR_VERSION_DATE ""
-#define REPMGR_VERSION "4.4dev"
+#define REPMGR_VERSION "4.4beta2"
 #define REPMGR_VERSION_NUM 40400