doc: note downstream node (dis)connection monitoring in more places

repmgr 4.4.x is not compatible with PostgreSQL 12 or later
Add optional check for unsupported future PostgreSQL releases
2026-03-23 15:16:29 +00:00 · 2020-06-09 16:42:45 +09:00 · 2020-02-14 10:42:38 +09:00 · 2020-02-14 10:39:28 +09:00 · 2019-12-10 15:58:45 +09:00 · 2019-10-09 09:12:58 +09:00
35 changed files with 857 additions and 437 deletions
--- a/10
+++ b/10
@@ -1,4 +1,8 @@
-4.4     2019-??-??
+4.4.1   2019-??-??
+        repmgr: improve data directory check (Ian)
+        repmgr: improve extension check during "standby clone" (Ian)
+
+4.4     2019-06-27
        repmgr: improve "daemon status" output (Ian)
        repmgr: add "--siblings-follow" option to "standby promote" (Ian)
        repmgr: add "--repmgrd-force-unpause" option to "standby switchover" (Ian)
@@ -6,6 +10,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 +27,8 @@
        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)
+        repmgr: note that "standby follow" requires a primary to be available (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
--- a/Makefile.global.in
+++ b/Makefile.global.in
@@ -24,4 +24,5 @@ include $(PGXS)
 -include ${repmgr_abs_srcdir}/Makefile.custom

 REPMGR_VERSION=$(shell awk '/^\#define REPMGR_VERSION / { print $3; }' ${repmgr_abs_srcdir}/repmgr_version.h.in | cut -d '"' -f 2)
+REPMGR_RELEASE_DATE=$(shell awk '/^\#define REPMGR_RELEASE_DATE / { print $3; }' ${repmgr_abs_srcdir}/repmgr_version.h.in | cut -d '"' -f 2)

--- a/configfile.c
+++ b/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))
--- a/dbutils.c
+++ b/dbutils.c
@@ -336,12 +336,10 @@ establish_db_connection_by_params(t_conninfo_param_list *param_list,
 bool
 is_superuser_connection(PGconn *conn, t_connection_user *userinfo)
 {
-	char	   *current_user = NULL;
-	const char *superuser_status = NULL;
 	bool		is_superuser = false;
+	const char *current_user = PQuser(conn);
+	const char *superuser_status = PQparameterStatus(conn, "is_superuser");

-	current_user = PQuser(conn);
-	superuser_status = PQparameterStatus(conn, "is_superuser");
 	is_superuser = (strcmp(superuser_status, "on") == 0) ? true : false;

 	if (userinfo != NULL)
@@ -356,6 +354,51 @@ is_superuser_connection(PGconn *conn, t_connection_user *userinfo)
 }


+bool
+connection_has_pg_settings(PGconn *conn)
+{
+	bool		has_pg_settings = false;
+
+	/* superusers can always read pg_settings */
+	if (is_superuser_connection(conn, NULL) == true)
+	{
+		has_pg_settings = true;
+	}
+	/* from PostgreSQL 10, a non-superuser may have been granted access */
+	else if(PQserverVersion(conn) >= 100000)
+	{
+		PQExpBufferData query;
+		PGresult   *res;
+
+		initPQExpBuffer(&query);
+		appendPQExpBufferStr(&query,
+							 "  SELECT CASE "
+							 "           WHEN pg_catalog.pg_has_role('pg_monitor','MEMBER') "
+							 "             THEN TRUE "
+							 "           WHEN pg_catalog.pg_has_role('pg_read_all_settings','MEMBER') "
+							 "             THEN TRUE "
+							 "           ELSE FALSE "
+							 "         END AS has_pg_settings");
+
+		res = PQexec(conn, query.data);
+
+		if (PQresultStatus(res) != PGRES_TUPLES_OK)
+		{
+			log_db_error(conn, query.data,
+						 _("connection_has_pg_settings(): unable to query user roles"));
+		}
+		else
+		{
+			has_pg_settings = atobool(PQgetvalue(res, 0, 0));
+		}
+		termPQExpBuffer(&query);
+		PQclear(res);
+	}
+
+	return has_pg_settings;
+}
+
+
 void
 close_connection(PGconn **conn)
 {
@@ -1865,8 +1908,20 @@ repmgrd_set_pid(PGconn *conn, pid_t repmgrd_pid, const char *pidfile)
 	initPQExpBuffer(&query);

 	appendPQExpBuffer(&query,
-					  "SELECT repmgr.set_repmgrd_pid(%i, '%s')",
-					  (int) repmgrd_pid, pidfile);
+					  "SELECT repmgr.set_repmgrd_pid(%i, ",
+					  (int) repmgrd_pid);
+
+	if (pidfile != NULL)
+	{
+		appendPQExpBuffer(&query,
+						  " '%s')",
+						  pidfile);
+	}
+	else
+	{
+		appendPQExpBufferStr(&query,
+							 " '')");
+	}

 	res = PQexec(conn, query.data);
 	termPQExpBuffer(&query);
@@ -2092,9 +2147,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 "
@@ -5073,6 +5128,7 @@ init_replication_info(ReplInfo *replication_info)
 	replication_info->receiving_streamed_wal = true;
 	replication_info->wal_replay_paused = false;
 	replication_info->upstream_last_seen = -1;
+	replication_info->upstream_node_id = UNKNOWN_NODE_ID;
 }


