4.4rc1

Remove tabs.

HISTORY

@@ -24,6 +24,7 @@
         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

doc/appendix-release-notes.xml

@@ -43,6 +43,14 @@
             </para>
           </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>
               &repmgr;: when executing <link linkend="repmgr-standby-switchover"><command>repmgr standby switchover</command></link>,
@@ -75,7 +83,6 @@
             </para>
           </listitem>
 
-
           <listitem>
             <para>
               <link linkend="repmgr-standby-promote"><command>repmgr standby promote</command></link>:

doc/repmgr-standby-follow.xml

@@ -20,22 +20,17 @@
       ("follow target"). 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
+      This command requires a valid <filename>repmgr.conf</filename> file for the standby,
-      <filename>repmgr.conf</filename> file for the standby, either specified
+      either specified explicitly with <literal>-f/--config-file</literal> or located in a
-      explicitly with <literal>-f/--config-file</literal> or located in a
       default location; no additional arguments are required.
     </para>
 
-	<para>
+    <para>The standby node (&quot;follow candidate&quot;) <emphasis>must</emphasis>
-	  By default &repmgr; will attempt to attach the standby to the current primary.
+      be running. If the new upstream (&quot;follow target&quot;) is not the primary,
-	  If <option>--upstream-node-id</option> is provided, &repmgr; will attempt
+      the cluster primary <emphasis>must</emphasis> be running and accessible from the
-	  to attach the standby to the specified node, which can be another standby.
+      standby node.
-	</para>
-
-    <para>
-      This command will force a restart of the standby server, which must be
-      running.
     </para>
 
     <tip>
@@ -45,6 +40,16 @@
       </para>
     </tip>
 
+    <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 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>)

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>
 

repmgr-action-standby.c

@@ -2784,12 +2784,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 +2796,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(

repmgr_version.h.in

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