--- a/dbutils.h
+++ b/dbutils.h
@@ -438,6 +438,7 @@ PGconn	   *get_primary_connection(PGconn *standby_conn, int *primary_id, char *p
 PGconn	   *get_primary_connection_quiet(PGconn *standby_conn, int *primary_id, char *primary_conninfo_out);

 bool		is_superuser_connection(PGconn *conn, t_connection_user *userinfo);
+bool		connection_has_pg_settings(PGconn *conn);
 void		close_connection(PGconn **conn);

 /* conninfo manipulation functions */
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -31,6 +31,7 @@ ALLXML := $(wildcard $(srcdir)/*.xml) $(GENERATED_XML)
 version.xml: $(repmgr_top_builddir)/repmgr_version.h
 	{ \
 	  echo "<!ENTITY repmgrversion \"$(REPMGR_VERSION)\">"; \
+	  echo "<!ENTITY releasedate \"$(REPMGR_RELEASE_DATE)\">"; \
 	} > $@

 ##
--- a/doc/appendix-release-notes.xml
+++ b/doc/appendix-release-notes.xml
@@ -16,32 +16,68 @@
  </para>

  <sect1 id="release-4.4">
-    <title>Release 4.4</title>
-    <para><emphasis>?? June, 2019</emphasis></para>
+    <title id="release-current">Release 4.4</title>
+    <para><emphasis>27 June, 2019</emphasis></para>

-	<sect2>
+    <para>
+      &repmgr; 4.4 is a major release.
+    </para>
+    <para>
+      For details on how to upgrade an existing &repmgr; instrallation, see
+      documentation section <link linkend="upgrading-major-version">Upgrading a major version release</link>.
+    </para>
+    <para>
+      If &repmgrd; is in use, a PostgreSQL restart <emphasis>is</emphasis> required;
+      in that case we suggest combining this &repmgr; upgrade with the next PostgreSQL
+      minor release, which will require a PostgreSQL restart in any case.
+    </para>
+
+
+    <important>
+      <para>
+        On Debian-based systems, including Ubuntu, if using &repmgrd;
+        please ensure that in the file <filename>/etc/init.d/repmgrd</filename>, the parameter
+        <varname>REPMGRD_OPTS</varname> contains &quot;<literal>--daemonize=false</literal>&quot;, e.g.:
+        <programlisting>
+# additional options
+REPMGRD_OPTS="--daemonize=false"</programlisting>
+      </para>
+      <para>
+        For further details, see <link linkend="repmgrd-configuration-debian-ubuntu">repmgrd configuration on Debian/Ubuntu</link>.
+      </para>
+    </important>
+
+    <sect2>
      <title>repmgr client enhancements</title>
      <para>
-	    <itemizedlist>
+        <itemizedlist>

-		  <listitem>
+          <listitem>
            <para>
-			  <link linkend="repmgr-standby-clone"><command>repmgr standby clone</command></link>:
-			  prevent a standby from being cloned from a witness server (PostgreSQL 9.6 and later only).
-			</para>
-		  </listitem>
+              <link linkend="repmgr-standby-clone"><command>repmgr standby clone</command></link>:
+              prevent a standby from being cloned from a witness server (PostgreSQL 9.6 and later only).
+            </para>
+          </listitem>

-		  <listitem>
+          <listitem>
            <para>
-			  <link linkend="repmgr-witness-register"><command>repmgr witness register</command></link>:
-			  prevent a witness server from being registered on the replication cluster primary server
+              <link linkend="repmgr-witness-register"><command>repmgr witness register</command></link>:
+              prevent a witness server from being registered on the replication cluster primary server
              (PostgreSQL 9.6 and later only).
-			</para>
+            </para>
            <para>
              Registering a witness on the primary node would defeat the purpose of having a witness server,
              which is intended to remain running even if the cluster's primary goes down.
            </para>
-		  </listitem>
+          </listitem>
+
+          <listitem>
+            <para>
+              <link linkend="repmgr-standby-follow"><command>repmgr standby follow</command></link>:
+              note that an active, reachable cluster primary is required for this command;
+              and provide a more helpful error message if no reachable primary could be found.
+            </para>
+          </listitem>

          <listitem>
            <para>
@@ -75,7 +111,6 @@
            </para>
          </listitem>

-
          <listitem>
            <para>
              <link linkend="repmgr-standby-promote"><command>repmgr standby promote</command></link>:
@@ -94,61 +129,61 @@
            </note>
          </listitem>

-		  <listitem>
+          <listitem>
            <para>
-			  <link linkend="repmgr-standby-switchover"><command>repmgr standby switchover</command></link>:
-			  add <option>--repmgrd-force-unpause</option> to unpause all &repmgrd; instances after executing a switchover.
-			  This will ensure that	any &repmgrd; instances which were paused before the switchover will be
-			  unpaused.
-			</para>
-		  </listitem>
+              <link linkend="repmgr-standby-switchover"><command>repmgr standby switchover</command></link>:
+              add <option>--repmgrd-force-unpause</option> to unpause all &repmgrd; instances after executing a switchover.
+              This will ensure that any &repmgrd; instances which were paused before the switchover will be
+              unpaused.
+            </para>
+          </listitem>

          <listitem>
            <para>
              <link linkend="repmgr-daemon-status"><command>repmgr daemon status</command></link>:
-			  make output similar to that of
-			  <link linkend="repmgr-cluster-show"><command>repmgr cluster show</command></link>
-			  for consistency and to make it easier to identify nodes not in the expected
-			  state.
+              make output similar to that of
+              <link linkend="repmgr-cluster-show"><command>repmgr cluster show</command></link>
+              for consistency and to make it easier to identify nodes not in the expected
+              state.
            </para>
          </listitem>

-		  <listitem>
+          <listitem>
            <para>
              <link linkend="repmgr-cluster-show"><command>repmgr cluster show</command></link>:
-			  display each node's timeline ID (PostgreSQL 9.6 and later only).
-			</para>
-		  </listitem>
-
-		  <listitem>
-            <para>
-              <link linkend="repmgr-cluster-show"><command>repmgr cluster show</command></link>
-			  and <link linkend="repmgr-daemon-status"><command>repmgr daemon status</command></link>:
-			  show the upstream node name as reported by each individual node - this helps visualise
-			  situations where the cluster is in an unexpected state, and provide a better idea of the
-			  actual cluster state.
-			</para>
-			<para>
-			  For example, if a cluster has divided somehow and a set of nodes are
-			  following a new primary, when running either of these commands, &repmgr;
-			  will now show the name of the primary those nodes are actually
-			  following, rather than the now outdated node name recorded
-			  on the other side of the &quot;split&quot;. A warning will also be issued
-			  about the unexpected situation.
+              display each node's timeline ID (PostgreSQL 9.6 and later only).
            </para>
          </listitem>

-		  <listitem>
+          <listitem>
            <para>
              <link linkend="repmgr-cluster-show"><command>repmgr cluster show</command></link>
-			  and <link linkend="repmgr-daemon-status"><command>repmgr daemon status</command></link>:
-			  check if a node is attached to its advertised upstream node, and issue a
-			  warning if the node is not attached.
-			</para>
-		  </listitem>
+              and <link linkend="repmgr-daemon-status"><command>repmgr daemon status</command></link>:
+              show the upstream node name as reported by each individual node - this helps visualise
+              situations where the cluster is in an unexpected state, and provide a better idea of the
+              actual cluster state.
+            </para>
+            <para>
+              For example, if a cluster has divided somehow and a set of nodes are
+              following a new primary, when running either of these commands, &repmgr;
+              will now show the name of the primary those nodes are actually
+              following, rather than the now outdated node name recorded
+              on the other side of the &quot;split&quot;. A warning will also be issued
+              about the unexpected situation.
+            </para>
+          </listitem>

-		</itemizedlist>
-	  </para>
+          <listitem>
+            <para>
+              <link linkend="repmgr-cluster-show"><command>repmgr cluster show</command></link>
+              and <link linkend="repmgr-daemon-status"><command>repmgr daemon status</command></link>:
+              check if a node is attached to its advertised upstream node, and issue a
+              warning if the node is not attached.
+            </para>
+          </listitem>
+
+        </itemizedlist>
+      </para>
    </sect2>

    <sect2>
@@ -163,7 +198,7 @@
              execute a custom script.
            </para>
            <para>
-              This provided an additional method for fencing an isolated primary node, and/or taking
+              This provides an additional method for fencing an isolated primary node, and/or taking
              other action if one or more standys become disconnected.
            </para>
            <para>
@@ -221,23 +256,41 @@
            </para>
          </listitem>

-		  <listitem>
-			<para>
+          <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>,
              don't abort if one or more nodes are not reachable <emphasis>and</emphasis>
-			  they are marked as inactive.
-			</para>
-		  </listitem>
+              they are marked as inactive.
+            </para>
+          </listitem>

-		  <listitem>
-			<para>
+          <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>
              running.
            </para>
          </listitem>

        </itemizedlist>
-	  </para>
+      </para>
    </sect2>


@@ -281,19 +334,19 @@
    </para>


-	<important>
-	  <para>
-	    On Debian-based systems, including Ubuntu, if using &repmgrd;
-	    please ensure that in the file <filename>/etc/init.d/repmgrd</filename>, the parameter
-	    <varname>REPMGRD_OPTS</varname> contains &quot;<literal>--daemonize=false</literal>&quot;, e.g.:
-	    <programlisting>
+    <important>
+      <para>
+        On Debian-based systems, including Ubuntu, if using &repmgrd;
+        please ensure that in the file <filename>/etc/init.d/repmgrd</filename>, the parameter
+        <varname>REPMGRD_OPTS</varname> contains &quot;<literal>--daemonize=false</literal>&quot;, e.g.:
+        <programlisting>
 # additional options
 REPMGRD_OPTS="--daemonize=false"</programlisting>
-	  </para>
-	  <para>
-	    For further details, see <link linkend="repmgrd-configuration-debian-ubuntu">repmgrd configuration on Debian/Ubuntu</link>.
-	  </para>
-	</important>
+      </para>
+      <para>
+        For further details, see <link linkend="repmgrd-configuration-debian-ubuntu">repmgrd configuration on Debian/Ubuntu</link>.
+      </para>
+    </important>

    <sect2>
      <title>repmgr client enhancements</title>
@@ -358,11 +411,11 @@ REPMGRD_OPTS="--daemonize=false"</programlisting>
          <listitem>
            <para>
              <command><link linkend="repmgr-cluster-show">repmgr cluster show</link></command>:
-	      differentiate between unreachable nodes and nodes which are running but rejecting connections.
+          differentiate between unreachable nodes and nodes which are running but rejecting connections.
            </para>
            <para>
-	      This makes it possible to see whether a node is unreachable at network level,
-	      or if it is running but rejecting connections for some reason.
+          This makes it possible to see whether a node is unreachable at network level,
+          or if it is running but rejecting connections for some reason.
            </para>
          </listitem>

@@ -411,7 +464,7 @@ REPMGRD_OPTS="--daemonize=false"</programlisting>
          <listitem>
            <para>
              &repmgrd; will no longer consider nodes where &repmgrd;
-			  is not running as promotion candidates.
+              is not running as promotion candidates.
            </para>
            <para>
              Previously, if &repmgrd; was not running on a node, but
@@ -449,15 +502,15 @@ REPMGRD_OPTS="--daemonize=false"</programlisting>

         <listitem>
            <para>
-			  In a failover situation, &repmgrd; will not attempt to promote a
-			  node if another primary has already appeared (e.g. by being promoted manually).
-			  GitHub #420.
-			</para>
+              In a failover situation, &repmgrd; will not attempt to promote a
+              node if another primary has already appeared (e.g. by being promoted manually).
+              GitHub #420.
+            </para>
          </listitem>

-		</itemizedlist>
-	  </para>
-	</sect2>
+        </itemizedlist>
+      </para>
+    </sect2>

    <sect2>
      <title>Bug fixes</title>
@@ -467,23 +520,23 @@ REPMGRD_OPTS="--daemonize=false"</programlisting>
          <listitem>
            <para>
              <command><link linkend="repmgr-cluster-show">repmgr cluster show</link></command>:
-	          fix display of node IDs with multiple digits.
+              fix display of node IDs with multiple digits.
            </para>
-	      </listitem>
+          </listitem>

          <listitem>
            <para>
              ensure <command><link linkend="repmgr-primary-unregister">repmgr primary unregister</link></command>
-	          behaves correctly when executed on a witness server. GitHub #548.
+              behaves correctly when executed on a witness server. GitHub #548.
            </para>
-	      </listitem>
+          </listitem>

          <listitem>
            <para>
              ensure <command><link linkend="repmgr-standby-register">repmgr standby register</link></command>
-	          fails when <option>--upstream-node-id</option> is the same as the local node ID.
+              fails when <option>--upstream-node-id</option> is the same as the local node ID.
            </para>
-	      </listitem>
+          </listitem>

          <listitem>
            <para>
@@ -504,7 +557,7 @@ REPMGRD_OPTS="--daemonize=false"</programlisting>
          <listitem>
            <para>
              &repmgr;: when executing <link linkend="repmgr-standby-switchover"><command>repmgr standby switchover</command></link>,
-	          verify the standby (promotion candidate) is currently attached to the primary (demotion candidate). GitHub #519.
+              verify the standby (promotion candidate) is currently attached to the primary (demotion candidate). GitHub #519.
            </para>
          </listitem>

@@ -512,7 +565,7 @@ REPMGRD_OPTS="--daemonize=false"</programlisting>
            <para>
              &repmgr;: when executing <link linkend="repmgr-standby-switchover"><command>repmgr standby switchover</command></link>,
              avoid a potential race condition when comparing received WAL on the standby to the primary's shutdown location,
-	          as the standby's walreceiver may not have yet flushed all received WAL to disk. GitHub #518.
+              as the standby's walreceiver may not have yet flushed all received WAL to disk. GitHub #518.
            </para>
          </listitem>

@@ -526,11 +579,11 @@ REPMGRD_OPTS="--daemonize=false"</programlisting>
          <listitem>
            <para>
              <command><link linkend="repmgr-node-check">repmgr node check</link></command>
-	          will only consider physical replication slots, as the purpose
-	          of slot checks is to warn about potential issues with
-	          streaming replication standbys which are no longer attached.
-	        </para>
-	      </listitem>
+              will only consider physical replication slots, as the purpose
+              of slot checks is to warn about potential issues with
+              streaming replication standbys which are no longer attached.
+            </para>
+          </listitem>

          <listitem>
            <para>
@@ -561,19 +614,19 @@ REPMGRD_OPTS="--daemonize=false"</programlisting>
      <link linkend="upgrading-major-version">Upgrading a major version release</link>.
    </para>

-	<important>
-	  <para>
-	    On Debian-based systems, including Ubuntu, if using &repmgrd;
-	    please ensure that the in the file <filename>/etc/init.d/repmgrd</filename>, the parameter
-	    <varname>REPMGRD_OPTS</varname> contains &quot;<literal>--daemonize=false</literal>&quot;, e.g.:
-	    <programlisting>
+    <important>
+      <para>
+        On Debian-based systems, including Ubuntu, if using &repmgrd;
+        please ensure that the in the file <filename>/etc/init.d/repmgrd</filename>, the parameter
+        <varname>REPMGRD_OPTS</varname> contains &quot;<literal>--daemonize=false</literal>&quot;, e.g.:
+        <programlisting>
 # additional options
 REPMGRD_OPTS="--daemonize=false"</programlisting>
-	  </para>
-	  <para>
-	    For further details, see <link linkend="repmgrd-configuration-debian-ubuntu">repmgrd daemon configuration on Debian/Ubuntu</link>.
-	  </para>
-	</important>
+      </para>
+      <para>
+        For further details, see <link linkend="repmgrd-configuration-debian-ubuntu">repmgrd daemon configuration on Debian/Ubuntu</link>.
+      </para>
+    </important>

    <sect2>
      <title>Configuration file changes</title>
@@ -705,11 +758,11 @@ REPMGRD_OPTS="--daemonize=false"</programlisting>
      repmgr 4.1.1 contains a number of usability enhancements and bug fixes.
    </para>
    <para>
-	  We recommend upgrading to this version as soon as possible.
-	  This release can be installed as a simple package upgrade from repmgr 4.0 ~ 4.1.0;
+      We recommend upgrading to this version as soon as possible.
+      This release can be installed as a simple package upgrade from repmgr 4.0 ~ 4.1.0;
      &repmgrd; (if running) should be restarted.
      See <xref linkend="upgrading-repmgr"/> for more details.
-	</para>
+    </para>

    <sect2>
      <title>repmgr enhancements</title>
@@ -971,18 +1024,18 @@ REPMGRD_OPTS="--daemonize=false"</programlisting>
          <listitem>
            <para>
              <command><link linkend="repmgr-witness-unregister">repmgr witness unregister</link></command>
-			  can be run on any node, by providing the ID of the witness node with <option>--node-id</option>.
-			  (GitHub #472).
-			</para>
-		  </listitem>
+              can be run on any node, by providing the ID of the witness node with <option>--node-id</option>.
+              (GitHub #472).
+            </para>
+          </listitem>

          <listitem>
            <para>
              <command><link linkend="repmgr-standby-switchover">repmgr standby switchover</link></command>
              will refuse to run if an exclusive backup is taking place on the current primary.
-			  (GitHub #476).
-			</para>
-		  </listitem>
+              (GitHub #476).
+            </para>
+          </listitem>

        </itemizedlist>
      </para>
@@ -1003,9 +1056,9 @@ REPMGRD_OPTS="--daemonize=false"</programlisting>
          <listitem>
            <para>
              &repmgrd;: daemonize process by default.
-			  In case, for whatever reason, the user does not wish to daemonize the
-			  process, provide <option>--daemonize=false</option>.
-			  (GitHub #458).
+              In case, for whatever reason, the user does not wish to daemonize the
+              process, provide <option>--daemonize=false</option>.
+              (GitHub #458).
            </para>
          </listitem>

@@ -1030,23 +1083,23 @@ REPMGRD_OPTS="--daemonize=false"</programlisting>
          <listitem>
            <para>
              <command><link linkend="repmgr-cluster-cleanup">repmgr cluster cleanup</link></command>:
-			  add missing help options. (GitHub #461/#462).
-			</para>
-		  </listitem>
+              add missing help options. (GitHub #461/#462).
+            </para>
+          </listitem>

          <listitem>
            <para>
-			  Ensure witness node follows new primary after switchover. (GitHub #453).
-			</para>
-		  </listitem>
+              Ensure witness node follows new primary after switchover. (GitHub #453).
+            </para>
+          </listitem>

          <listitem>
            <para>
              <command><link linkend="repmgr-node-check">repmgr node check</link></command> and
              <command><link linkend="repmgr-node-status">repmgr node status</link></command>:
-			  fix witness node handling. (GitHub #451).
-			</para>
-		  </listitem>
+              fix witness node handling. (GitHub #451).
+            </para>
+          </listitem>

          <listitem>
            <para>
@@ -1066,14 +1119,14 @@ REPMGRD_OPTS="--daemonize=false"</programlisting>
    <title>Release 4.0.6</title>
    <para><emphasis>Thu June 14, 2018</emphasis></para>
    <para>
-	  &repmgr; 4.0.6 contains a number of bug fixes and usability enhancements.
+      &repmgr; 4.0.6 contains a number of bug fixes and usability enhancements.
    </para>
-	<para>
-	  We recommend upgrading to this version as soon as possible.
-	  This release can be installed as a simple package upgrade from repmgr 4.0 ~ 4.0.5;
+    <para>
+      We recommend upgrading to this version as soon as possible.
+      This release can be installed as a simple package upgrade from repmgr 4.0 ~ 4.0.5;
      &repmgrd; (if running) should be restarted. See <xref linkend="upgrading-repmgr"/>
      for more details.
-	</para>
+    </para>

    <sect2>
      <title>Usability enhancements</title>
@@ -1091,33 +1144,33 @@ REPMGRD_OPTS="--daemonize=false"</programlisting>
          <listitem>
            <para>
               <command><link linkend="repmgr-standby-clone">repmgr standby clone</link></command>:
-			   Improve handling of external configuration file copying,  including consideration in
-			   <option>--dry-run</option> check
-			   (GitHub #443)
+               Improve handling of external configuration file copying,  including consideration in
+               <option>--dry-run</option> check
+               (GitHub #443)
           </para>
          </listitem>

          <listitem>
            <para>
              When using <option>--dry-run</option>, force log level to <literal>INFO</literal>
-			  to ensure output will always be displayed
-			  (GitHub #441)
+              to ensure output will always be displayed
+              (GitHub #441)
           </para>
          </listitem>

          <listitem>
            <para>
               <command><link linkend="repmgr-standby-clone">repmgr standby clone</link></command>:
-			   Improve documentation of <option>--recovery-conf-only</option> mode
-			   (GitHub #438)
+               Improve documentation of <option>--recovery-conf-only</option> mode
+               (GitHub #438)
           </para>
          </listitem>

          <listitem>
            <para>
               <command><link linkend="repmgr-standby-clone">repmgr standby clone</link></command>:
-			   Don't require presence of <varname>user</varname> parameter in conninfo string
-			   (GitHub #437)
+               Don't require presence of <varname>user</varname> parameter in conninfo string
+               (GitHub #437)
           </para>
          </listitem>

@@ -1143,23 +1196,23 @@ REPMGRD_OPTS="--daemonize=false"</programlisting>
          <listitem>
            <para>
               <command><link linkend="repmgr-standby-follow">repmgr standby follow</link></command>:
-			   check node has actually connected to new primary before reporting success
-			   (GitHub #444)
+               check node has actually connected to new primary before reporting success
+               (GitHub #444)
           </para>
          </listitem>

          <listitem>
            <para>
               <command><link linkend="repmgr-node-rejoin">repmgr node rejoin</link></command>:
-			   Fix bug when parsing <option>--config-files</option> parameter
-			   (GitHub #442)
+               Fix bug when parsing <option>--config-files</option> parameter
+               (GitHub #442)
           </para>
          </listitem>

          <listitem>
            <para>
              &repmgrd;: ensure local node is counted as quorum member
-			  (GitHub #439)
+              (GitHub #439)
           </para>
          </listitem>

--- a/doc/cloning-standbys.xml
+++ b/doc/cloning-standbys.xml
@@ -52,6 +52,24 @@
   </itemizedlist>
   </para>

+
+   <note>
+    <para>
+      Currently &repmgr;'s support for cloning from Barman is implemented by using
+      <productname>rsync</productname> to clone from the Barman server.
+    </para>
+    <para>
+      It is therefore not able to make use of Barman's parallel restore facility, which
+      is executed on the Barman server and clones to the target server.
+    </para>
+    <para>
+      Barman's parallel restore facility can be used by executing it manually on
+      the Barman server and integrating the resulting cloned standby using
+      <command><link linkend="repmgr-standby-clone">repmgr standby clone --recovery-conf-only</link></command>.
+    </para>
+   </note>
+
+
  <sect2 id="cloning-from-barman-prerequisites">
   <title>Prerequisites for cloning from Barman</title>
   <para>
@@ -60,8 +78,7 @@
   <itemizedlist spacing="compact" mark="bullet">
     <listitem>
      <para>
-        the <varname>barman_server</varname> setting in <filename>repmgr.conf</filename> is the same as the
-        server configured in Barman;
+        the Barman catalogue must include at least one valid backup for this server;
      </para>
     </listitem>
     <listitem>
@@ -72,19 +89,68 @@
     </listitem>
     <listitem>
      <para>
-        the <varname>restore_command</varname> setting in <filename>repmgr.conf</filename> is configured to
-        use a copy of the <command>barman-wal-restore</command> script shipped with the
-        <literal>barman-cli</literal> package (see section <xref linkend="cloning-from-barman-restore-command"/>
-        below).
-      </para>
-     </listitem>
-     <listitem>
-      <para>
-        the Barman catalogue includes at least one valid backup for this  server.
+        the <varname>barman_server</varname> setting in <filename>repmgr.conf</filename> is the same as the
+        server configured in Barman.
      </para>
     </listitem>
+
   </itemizedlist>
   </para>
+
+   <para>
+     For example, assuming Barman is located on the host &quot;<literal>barmansrv</literal>&quot;
+     under the &quot;<literal>barman</literal>&quot; user account,
+     <filename>repmgr.conf</filename> should contain the following entries:
+    <programlisting>
+    barman_host=barman@barmansrv
+    barman_server=somedb</programlisting>
+   </para>
+
+   <note>
+    <para>
+     To use a non-default Barman configuration file on the Barman server,
+     specify this in <filename>repmgr.conf</filename> with <filename>barman_config</filename>:
+     <programlisting>
+      barman_config=/path/to/barman.conf</programlisting>
+    </para>
+   </note>
+
+
+   <para>
+     We also recommend configuring the <varname>restore_command</varname> setting in <filename>repmgr.conf</filename>
+     to use the <command>barman-wal-restore</command> script
+     (see section <xref linkend="cloning-from-barman-restore-command"/> below).
+   </para>
+
+
+   <tip>
+    <simpara>
+      If you have a non-default SSH configuration on the Barman
+      server, e.g. using a port other than 22, then you can set those
+      parameters in a dedicated Host section in <filename>~/.ssh/config</filename>
+      corresponding to the value of <varname>barman_host</varname> in
+      <filename>repmgr.conf</filename>. See the <literal>Host</literal>
+      section in <command>man 5 ssh_config</command> for more details.
+    </simpara>
+   </tip>
+   <para>
+    It's now possible to clone a standby from Barman, e.g.:
+    <programlisting>
+    $ repmgr -f /etc/repmgr.conf -h node1 -U repmgr -d repmgr standby clone
+    NOTICE: destination directory "/var/lib/postgresql/data" provided
+    INFO: connecting to Barman server to verify backup for "test_cluster"
+    INFO: checking and correcting permissions on existing directory "/var/lib/postgresql/data"
+    INFO: creating directory "/var/lib/postgresql/data/repmgr"...
+    INFO: connecting to Barman server to fetch server parameters
+    INFO: connecting to source node
+    DETAIL: current installation size is 30 MB
+    NOTICE: retrieving backup from Barman...
+    (...)
+    NOTICE: standby clone (from Barman) complete
+    NOTICE: you can now start your PostgreSQL server
+    HINT: for example: pg_ctl -D /var/lib/postgresql/data start</programlisting>
+   </para>
+
   <note>
    <simpara>
     Barman support is automatically enabled if <varname>barman_server</varname>
@@ -94,37 +160,7 @@
     command line option.
    </simpara>
   </note>
-   <tip>
-    <simpara>
-      If you have a non-default SSH configuration on the Barman
-      server, e.g. using a port other than 22, then you can set those
-      parameters in a dedicated Host section in <filename>~/.ssh/config</filename>
-      corresponding to the value of<varname>barman_host</varname> in
-      <filename>repmgr.conf</filename>. See the <literal>Host</literal>
-      section in <command>man 5 ssh_config</command> for more details.
-    </simpara>
-   </tip>
-   <para>
-    It's now possible to clone a standby from Barman, e.g.:
-    <programlisting>
-    NOTICE: using configuration file "/etc/repmgr.conf"
-    NOTICE: destination directory "/var/lib/postgresql/data" provided
-    INFO: connecting to Barman server to verify backup for test_cluster
-    INFO: checking and correcting permissions on existing directory "/var/lib/postgresql/data"
-    INFO: creating directory "/var/lib/postgresql/data/repmgr"...
-    INFO: connecting to Barman server to fetch server parameters
-    INFO: connecting to upstream node
-    INFO: connected to source node, checking its state
-    INFO: successfully connected to source node
-    DETAIL: current installation size is 29 MB
-    NOTICE: retrieving backup from Barman...
-    receiving file list ...
-    (...)
-    NOTICE: standby clone (from Barman) complete
-    NOTICE: you can now start your PostgreSQL server
-    HINT: for example: pg_ctl -D /var/lib/postgresql/data start</programlisting>

-   </para>
  </sect2>
  <sect2 id="cloning-from-barman-restore-command" xreflabel="Using Barman as a WAL file source">
   <title>Using Barman as a WAL file source</title>
@@ -142,35 +178,28 @@
   </para>
   <para>
     <command>barman-wal-restore</command> is a Python script provided as part of the <literal>barman-cli</literal>
-     package (Barman 2.0 and later; for Barman 1.x the script is provided separately as
-     <command>barman-wal-restore.py</command>) which performs this function for Barman.
+     package (Barman 2.0 ~ 2.7) or as part of the core Barman distribution (Barman 2.8 and later).
   </para>
   <para>
-    To use <command>barman-wal-restore</command> with &repmgr;
-    and assuming Barman is located on the <literal>barmansrv</literal> host
+    To use <command>barman-wal-restore</command> with &repmgr;,
+    assuming Barman is located on the host &quot;<literal>barmansrv</literal>&quot;
+    under the &quot;<literal>barman</literal>&quot; user account,
    and that <command>barman-wal-restore</command> is located as an executable at
    <filename>/usr/bin/barman-wal-restore</filename>,
    <filename>repmgr.conf</filename> should include the following lines:
    <programlisting>
-    barman_host=barmansrv
+    barman_host=barman@barmansrv
    barman_server=somedb
    restore_command=/usr/bin/barman-wal-restore barmansrv somedb %f %p</programlisting>
   </para>
   <note>
    <simpara>
      <command>barman-wal-restore</command> supports command line switches to
-      control parallelism (<literal>--parallel=N</literal>) and compression (
-      <literal>--bzip2</literal>, <literal>--gzip</literal>).
+      control parallelism (<literal>--parallel=N</literal>) and compression
+      (<literal>--bzip2</literal>, <literal>--gzip</literal>).
    </simpara>
   </note>
-   <note>
-    <para>
-     To use a non-default Barman configuration file on the Barman server,
-     specify this in <filename>repmgr.conf</filename> with <filename>barman_config</filename>:
-     <programlisting>
-      barman_config=/path/to/barman.conf</programlisting>
-    </para>
-   </note>
+
  </sect2>
 </sect1>

--- a/doc/configuration-file-optional-settings.xml
+++ b/doc/configuration-file-optional-settings.xml
@@ -0,0 +1,124 @@
+<sect1 id="configuration-file-optional-settings" xreflabel="optional configuration file settings">
+
+  <title>Optional configuration file settings</title>
+
+  <indexterm>
+    <primary>repmgr.conf</primary>
+    <secondary>optional settings</secondary>
+  </indexterm>
+
+  <variablelist>
+
+
+    <varlistentry id="repmgr-conf-config-directory" xreflabel="config_directory">
+      <term><varname>config_directory</varname> (<type>string</type>)
+        <indexterm>
+          <primary><varname>config_directory</varname> configuration file parameter</primary>
+        </indexterm>
+      </term>
+      <listitem>
+        <para>
+          If PostgreSQL configuration files are located outside the data
+	  directory, specify the directory where the main
+	  <filename>postgresql.conf</filename> file is located.
+        </para>
+        <para>
+          This enables explicit provision of an external configuration file
+          directory, which if set will be passed to <command>pg_ctl</command> as the
+          <option>-D</option> parameter. Otherwise <command>pg_ctl</command> will
+          default to using the data directory, which will cause some operations
+          to fail if the configuration files are not present there.
+        </para>
+        <note>
+          <para>
+           This is implemented primarily for feature completeness and for
+           development/testing purposes. Users who have installed &repmgr; from
+           a package should <emphasis>not</emphasis> rely on  to stop/start/restart PostgreSQL,
+           instead they should set the appropriate <option>service_..._command</option>
+           for their operating system. For more details see
+           <xref linkend="configuration-file-service-commands"/>.
+          </para>
+        </note>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry id="repmgr-conf-replication-user" xreflabel="replication_user">
+      <term><varname>replication_user</varname> (<type>string</type>)
+        <indexterm>
+          <primary><varname>replication_user</varname> configuration file parameter</primary>
+        </indexterm>
+      </term>
+      <listitem>
+        <para>
+          PostgreSQL user to make replication connections with.
+          If not set defaults, to the user defined in <xref linkend="repmgr-conf-conninfo"/>.
+        </para>
+      </listitem>
+    </varlistentry>
+
+
+
+    <varlistentry id="repmgr-conf-replication-type" xreflabel="replication_type">
+      <term><varname>replication_type</varname> (<type>string</type>)
+        <indexterm>
+          <primary><varname>replication_type</varname> configuration file parameter</primary>
+        </indexterm>
+      </term>
+      <listitem>
+        <para>
+          Must be one of <literal>physical</literal> (for standard streaming replication)
+          or <literal>bdr</literal>.
+        </para>
+        <note>
+          <para>
+	    Replication type <literal>bdr</literal> can only be used with BDR 2.x
+          </para>
+          <para>
+            BDR 3.x users should use <literal>physical</literal>.
+          </para>
+        </note>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry id="repmgr-conf-location" xreflabel="location">
+      <term><varname>location</varname> (<type>string</type>)
+        <indexterm>
+          <primary><varname>location</varname> configuration file parameter</primary>
+        </indexterm>
+      </term>
+      <listitem>
+        <para>
+          An arbitrary string defining the location of the node; this
+	  is used during failover to check visibility of the
+	  current primary node.
+        </para>
+        <para>
+          For more details see <xref linkend="repmgrd-network-split"/>.
+        </para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry id="repmgr-conf-use-replication-slots" xreflabel="use_replication_slots">
+      <term><varname>use_replication_slots</varname> (<type>boolean</type>)
+        <indexterm>
+          <primary><varname>use_replication_slots</varname> configuration file parameter</primary>
+        </indexterm>
+      </term>
+      <listitem>
+        <para>
+          Whether to use physical replication slots.
+        </para>
+        <note>
+          <para>
+	    When using replication slots,
+	    <varname>max_replication_slots</varname> should be configured for
+	    at least the number of standbys which will connect
+	    to the primary.
+          </para>
+        </note>
+      </listitem>
+    </varlistentry>
+
+
+  </variablelist>
+</sect1>
--- a/doc/configuration-file-required-settings.xml
+++ b/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>
--- a/doc/configuration-file.xml
+++ b/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>
--- a/doc/configuration.xml
+++ b/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;

--- a/doc/filelist.xml
+++ b/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">
--- a/doc/install-requirements.xml
+++ b/doc/install-requirements.xml
@@ -14,7 +14,7 @@
  </para>

  <para>
-   &repmgr; 4.x is compatible with all PostgreSQL versions from 9.3. See
+   &repmgr; &repmgrversion; is compatible with all PostgreSQL versions from 9.3. See
   section <link linkend="install-compatibility-matrix">&repmgr; compatibility matrix</link>
   for an overview of version compatibility.
  </para>
@@ -39,13 +39,13 @@

  <note>
   <simpara>
-     The same &quot;major&quot; &repmgr; version (e.g. <literal>4.2.x</literal>) <emphasis>must</emphasis>
+     The same &quot;major&quot; &repmgr; version (e.g. <literal>&repmgrversion;.x</literal>) <emphasis>must</emphasis>
     be installed on all node in the replication cluster. We strongly recommend keeping all
     nodes on the same (preferably latest) &quot;minor&quot; &repmgr; version to minimize the risk
     of incompatibilities.
   </simpara>
   <simpara>
-     If different &quot;major&quot; &repmgr; versions (e.g. 3.3.x and 4.1.x)
+     If different &quot;major&quot; &repmgr; versions (e.g. 4.1.x and &repmgrversion;.x)
     are installed on different nodes, in the best case &repmgr; (in particular &repmgrd;)
     will not run. In the worst case, you will end up with a broken cluster.
   </simpara>
@@ -114,7 +114,7 @@
              &repmgr; 4.x
            </entry>
            <entry>
-              <link linkend="release-4.2">4.2</link> (2018-10-24)
+              <link linkend="release-current">&repmgrversion;</link> (&releasedate;)
            </entry>
            <entry>
              9.3, 9.4, 9.5, 9.6, 10, 11
@@ -158,7 +158,7 @@


    <para>
-      Note that some &repmgr; functionality is not available in PostgreSQL 9.3 and PostgreSQL 9.4.
+      Note that some &repmgr; functionality is not available in PostgreSQL 9.3 and PostgreSQL 9.4:
    </para>
    <itemizedlist spacing="compact" mark="bullet">

--- a/doc/repmgr-cluster-show.xml
+++ b/doc/repmgr-cluster-show.xml
@@ -55,7 +55,7 @@
    $ repmgr -f /etc/repmgr.conf cluster show

     ID | Name  | Role    | Status    | Upstream | Location | Priority | Timeline | Connection string
-    ----+-------+---------+-----------+----------+----------+----------+-----------------------------------------
+    ----+-------+---------+-----------+----------+----------+----------+----------+-----------------------------------------
     1  | node1 | primary | * running |          | default  | 100      | 1        | host=db_node1 dbname=repmgr user=repmgr
     2  | node2 | standby |   running | node1    | default  | 100      | 1        | host=db_node2 dbname=repmgr user=repmgr
     3  | node3 | standby |   running | node1    | default  | 100      | 1        | host=db_node3 dbname=repmgr user=repmgr</programlisting>
@@ -82,18 +82,18 @@
 	  (but <literal>node3</literal> is not attached to it, and its metadata has not yet been updated);
 	  <literal>node4</literal> is running but rejecting connections (from <literal>node3</literal> at least).
      <programlisting>
-	 ID | Name  | Role    | Status               | Upstream | Location | Priority | Connection string
-	----+-------+---------+----------------------+----------+----------+----------+-----------------------------------------
-	 1  | node1 | primary | ? unreachable        |          | default  | 100      | host=db_node1 dbname=repmgr user=repmgr
-	 2  | node2 | standby | ! running as primary | node1    | default  | 100      | host=db_node2 dbname=repmgr user=repmgr
-	 3  | node3 | standby |   running            | node1    | default  | 100      | host=db_node3 dbname=repmgr user=repmgr
-	 4  | node4 | standby | ? running            | node1    | default  | 100      | host=db_node4 dbname=repmgr user=repmgr
+     ID | Name  | Role    | Status               | Upstream | Location | Priority | Timeline | Connection string
+    ----+-------+---------+----------------------+----------+----------+----------+----------+-----------------------------------------
+     1  | node1 | primary | ? unreachable        |          | default  | 100      | 1        | host=db_node1 dbname=repmgr user=repmgr
+     2  | node2 | standby | ! running as primary | node1    | default  | 100      | 2        | host=db_node2 dbname=repmgr user=repmgr
+     3  | node3 | standby |   running            | node1    | default  | 100      | 1        | host=db_node3 dbname=repmgr user=repmgr
+     4  | node4 | standby | ? running            | node1    | default  | 100      | ?        | host=db_node4 dbname=repmgr user=repmgr

-	WARNING: following issues were detected
-	  - unable to connect to node "node1" (ID: 1)
-	  - node "node1" (ID: 1) is registered as an active primary but is unreachable
-	  - node "node2" (ID: 2) is registered as standby but running as primary
-	  - unable to connect to node "node4" (ID: 4)
+    WARNING: following issues were detected
+      - unable to connect to node "node1" (ID: 1)
+      - node "node1" (ID: 1) is registered as an active primary but is unreachable
+      - node "node2" (ID: 2) is registered as standby but running as primary
+      - unable to connect to node "node4" (ID: 4)
    HINT: execute with --verbose option to see connection error messages</programlisting>
    </para>
 	<para>
--- a/doc/repmgr-standby-clone.xml
+++ b/doc/repmgr-standby-clone.xml
@@ -202,6 +202,18 @@
     ensure the <filename>repmgr.conf</filename>
     file is created for the node, and that it has been registered using
     <command><link linkend="repmgr-standby-register">repmgr standby register</link></command>.
+   </para>
+   <tip>
+     <para>
+       To register a standby which is not running, execute
+       <link linkend="repmgr-standby-register">repmgr standby register --force</link>
+       and provide the connection details for the primary.
+     </para>
+     <para>
+       See <xref linkend="repmgr-standby-register-inactive-node"/> for more details.
+     </para>
+   </tip>
+   <para>
     Then execute the command <command>repmgr standby clone --recovery-conf-only</command>.
     This will create the <filename>recovery.conf</filename> file needed to attach
     the node to its upstream, and will also create a replication slot on the
@@ -326,9 +338,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>

--- a/doc/repmgr-standby-follow.xml
+++ b/doc/repmgr-standby-follow.xml
@@ -20,49 +20,54 @@
      (&quot;follow target&quot;). Typically this will be the primary, but this
      command can also be used to attach the standby to another standby.
    </para>
+
    <para>
-      This command requires a valid
-      <filename>repmgr.conf</filename> file for the standby, either specified
-      explicitly with <literal>-f/--config-file</literal> or located in a
+      This command requires a valid <filename>repmgr.conf</filename> file for the standby,
+      either specified explicitly with <literal>-f/--config-file</literal> or located in a
      default location; no additional arguments are required.
    </para>

-	<para>
-	  By default &repmgr; will attempt to attach the standby to the current primary.
-	  If <option>--upstream-node-id</option> is provided, &repmgr; will attempt
-	  to attach the standby to the specified node, which can be another standby.
-	</para>
-
-    <para>
-      This command will force a restart of the standby server, which must be
-      running.
+    <para>The standby node (&quot;follow candidate&quot;) <emphasis>must</emphasis>
+      be running. If the new upstream (&quot;follow target&quot;) is not the primary,
+      the cluster primary <emphasis>must</emphasis> be running and accessible from the
+      standby node.
    </para>

-	<tip>
+    <tip>
      <para>
-		To re-add an inactive node to the replication cluster, use
-		<xref linkend="repmgr-node-rejoin"/>.
+        To re-add an inactive node to the replication cluster, use
+        <xref linkend="repmgr-node-rejoin"/>.
      </para>
-	</tip>
+    </tip>

-	<para>
-	  <command>repmgr standby follow</command> will wait up to
-	  <varname>standby_follow_timeout</varname> seconds (default: <literal>30</literal>)
-	  to verify the standby has actually connected to the new upstream node.
-	</para>
+    <para>
+      By default &repmgr; will attempt to attach the standby to the current primary.
+      If <option>--upstream-node-id</option> is provided, &repmgr; will attempt
+      to attach the standby to the specified node, which can be another standby.
+    </para>

-	<note>
-	  <para>
-	    If <option>recovery_min_apply_delay</option> is set for the standby, it
-	    will not attach to the new upstream node until it has replayed available
-	    WAL.
-	  </para>
-	  <para>
-	    Conversely, if the standby is attached to an upstream standby
-	    which has <option>recovery_min_apply_delay</option> set, the upstream
-            standby's replay state may actually be behind that of its new downstream node.
-	  </para>
-	</note>
+    <para>
+      This command will force a restart of PostgreSQL on the standby node.
+    </para>
+
+    <para>
+      <command>repmgr standby follow</command> will wait up to
+      <varname>standby_follow_timeout</varname> seconds (default: <literal>30</literal>)
+      to verify the standby has actually connected to the new upstream node.
+    </para>
+
+    <note>
+      <para>
+        If <option>recovery_min_apply_delay</option> is set for the standby, it
+        will not attach to the new upstream node until it has replayed available
+        WAL.
+      </para>
+      <para>
+        Conversely, if the standby is attached to an upstream standby
+        which has <option>recovery_min_apply_delay</option> set, the upstream
+        standby's replay state may actually be behind that of its new downstream node.
+      </para>
+    </note>

  </refsect1>

@@ -124,7 +129,7 @@
          <para>
            Note that when using &repmgrd;, <option>--upstream-node-id</option>
            should always be configured;
-			see <link linkend="repmgrd-automatic-failover-configuration">Automatic failover configuration</link>
+            see <link linkend="repmgrd-automatic-failover-configuration">Automatic failover configuration</link>
            for details.
          </para>
        </listitem>
@@ -166,7 +171,7 @@
      be possible to follow the new upstream node, and &repmgr; will emit an error
      message like this:
      <programlisting>
-ERROR: this node cannot attach to follow target node 3
+ERROR: this node cannot attach to follow target node &quot;node3&quot; (ID 3)
 DETAIL: follow target server's timeline 2 forked off current database system timeline 1 before current recovery point 0/6108880</programlisting>
    </para>
    <para>
--- a/doc/repmgr-standby-register.xml
+++ b/doc/repmgr-standby-register.xml
@@ -75,10 +75,22 @@
   <para>
    Under some circumstances you may wish to register a standby which is not
    yet running; this can be the case when using provisioning tools to create
-    a complex replication cluster. In this case, by using the <option>-F/--force</option>
-    option and providing the connection parameters to the primary server,
-    the standby can be registered.
+    a complex replication cluster, or if the node was not cloned by &repmgr;.
   </para>
+   <para>
+    In this case, by using the <option>-F/--force</option>
+    option and providing the connection parameters to the primary server,
+    the standby can be registered even if it has not yet been started.
+   </para>
+   <tip>
+     <para>
+       Connection parameters can either be provided either as a <literal>conninfo</literal> string
+       (e.g. <option>-d 'host=node1 user=repmgr'</option> or as individual connection parameters
+        (<option>-h/--host</option>, <option>-d/--dbname</option>,
+       <option>-U/--user</option>, <option>-p/--port</option> etc.).
+     </para>
+   </tip>
+
   <para>
    Similarly, with cascading replication it may be necessary to register
    a standby whose upstream node has not yet been registered - in this case,
@@ -96,9 +108,10 @@
    <title>Registering a node not cloned by repmgr</title>
    <para>
      If you've cloned a standby using another method (e.g. <application>barman</application>'s
-     <command>barman recover</command> command), first execute
+     <command>barman recover</command> command), register the node as detailed in section
+     <xref linkend="repmgr-standby-register-inactive-node"/> then execute
     <link linkend="repmgr-standby-create-recovery-conf">repmgr standby clone --recovery-conf-only</link>
-     to add the <filename>recovery.conf</filename> file, then register the standby as usual.
+     to generate the appropriate replication configuration.
    </para>
  </refsect1>

@@ -119,7 +132,7 @@


      <varlistentry>
-       <term><option>-F</option><option>--force</option></term>
+       <term><option>-F</option>/<option>--force</option></term>
        <listitem>
          <para>
            Overwrite an existing node record
--- a/doc/repmgrd-automatic-failover.xml
+++ b/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.
--- a/doc/repmgrd-configuration.xml
+++ b/doc/repmgrd-configuration.xml
@@ -15,9 +15,13 @@
  </para>
  <para>
    &repmgrd; can be configured to provide failover
-    capability in case the primary upstream node becomes unreachable, and/or
+    capability in case the primary or upstream node becomes unreachable, and/or
    provide monitoring data to the &repmgr; metadatabase.
  </para>
+  <para>
+    From &repmgr; 4.4, when running on the primary node, &repmgrd; can also monitor
+    standby disconnections/reconnections (see <xref linkend="repmgrd-primary-child-disconnection"/>).
+  </para>

  <sect1 id="repmgrd-basic-configuration">
    <title>repmgrd configuration</title>
@@ -222,6 +226,17 @@
              Normally <option>promote_command</option> is set as &repmgr;'s
              <command><link linkend="repmgr-standby-promote">repmgr standby promote</link></command> command.
            </para>
+
+            <note>
+              <para>
+                When invoking <command>repmgr standby promote</command> (either directly via
+                the <option>promote_command</option>, or in a script called
+                via <option>promote_command</option>), <option>--siblings-follow</option>
+                <emphasis>must not</emphasis> be included as a
+                command line option for <command>repmgr standby promote</command>.
+              </para>
+            </note>
+
            <para>
              It is also possible to provide a shell script to e.g. perform user-defined tasks
              before promoting the current node. In this case the script <emphasis>must</emphasis>
@@ -554,7 +569,8 @@ repmgrd_service_stop_command='sudo systemctl repmgr11 stop'
        the option <option>monitor_interval_secs</option> (see above).
      </para>
      <para>
-        For more details on monitoring, see <xref linkend="repmgrd-monitoring"/>.
+        For more details on monitoring, see <xref linkend="repmgrd-monitoring"/>. For information on
+        monitoring standby disconnections, see <xref linkend="repmgrd-primary-child-disconnection"/>.
      </para>
    </sect2>

--- a/doc/switchover.xml
+++ b/doc/switchover.xml
@@ -317,7 +317,7 @@
  </para>
  <para>
    If &repmgrd; is in use, it's worth double-checking that
-    all nodes are unpaused by executing <command><link linkend="repmgr-daemon-status">repmgr-daemon-status</link></command>.
+    all nodes are unpaused by executing <command><link linkend="repmgr-daemon-status">repmgr daemon status</link></command>.
  </para>

   <note>
--- a/doc/upgrading-repmgr.xml
+++ b/doc/upgrading-repmgr.xml
@@ -263,7 +263,7 @@ ALTER EXTENSION repmgr UPDATE</programlisting>
  <tip>
 	<para>
 	  Use <command><link linkend="repmgr-node-check">repmgr node check</link></command>
-	  to determine which replacation slots need to be recreated.
+	  to determine which replication slots need to be recreated.
 	</para>
  </tip>

--- a/repmgr--4.0.sql
+++ b/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
 );
--- a/repmgr--4.1.sql
+++ b/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
 );
--- a/repmgr--4.2.sql
+++ b/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
 );
--- a/repmgr--4.3.sql
+++ b/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
 );
--- a/repmgr--4.4.sql
+++ b/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
 );
--- a/repmgr-action-node.c
+++ b/repmgr-action-node.c
@@ -1833,7 +1833,7 @@ do_node_check_data_directory(PGconn *conn, OutputMode mode, t_node_info *node_in
 	 * a superuser connection
 	 */

-	if (is_superuser_connection(conn, NULL) == true)
+	if (connection_has_pg_settings(conn) == true)
 	{
 		/* we expect to have a database connection */
 		if (get_pg_setting(conn, "data_directory", actual_data_directory) == false)
@@ -1878,7 +1878,7 @@ do_node_check_data_directory(PGconn *conn, OutputMode mode, t_node_info *node_in
 			/* XXX add -S/--superuser option */
 			if (PQserverVersion(conn) >= 100000)
 			{
-				log_hint(_("add the \"%s\" user to group \"pg_read_all_settings\""),
+				log_hint(_("add the \"%s\" user to group \"pg_read_all_settings\" or \"pg_monitor\""),
 						   PQuser(conn));
 			}
 		}
--- a/repmgr-action-standby.c
+++ b/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);
@@ -1000,6 +1000,9 @@ _do_create_recovery_conf(void)
 	/* check connection */
 	source_conn = establish_db_connection_by_params(&source_conninfo, true);

+	/* Verify that source is a supported server version */
+	(void) check_server_version(source_conn, "source node", true, NULL);
+
 	/* determine node for primary_conninfo */

 	if (runtime_options.upstream_node_id != UNKNOWN_NODE_ID)
@@ -2784,12 +2787,6 @@ do_standby_follow(void)

 	PQfinish(local_conn);

-	if (runtime_options.dry_run == true)
-	{
-		log_info(_("prerequisites for executing STANDBY FOLLOW are met"));
-		exit(SUCCESS);
-	}
-
 	/*
 	 * Here we'll need a connection to the primary, if the upstream is not a primary.
 	 */
@@ -2802,12 +2799,30 @@ do_standby_follow(void)
 		primary_conn = get_primary_connection_quiet(follow_target_conn,
 													&primary_node_id,
 													NULL);
+
+		/*
+		 * If follow target is not primary and no other primary could be found,
+		 * abort because we won't be able to update the node record.
+		 */
+		if (PQstatus(primary_conn) != CONNECTION_OK)
+		{
+			log_error(_("unable to determine the cluster primary"));
+			log_detail(_("an active primary node is required for \"repmgr standby follow\""));
+			PQfinish(follow_target_conn);
+			exit(ERR_FOLLOW_FAIL);
+		}
 	}
 	else
 	{
 		primary_conn = follow_target_conn;
 	}

+	if (runtime_options.dry_run == true)
+	{
+		log_info(_("prerequisites for executing STANDBY FOLLOW are met"));
+		exit(SUCCESS);
+	}
+
 	initPQExpBuffer(&follow_output);

 	success = do_standby_follow_internal(
@@ -2991,54 +3006,27 @@ 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 it 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;
-
-		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);
+		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)
+	{
 		/*
-		 * store the original upstream node id so we can delete the
-		 * replication slot, if exists
+		 * Only attempt to delete the old replication slot if the old upstream
+		 * node is known and is different to the follow target node.
 		 */
-		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)
+		if (original_upstream_node_id != UNKNOWN_NODE_ID
+		 && original_upstream_node_id != follow_target_node_record->node_id)
 		{
 			remove_old_replication_slot = true;
 		}
@@ -3066,6 +3054,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);

@@ -3187,8 +3181,6 @@ do_standby_follow_internal(PGconn *primary_conn, PGconn *follow_target_conn, t_n
 	 * Note that if this function is called by do_standby_switchover(), the
 	 * "repmgr node rejoin" command executed on the demotion candidate may already
 	 * have removed the slot, so there may be nothing to do.
-	 *
-	 * XXX check if former upstream is current primary?
 	 */

 	if (remove_old_replication_slot == true)
@@ -4769,6 +4761,7 @@ check_source_server()
 	t_node_info upstream_node_record = T_NODE_INFO_INITIALIZER;
 	RecordStatus record_status = RECORD_NOT_FOUND;
 	ExtensionStatus extension_status = REPMGR_UNKNOWN;
+	t_extension_versions extversions = T_EXTENSION_VERSIONS_INITIALIZER;

 	/* Attempt to connect to the upstream server to verify its configuration */
 	log_verbose(LOG_DEBUG, "check_source_server()");
@@ -4832,7 +4825,7 @@ check_source_server()
 	 * to be used as a standalone clone tool)
 	 */

-	extension_status = get_repmgr_extension_status(primary_conn, NULL);
+	extension_status = get_repmgr_extension_status(primary_conn, &extversions);

 	if (extension_status != REPMGR_INSTALLED)
 	{
@@ -4847,20 +4840,25 @@ check_source_server()
 				exit(ERR_DB_QUERY);
 			}

-			/* schema doesn't exist */
-			log_error(_("repmgr extension not found on source node"));
-
 			if (extension_status == REPMGR_AVAILABLE)
 			{
-				log_detail(_("repmgr extension is available but not installed in database \"%s\""),
+				log_error(_("repmgr extension is available but not installed in database \"%s\""),
 						   param_get(&source_conninfo, "dbname"));
+				log_hint(_("check that you are cloning from the database where \"repmgr\" is installed"));
 			}
 			else if (extension_status == REPMGR_UNAVAILABLE)
 			{
-				log_detail(_("repmgr extension is not available on the upstream node"));
+				log_error(_("repmgr extension is not available on the upstream node"));
+			}
+			else if (extension_status == REPMGR_OLD_VERSION_INSTALLED)
+			{
+				log_error(_("an older version of the extension is installed on the upstream node"));
+				log_detail(_("version %s is installed but newer version %s is available"),
+						   extversions.installed_version,
+						   extversions.default_version);
+				log_hint(_("upgrade \"repmgr\" on the source node first"));
 			}

-			log_hint(_("check that the upstream node is part of a repmgr cluster"));
 			PQfinish(source_conn);
 			exit(ERR_BAD_CONFIG);
 		}
@@ -4885,6 +4883,13 @@ check_source_server()
 		 * later, as this is a precautionary check and we can retrieve the system
 		 * identifier with a normal connection.
 		 */
+
+		if (runtime_options.dry_run == true)
+		{
+			log_info(_("\"repmgr\" extension is installed in database \"%s\""),
+					 param_get(&source_conninfo, "dbname"));
+		}
+
 		if (get_recovery_type(source_conn) == RECTYPE_PRIMARY && PQserverVersion(source_conn) >= 90600)
 		{
 			uint64		source_system_identifier = system_identifier(source_conn);
@@ -6942,11 +6947,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 +6966,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,
--- a/repmgr-client.c
+++ b/repmgr-client.c
@@ -1908,6 +1908,7 @@ check_cli_parameters(const int action)
 			case NODE_SERVICE:
 			case DAEMON_PAUSE:
 			case DAEMON_UNPAUSE:
+			case DAEMON_STATUS:
 			case DAEMON_START:
 			case DAEMON_STOP:
 				break;
@@ -2833,15 +2834,25 @@ create_repmgr_extension(PGconn *conn)
 int
 check_server_version(PGconn *conn, char *server_type, bool exit_on_error, char *server_version_string)
 {
-	int			conn_server_version_num = get_server_version(conn, server_version_string);
+	char		version_string[MAXVERSIONSTR] = "";
+	int			conn_server_version_num = get_server_version(conn, version_string);
+
+	/* Copy the version string, if the caller wants it */
+	if (server_version_string != NULL)
+		strncpy(server_version_string, version_string, MAXVERSIONSTR);

 	if (conn_server_version_num < MIN_SUPPORTED_VERSION_NUM)
 	{
 		if (conn_server_version_num > 0)
+		{
 			log_error(_("%s requires %s to be PostgreSQL %s or later"),
 					  progname(),
 					  server_type,
 					  MIN_SUPPORTED_VERSION);
+			log_detail(_("%s server version is %s"),
+					   server_type,
+					   version_string);
+		}

 		if (exit_on_error == true)
 		{
@@ -2852,6 +2863,38 @@ check_server_version(PGconn *conn, char *server_type, bool exit_on_error, char *
 		return UNKNOWN_SERVER_VERSION_NUM;
 	}

+	/*
+	 * If it's clear a particular repmgr feature branch won't be able to support
+	 * PostgreSQL from a particular PostgreSQL release onwards (e.g. 4.4 with PostgreSQL
+	 * 12 and later due to recovery.conf removal), set MAX_UNSUPPORTED_VERSION and
+	 * MAX_UNSUPPORTED_VERSION_NUM in "repmgr.h" to define the first PostgreSQL
+	 * version which can't be suppored.
+	 */
+#ifdef MAX_UNSUPPORTED_VERSION_NUM
+	if (conn_server_version_num >= MAX_UNSUPPORTED_VERSION_NUM)
+	{
+		if (conn_server_version_num > 0)
+		{
+			log_error(_("%s %s does not support PostgreSQL %s or later"),
+					  progname(),
+					  REPMGR_VERSION,
+					  MAX_UNSUPPORTED_VERSION);
+			log_detail(_("%s server version is %s"),
+					   server_type,
+					   version_string);
+			log_hint(_("For details of supported versions see: https://repmgr.org/docs/current/install-requirements.html#INSTALL-COMPATIBILITY-MATRIX"));
+		}
+
+		if (exit_on_error == true)
+		{
+			PQfinish(conn);
+			exit(ERR_BAD_CONFIG);
+		}
+
+		return UNKNOWN_SERVER_VERSION_NUM;
+	}
+#endif
+
 	return conn_server_version_num;
 }

@@ -3029,19 +3072,19 @@ copy_remote_files(char *host, char *remote_user, char *remote_path,

 	if (*config_file_options.rsync_options == '\0')
 	{
-		appendPQExpBuffer(&rsync_flags, "%s",
-						  "--archive --checksum --compress --progress --rsh=ssh");
+		appendPQExpBufferStr(&rsync_flags,
+							 "--archive --checksum --compress --progress --rsh=ssh");
 	}
 	else
 	{
-		appendPQExpBuffer(&rsync_flags, "%s",
-						  config_file_options.rsync_options);
+		appendPQExpBufferStr(&rsync_flags,
+							 config_file_options.rsync_options);
 	}

 	if (runtime_options.force)
 	{
-		appendPQExpBuffer(&rsync_flags, "%s",
-						  " --delete --checksum");
+		appendPQExpBufferStr(&rsync_flags,
+							 " --delete --checksum");
 	}

 	if (!remote_user[0])
@@ -3067,11 +3110,11 @@ copy_remote_files(char *host, char *remote_user, char *remote_path,
 	if (is_directory)
 	{
 		/* Files which we don't want */
-		appendPQExpBuffer(&rsync_flags, "%s",
-						  " --exclude=postmaster.pid --exclude=postmaster.opts --exclude=global/pg_control");
+		appendPQExpBufferStr(&rsync_flags,
+							 " --exclude=postmaster.pid --exclude=postmaster.opts --exclude=global/pg_control");

-		appendPQExpBuffer(&rsync_flags, "%s",
-						  " --exclude=recovery.conf --exclude=recovery.done");
+		appendPQExpBufferStr(&rsync_flags,
+							 " --exclude=recovery.conf --exclude=recovery.done");

 		if (server_version_num >= 90400)
 		{
@@ -3079,8 +3122,8 @@ copy_remote_files(char *host, char *remote_user, char *remote_path,
 			 * Ideally we'd use PG_AUTOCONF_FILENAME from utils/guc.h, but
 			 * that has too many dependencies for a mere client program.
 			 */
-			appendPQExpBuffer(&rsync_flags, "%s",
-							  " --exclude=postgresql.auto.conf.tmp");
+			appendPQExpBufferStr(&rsync_flags,
+								 " --exclude=postgresql.auto.conf.tmp");
 		}

 		/* Temporary files which we don't want, if they exist */
@@ -3091,17 +3134,17 @@ copy_remote_files(char *host, char *remote_user, char *remote_path,

 		if (server_version_num >= 100000)
 		{
-			appendPQExpBuffer(&rsync_flags, "%s",
-							  " --exclude=pg_wal/*");
+			appendPQExpBufferStr(&rsync_flags,
+								 " --exclude=pg_wal/*");
 		}
 		else
 		{
-			appendPQExpBuffer(&rsync_flags, "%s",
-							  " --exclude=pg_xlog/*");
+			appendPQExpBufferStr(&rsync_flags,
+								 " --exclude=pg_xlog/*");
 		}

-		appendPQExpBuffer(&rsync_flags, "%s",
-						  " --exclude=pg_log/* --exclude=pg_stat_tmp/*");
+		appendPQExpBufferStr(&rsync_flags,
+							 " --exclude=pg_log/* --exclude=pg_stat_tmp/*");

 		maxlen_snprintf(script, "rsync %s %s:%s/* %s",
 						rsync_flags.data, host_string, remote_path, local_path);
--- a/repmgr.c
+++ b/repmgr.c
@@ -702,7 +702,7 @@ set_repmgrd_pid(PG_FUNCTION_ARGS)
 	shared_state->repmgrd_pid = repmgrd_pid;
 	memset(shared_state->repmgrd_pidfile, 0, MAXPGPATH);

-	if(repmgrd_pidfile != NULL)
+	if (repmgrd_pidfile != NULL)
 	{
 		strncpy(shared_state->repmgrd_pidfile, repmgrd_pidfile, MAXPGPATH);
 	}
--- a/repmgr.conf.sample
+++ b/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,
--- a/repmgr.h
+++ b/repmgr.h
@@ -21,6 +21,37 @@
 #include <config.h>
 #endif

+#ifdef vsnprintf
+#undef vsnprintf
+#endif
+#ifdef snprintf
+#undef snprintf
+#endif
+#ifdef vsprintf
+#undef vsprintf
+#endif
+#ifdef sprintf
+#undef sprintf
+#endif
+#ifdef vfprintf
+#undef vfprintf
+#endif
+#ifdef fprintf
+#undef fprintf
+#endif
+#ifdef vprintf
+#undef vprintf
+#endif
+#ifdef printf
+#undef printf
+#endif
+#ifdef strerror
+#undef strerror
+#endif
+#ifdef strerror_r
+#undef strerror_r
+#endif
+
 #ifndef _REPMGR_H_
 #define _REPMGR_H_

@@ -46,6 +77,9 @@
 #define MIN_SUPPORTED_VERSION		"9.3"
 #define MIN_SUPPORTED_VERSION_NUM	90300

+#define MAX_UNSUPPORTED_VERSION		"12"
+#define MAX_UNSUPPORTED_VERSION_NUM	120000
+
 #define REPLICATION_TYPE_PHYSICAL 1
 #define REPLICATION_TYPE_BDR	  2

--- a/repmgr_version.h.in
+++ b/repmgr_version.h.in
@@ -1,3 +1,4 @@
 #define REPMGR_VERSION_DATE ""
-#define REPMGR_VERSION "4.4dev"
+#define REPMGR_VERSION "4.4"
 #define REPMGR_VERSION_NUM 40400
+#define REPMGR_RELEASE_DATE "2019-06-27"
--- a/repmgrd-physical.c
+++ b/repmgrd-physical.c
@@ -4909,7 +4909,8 @@ check_node_can_follow(PGconn *local_conn, XLogRecPtr local_xlogpos, PGconn *foll
 		 */
 		if (local_xlogpos > follow_target_history->end)
 		{
-			log_error(_("this node cannot attach to follow target node %i"),
+			log_error(_("this node cannot attach to follow target node \"%s\" (ID: %i)"),
+					  follow_target_node_info->node_name,
 					  follow_target_node_info->node_id);
 			can_follow = false;

@@ -4921,8 +4922,10 @@ check_node_can_follow(PGconn *local_conn, XLogRecPtr local_xlogpos, PGconn *foll

 		if (can_follow == true)
 		{
-			log_info(_("local node %i can attach to follow target node %i"),
+			log_info(_("local node \"%s\" (ID: %i) can attach to follow target node \"%s\" (ID: %i)"),
+					 config_file_options.node_name,
 					 config_file_options.node_id,
+					 follow_target_node_info->node_name,
 					 follow_target_node_info->node_id);

 			log_detail(_("local node's recovery point: %X/%X; follow target node's fork point: %X/%X"),
Author	SHA1	Message	Date
Ian Barwick	1337f68caf	doc: note downstream node (dis)connection monitoring in more places	2020-06-09 16:42:45 +09:00
Ian Barwick	00494f1a15	repmgr 4.4.x is not compatible with PostgreSQL 12 or later	2020-02-14 10:42:38 +09:00
Ian Barwick	1460e6400a	Add optional check for unsupported future PostgreSQL releases This is for backbranches to prevent them running against newer PostgreSQL versions with which they are not compatible, for example 4.4.x with PostgreSQL 12 and later.	2020-02-14 10:39:28 +09:00
Ian Barwick	daa7de1cd0	standby follow: don't attempt to delete slot if new upstream is same as current An attempt will be made to delete an existing replication slot on the old upstream node (this is important during e.g. a switchover operation or when attaching a cascaded standby to a new upstream). However if the standby is currently attached to the follow target node anyway, the replication slot should never be deleted.	2019-12-10 15:58:45 +09:00
Ian Barwick	0fbc0f42b5	Prevent use of backend string functions From PostgreSQL 12, port.h forcibly redefines printf() et al to use the versions defined by PostgreSQL (pg_printf() et al). As this causes linking issues in build environments which build pre-Pg12 versions against Pg12's libpq, ensure relevant macros defined in port.h are undefined.	2019-10-09 09:12:58 +09:00
Ian Barwick	34aa54b766	doc: clarify use of --recovery-conf-only	2019-10-08 10:04:23 +09:00
Ian Barwick	01ec64c330	doc: fix minor formatting error	2019-10-08 10:04:19 +09:00
Ian Barwick	41637f0c43	doc: improve instructions for cloning from Barman	2019-10-07 11:58:04 +09:00
Ian Barwick	b61989bafe	doc: improve Barman standby clone example	2019-10-07 11:58:01 +09:00
Ian Barwick	c2987b6c9b	doc: clarify barman-cli package usage As of Barman 2.8, the barman-cli package has been merged with the core Barman code, so is only requires an explicit mention for Barman 2.0 ~ 2.7.	2019-10-07 11:57:58 +09:00
Ian Barwick	c6d151ef56	doc: remove reference to Barman 1.x. Barman 1.x is very outdated and should no longer be used anyway.	2019-10-07 11:57:54 +09:00
Ian Barwick	867ebcb52d	repmgr: note that --dry-run is not effective with "repmgr daemon status"	2019-08-28 15:17:01 +09:00
Ian Barwick	9abf72af07	doc: fix link text	2019-08-28 15:12:45 +09:00
Ian Barwick	2256c0a81f	repmgrd: fix pidfile handling at shutdown	2019-08-19 20:16:21 +09:00
Ian Barwick	701fdd9622	Use appendPQExpBufferStr where appropriate	2019-08-13 16:32:56 +09:00
Ian Barwick	5c1ca6cba5	doc: mention not to use --siblings-follow in the repmgrd promote command This is noted on the "repmgr standby promote" page but needs repeating on the repmgrd configuration page.	2019-08-13 11:36:15 +09:00
Ian Barwick	2dce4b06b4	repmgrd: emit node name when reporting follow target attach error This is consistent with other error messages.	2019-08-13 11:07:07 +09:00
Ian Barwick	f1716a67b0	"standby clone": improve error messages related to extension status Previously repmgr would emit the "repmgr extension not found on source node" which depending on context is somewhat misleading, as it may exist but not be installed, or the user may be attempting to clone from the wrong database.	2019-08-07 16:45:42 +09:00
Ian Barwick	1d43f1cdb5	Simplify pg_has_role() call Specifying CURRENT_USER is superfluous here.	2019-08-07 14:42:11 +09:00
Ian Barwick	7cc12f08ed	"node check": check role membership when trying to read pg_settings From PostgreSQL 10, a member of the default roles "pg_monitor" and/or "pg_read_all_settings" can read pg_settings without requiring superuser privileges. Previously, a hint was being emitted about making the repmgr user a member of one of those groups, but no check for membership was being made, meaning the check could only be run by a superuser.	2019-08-07 14:27:26 +09:00
Ian Barwick	8484bc6687	Add missing field in init_replication_info() "upstream_node_id" was not being initialised.	2019-08-07 13:22:54 +09:00
Ian Barwick	d92d008cb3	doc: add note about parallel restore from Barman	2019-07-18 09:26:27 +09:00
Ian Barwick	38adf5daca	Add 4.4 release date	2019-07-09 11:32:18 +09:00
Ian Barwick	4a8684e37b	doc: define entity &releasedate; This should be used wherever we need to show the latest release date. Don't use this in the release notes however, as it will be easy to forget to update it when adding notes for a new release.	2019-07-09 11:30:05 +09:00
Ian Barwick	9c9f4c8c32	doc: update compatibility matrix Use &repmgrversion; entity to generate the current version number and prevent document bitrot. Also define a "release-current" ID attribute for ease of linking to the current release notes. Per notification from the mailing list.	2019-07-09 11:10:15 +09:00
Ian Barwick	0e1319d788	doc: update release notes	2019-07-04 11:22:06 +09:00
Ian Barwick	9c784f804e	doc: update "repmgr cluster show" examples	2019-06-27 15:36:09 +09:00
Ian Barwick	13097e30f0	doc: fix typo	2019-06-27 15:33:49 +09:00
Ian Barwick	40b6c92129	doc: update release notes Finalize release date.	2019-06-26 15:57:17 +09:00
Ian Barwick	761d65526c	Finalize version number 4.4	2019-06-26 15:56:33 +09:00
Ian Barwick	a13a1232e9	doc: document optional configuration settings	2019-06-20 16:50:30 +09:00
Ian Barwick	65965b3ba4	4.4rc1	2019-06-20 16:21:54 +09:00
Ian Barwick	629d2b8f85	doc: clean up release notes Remove tabs.	2019-06-20 16:18:41 +09:00
Ian Barwick	23c285b73b	doc: fix typo	2019-06-12 16:29:17 +09:00
Ian Barwick	915fb7d617	note that "standby follow" requires a primary to be available While it's technically possible to have a standby follow another standby while the primary is not available, repmgr will not be able to update its metadata, which will cause Confusion and Chaos. Update the documentation to make this clear, and provide a more helpful error message if this situation occurs. The operation previously failed anyway, but with an unhelpful message about not being able to find a node record.	2019-06-11 15:18:41 +09:00
Ian Barwick	ae141b9d32	4.4beta2	2019-06-10 15:18:41 +09:00
Ian Barwick	d035550723	doc: add missing space	2019-06-10 09:02:51 +09:00
Ian Barwick	c7692b5d84	doc: improve repmgr.conf settings documentation	2019-06-07 12:50:05 +09:00
Ian Barwick	08b7f1294b	doc: improve configuration documentation	2019-06-07 12:17:49 +09:00
Ian Barwick	81d01bf0e8	Canonicalize the data directory path when parsing the configuration file This ensures the provided path matches the path PostgreSQL reports as its data directory.	2019-06-07 09:53:44 +09:00
Ian Barwick	089c778e49	Fix extension version number query	2019-06-06 12:46:30 +09:00
Ian Barwick	b4b5681762	standby follow: remove some ineffective code For some reason we were taking the trouble to extract an appliction_name from the local node's conninfo, but this was being subsequently overwritten with the node name (which is what we want anyway).	2019-06-06 12:15:23 +09:00
Ian Barwick	e5ef549aa7	doc: update release notes	2019-06-06 11:30:43 +09:00
Ian Barwick	cfc41392c3	Ensure parsed value of --upstream-conninfo is written to recovery.conf Previously it was being parsed (a step which ensures any "application_name" set by the caller is changed to the node name), but the original string was being copied to "primary_conninfo" anyway.	2019-06-06 11:30:40 +09:00
Ian Barwick	55dc4f7a5f	Remove redundant comment in .sql files	2019-06-04 13:46:30 +09:00
Ian Barwick	6616712346	4.4beta1	2019-06-04 13:22:56 +09:00