need to provide the follow target node record for node follow internal

otherwise fails when using a dedicated replication user.

WIP.

.github/workflows/sonarqube-scan.yml

@@ -0,0 +1,37 @@
+name: SonarQube Scan
+on:
+  pull_request:
+  push:
+    branches: [ master ]
+  workflow_dispatch:  
+jobs:
+  sonarQube:
+    name: SonarQube-Job
+    runs-on: ubuntu-latest
+    steps:
+    
+      - name: Checkout source repo
+        uses: actions/checkout@v1
+        with:
+          ref: '${{ github.head_ref }}'
+    
+      - name: Checkout GitHub Action Repo
+        uses: actions/checkout@master
+        with:
+          repository: EnterpriseDB/edb-github-actions.git
+          ref: master
+          token: ${{ secrets.GH_SLONIK }}
+          path: .github/actions/edb-github-actions
+          
+      - name: SonarQube Scan
+        uses: ./.github/actions/edb-github-actions/sonarqube
+        with:
+            REPO_NAME: '${{github.event.repository.name}}'
+            SONAR_PROJECT_KEY: EnterpriseDB_repmgr
+            SONAR_URL: '${{secrets.SONARQUBE_URL}}'
+            SONAR_LOGIN: '${{secrets.SONARQUBE_LOGIN}}'
+            PULL_REQUEST_KEY: '${{github.event.number}}'
+            PULL_REQUEST_BRANCH: '${{github.head_ref}}'
+            PULL_REQUEST_BASE_BRANCH: '${{github.base_ref}}'
+            REPO_DEFAULT_BRANCH: '${{github.event.repository.default_branch}}'
+            REPO_EXCLUDE_FILES: '*properties*,**/src/test/**/*,**/*.sql,**/docs/**/*,**/*/*.java'

.github/workflows/sonarqube/configure-env.sh

@@ -0,0 +1,18 @@
+#!/bin/bash
+
+DEBIAN_FRONTEND=noninteractive sudo apt-get -y install debhelper curl autoconf zlib1g-dev \
+  libedit-dev libxml2-dev libxslt1-dev libkrb5-dev libssl-dev libpam0g-dev systemtap-sdt-dev \
+  libselinux1-dev build-essential bison apt-utils lsb-release devscripts \
+  software-properties-common git shellcheck flex
+
+sudo sh -c 'echo "deb http://apt.postgresql.org/pub/repos/apt $(lsb_release -cs)-pgdg main" > /etc/apt/sources.list.d/pgdg.list'
+wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | sudo apt-key add -
+sudo apt-get update
+
+sudo apt-get -y install libpq-dev postgresql-13 postgresql-server-dev-13
+
+./configure
+
+export PG_CONFIG=/usr/bin/pg_config
+
+/home/buildfarm/sonar/depends/build-wrapper-linux-x86/build-wrapper-linux-x86-64 --out-dir build_wrapper_output_directory make 

HISTORY

@@ -1,15 +1,8 @@
-5.3.3   2022-10-17
+5.3.2   2022-??-??
-        Support for PostgreSQL added
-        repmgrd: ensure event notification script is called for event
-          "repmgrd_upstream_disconnect"; GitHub #760 (Ian)
-
-5.3.2   2022-05-25
         standby clone: don't error out if unable to determine cluster size (Ian)
         node check: fix --downstream --nagios output; GitHub #749 (Ian)
         repmgrd: ensure witness node marked active (hslightdb)
         repmgrd: improve walsender disable check (Ian)
-        general: ensure replication slots can be dropped by a
-          replication-only user (Ian)
 
 5.3.1   2022-02-15
         repmgrd: fixes for potential connection leaks (hslightdb)
@@ -74,7 +67,7 @@
           "standby clone" (Ian)
         repmgr: add --upstream option to "node check"
         repmgr: report error code on follow/rejoin failure due to non-available
-          replication slot (Ian)
+0          replication slot (Ian)
         repmgr: ensure "node rejoin" checks for available replication slots (Ian)
         repmgr: improve "standby switchover" completion checks (Ian)
         repmgr: add replication configuration file ownership check to

Makefile.in

@@ -81,10 +81,10 @@ configfile-scan.c: configfile-scan.l
 $(REPMGR_CLIENT_OBJS): repmgr-client.h repmgr_version.h
 
 repmgr: $(REPMGR_CLIENT_OBJS)
-	$(CC) $(CFLAGS) $(REPMGR_CLIENT_OBJS) $(libpq_pgport) $(LDFLAGS) $(LDFLAGS_EX) $(LIBS) -o $@$(X)
+	$(CC) $(CFLAGS) $(REPMGR_CLIENT_OBJS) $(libpq_pgport) $(LDFLAGS) $(LDFLAGS_EX) -o $@$(X)
 
 repmgrd: $(REPMGRD_OBJS)
-	$(CC) $(CFLAGS) $(REPMGRD_OBJS) $(libpq_pgport) $(LDFLAGS) $(LDFLAGS_EX) $(LIBS) -o $@$(X)
+	$(CC) $(CFLAGS) $(REPMGRD_OBJS) $(libpq_pgport) $(LDFLAGS) $(LDFLAGS_EX) -o $@$(X)
 
 $(REPMGR_CLIENT_OBJS): $(HEADERS)
 $(REPMGRD_OBJS): $(HEADERS)

README.md

@@ -7,8 +7,8 @@ replication capabilities with utilities to set up standby servers, monitor
 replication, and perform administrative tasks such as failover or switchover
 operations.
 
-The most recent `repmgr` version (5.3.2) supports all PostgreSQL versions from
+The most recent `repmgr` version (5.2.1) supports all PostgreSQL versions from
-9.5 to 14. PostgreSQL 9.4 is also supported, with some restrictions.
+9.5 to 13. PostgreSQL 9.4 is also supported, with some restrictions.
 
 `repmgr` is distributed under the GNU GPL 3 and maintained by EnterpriseDB.
 
@@ -19,6 +19,14 @@ The full `repmgr` documentation is available here:
 
 > [repmgr documentation](https://repmgr.org/docs/current/index.html)
 
+The old `README` file for `repmgr` 3.x is available here:
+
+> https://github.com/EnterpriseDB/repmgr/blob/REL3_3_STABLE/README.md
+
+Note that the `repmgr` 3.x series is no longer supported and contains known bugs;
+please upgrade to the [current repmgr version](https://repmgr.org/docs/current/appendix-release-notes.html)
+as soon as possible.
+
 Versions
 --------
 

dbutils.c

@@ -4616,17 +4616,17 @@ drop_replication_slot_replprot(PGconn *repl_conn, char *slot_name)
 	initPQExpBuffer(&query);
 
 	appendPQExpBuffer(&query,
-					  "DROP_REPLICATION_SLOT %s;",
+					  "DROP_REPLICATION_SLOT %s",
 					  slot_name);
 
 	log_verbose(LOG_DEBUG, "drop_replication_slot_replprot():\n  %s", query.data);
 
 	res = PQexec(repl_conn, query.data);
 
-	if (PQresultStatus(res) != PGRES_TUPLES_OK || !PQntuples(res))
+	if (PQresultStatus(res) != PGRES_TUPLES_OK)
 	{
 		log_db_error(repl_conn, query.data,
-					 _("drop_replication_slot_replprot(): unable to drop replication slot \"%s\""),
+					 _("drop_replication_slot_sql(): unable to drop replication slot \"%s\""),
 					 slot_name);
 
 		success = false;

doc/appendix-release-notes.xml

@@ -16,45 +16,12 @@
   </para>
 
   <!-- remember to update the release date in ../repmgr_version.h.in -->
-  <sect1 id="release-5.3.3">
-    <title id="release-current">Release 5.3.3</title>
-    <para><emphasis>Mon 17 October, 2022</emphasis></para>
-    <para>
-      &repmgr; 5.3.3 is a minor release providing support for
-      <ulink url="https://www.postgresql.org/docs/15/release-15.html">PostgreSQL 15</ulink>
-      and a &repmgrd; bug fix.
-    </para>
-    <para>
-      If upgrading from an earlier &repmgr; version, any running &repmgrd; instances should be restarted.
-    </para>
-    <para>
-      If upgrading from &repmgr; 5.2.1 or earlier, a PostgreSQL restart <emphasis>is</emphasis> required.
-    </para>
-
-    <sect2>
-      <title>Bug fixes</title>
-      <para>
-        <itemizedlist>
-          <listitem>
-            <para>
-              &repmgrd;: ensure <link linkend="event-notifications">event notification</link> script is called for event
-              <literal>repmgrd_upstream_disconnect</literal>.  GitHub #760.
-            </para>
-          </listitem>
-        </itemizedlist>
-      </para>
-    </sect2>
-  </sect1>
-
   <sect1 id="release-5.3.2">
-    <title>Release 5.3.2</title>
+    <title id="release-current">Release 5.3.2</title>
-    <para><emphasis>Wed 25 May, 2022</emphasis></para>
+    <para><emphasis>??? ??? ???, 2022</emphasis></para>
     <para>
       &repmgr; 5.3.2 is a minor release.
     </para>
-    <para>
-      Any running &repmgrd; instances should be restarted following this upgrade.
-    </para>
     <para>
       If upgrading from &repmgr; 5.2.1 or earlier, a PostgreSQL restart <emphasis>is</emphasis> required.
     </para>
@@ -94,13 +61,6 @@
               &repmgr; is a superuser before attempting to disable the WAL receiver.
             </para>
           </listitem>
-          <listitem>
-            <para>
-              If the &repmgr; user is a non-superuser, and a replication-only user exists,
-              ensure redundant replication slots are dropped correctly even
-              if the <option>-S/--superuser</option> option is not provided.
-            </para>
-          </listitem>
         </itemizedlist>
       </para>
     </sect2>

doc/install-requirements.xml

@@ -108,31 +108,10 @@
             <entry>
               Supported PostgreSQL versions
             </entry>
-            <entry>
-              Notes
-            </entry>
           </row>
         </thead>
 
         <tbody>
-          <row>
-            <entry>
-              &repmgr; 5.4
-            </entry>
-            <entry>
-              (dev)
-            </entry>
-            <entry>
-              <link linkend="release-current">&repmgrversion;</link> (&releasedate;)
-            </entry>
-            <entry>
-              9.4, 9.5, 9.6, 10, 11, 12, 13, 15
-            </entry>
-            <entry>
-              &nbsp;
-            </entry>
-          </row>
-
           <row>
             <entry>
               &repmgr; 5.3
@@ -144,10 +123,7 @@
               <link linkend="release-current">&repmgrversion;</link> (&releasedate;)
             </entry>
             <entry>
-              9.4, 9.5, 9.6, 10, 11, 12, 13, 14, 15
+              9.4, 9.5, 9.6, 10, 11, 12, 13, 14
-            </entry>
-            <entry>
-              PostgreSQL 15 supported from &repmgr; 5.3.3
             </entry>
           </row>
 
@@ -164,9 +140,6 @@
             <entry>
               9.4, 9.5, 9.6, 10, 11, 12, 13
             </entry>
-            <entry>
-              &nbsp;
-            </entry>
           </row>
 
           <row>
@@ -182,9 +155,6 @@
             <entry>
               9.3, 9.4, 9.5, 9.6, 10, 11, 12
             </entry>
-            <entry>
-              &nbsp;
-            </entry>
           </row>
 
           <row>
@@ -200,9 +170,6 @@
             <entry>
               9.3, 9.4, 9.5, 9.6, 10, 11, 12
             </entry>
-            <entry>
-              &nbsp;
-            </entry>
           </row>
 
 
@@ -219,9 +186,6 @@
             <entry>
               9.3, 9.4, 9.5, 9.6, 10, 11
             </entry>
-            <entry>
-              &nbsp;
-            </entry>
           </row>
 
           <row>
@@ -237,9 +201,6 @@
             <entry>
               9.3, 9.4, 9.5, 9.6
             </entry>
-            <entry>
-              &nbsp;
-            </entry>
           </row>
 
           <row>
@@ -255,9 +216,6 @@
             <entry>
               9.0, 9.1, 9.2, 9.3, 9.4
             </entry>
-            <entry>
-              &nbsp;
-            </entry>
           </row>
         </tbody>
 

doc/repmgr-node-rejoin.xml

@@ -73,16 +73,16 @@
       </varlistentry>
 
       <varlistentry>
-        <term><option>--force-rewind</option></term>
+        <term><option>--force-rewind[=/path/to/pg_rewind]</option></term>
         <listitem>
           <para>
             Execute <application>pg_rewind</application>.
           </para>
           <para>
-            See <xref linkend="repmgr-node-rejoin-pg-rewind"/> for more details on using
+            It is only necessary to provide the <application>pg_rewind</application> path
-            <application>pg_rewind</application>.
+            if using PostgreSQL 9.4, and <application>pg_rewind</application>
+            is not installed in the PostgreSQL <filename>bin</filename> directory.
           </para>
-
         </listitem>
       </varlistentry>
 
@@ -261,6 +261,8 @@
     <para>
       <command>repmgr node rejoin</command> can optionally use <command>pg_rewind</command> to re-integrate a
       node which has diverged from the rest of the cluster, typically a failed primary.
+      <command>pg_rewind</command> is available in PostgreSQL 9.5 and later as part of the core distribution,
+      and can be installed from external sources for PostgreSQL 9.4.
     </para>
     <note>
       <para>
@@ -269,10 +271,6 @@
         data checksums were enabled when the cluster was initialized. See the
         <ulink url="https://www.postgresql.org/docs/current/app-pgrewind.html"><command>pg_rewind</command> documentation</ulink> for details.
       </para>
-      <para>
-        Additionally, <varname>full_page_writes</varname> must be enabled; this is the default and
-        normally should never be disabled.
-      </para>
     </note>
 
     <para>
@@ -384,29 +382,6 @@
     DETAIL: node 2 is now attached to node 3</programlisting>
       </para>
     </refsect2>
-
-    <refsect2 id="repmgr-node-rejoin-postgresql-94" xreflabel="pg_rewind and PostgreSQL 9.4">
-
-      <title><command>pg_rewind</command> and PostgreSQL 9.4</title>
-
-      <indexterm>
-        <primary>pg_rewind</primary>
-        <secondary>PostgreSQL 9.4</secondary>
-      </indexterm>
-
-      <para>
-        <application>pg_rewind</application> is available in PostgreSQL 9.5 and later as part of the core distribution.
-        Users of PostgreSQL 9.4 will need to manually install it; the source code is available here:
-        <ulink url="https://github.com/vmware/pg_rewind">https://github.com/vmware/pg_rewind</ulink>.
-        If the <application>pg_rewind</application>
-        binary is not installed in the PostgreSQL <filename>bin</filename> directory, provide
-        its full path  on the demotion candidate  with <option>--force-rewind</option>.
-      </para>
-      <para>
-        Note that building the 9.4 version of <application>pg_rewind</application> requires the PostgreSQL
-        source code.
-      </para>
-    </refsect2>
   </refsect1>
 
   <refsect1 id="repmgr-node-rejoin-caveats" xreflabel="Caveats">
@@ -451,7 +426,7 @@
 
    <warning>
      <para>
-       In all PostgreSQL released before February 2021, <application>pg_rewind</application>
+       In all current PostgreSQL versions (as of September 2020), <application>pg_rewind</application>
        contains a corner-case bug which affects standbys in a very specific situation.
      </para>
      <para>
@@ -481,7 +456,8 @@
      <para>
        Currently it is not possible to resolve this situation using <application>pg_rewind</application>.
        A <ulink url="https://git.postgresql.org/gitweb/?p=postgresql.git;a=commit;h=2b4f3130382fe2f8705863e4d38589d4d69cd695">patch</ulink>
-       was submitted and is included in all PostgreSQL versions released in February 2021 or later.
+       has been successfully submitted and will be included the next PostgreSQL minor release round, scheduled for
+       February 2021.
      </para>
      <para>
        As a workaround, start the primary server the standby was previously attached to,
@@ -499,7 +475,7 @@
   <refsect1>
     <title>See also</title>
     <para>
-     <xref linkend="repmgr-standby-follow"/>, <xref linkend="repmgr-standby-switchover"/>
+     <xref linkend="repmgr-standby-follow"/>
     </para>
   </refsect1>
 </refentry>

doc/repmgr-standby-switchover.xml

@@ -154,12 +154,9 @@
           <para>
             Use <application>pg_rewind</application> to reintegrate the old primary if necessary
             (and the prerequisites for using <application>pg_rewind</application> are met).
-          </para>
-          <para>
             If using PostgreSQL 9.4, and the <application>pg_rewind</application>
             binary is not installed in the PostgreSQL <filename>bin</filename> directory,
-            provide its full path. For more details see also <xref linkend="switchover-pg-rewind"/>
+            provide its full path. For more details see also <xref linkend="switchover-pg-rewind"/>.
-            and <xref linkend="repmgr-node-rejoin-pg-rewind"/>.
           </para>
         </listitem>
       </varlistentry>

doc/repmgr.xml

@@ -26,7 +26,7 @@
   <abstract>
    <para>
    This is the official documentation of &repmgr; &repmgrversion; for
-   use with PostgreSQL 9.4 - PostgreSQL 15.
+   use with PostgreSQL 9.4 - PostgreSQL 14.
    </para>
    <para>
      &repmgr; is being continually developed and we strongly recommend using the

doc/repmgrd-configuration.xml

@@ -345,18 +345,14 @@
             </indexterm>
 
             <para>
-              Indicates a preferred priority (default: <literal>100</literal>) for promoting nodes.
+              Indicates a preferred priority (default: <literal>100</literal>) for promoting nodes;
+			  a value of zero prevents the node being promoted to primary.
             </para>
             <para>
               Note that the priority setting is only applied if two or more nodes are
               determined as promotion candidates; in that case the node with the
               higher priority is selected.
             </para>
-            <para>
-              A value of zero will always prevent the node being promoted to primary, even if there
-              is no other promotion candidate.
-            </para>
-
           </listitem>
         </varlistentry>
 

doc/repmgrd-overview.xml

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

doc/switchover.xml

@@ -242,12 +242,21 @@
       </simpara>
     </note>
     <para>
-      For more details on <application>pg_rewind</application>, see section <xref linkend="repmgr-node-rejoin-pg-rewind"/>
+      For more details on <application>pg_rewind</application>, see:
-      in the <link linkend="repmgr-node-rejoin"><command>repmgr node rejoin</command></link> documentation and
-      the PostgreSQL documentation at
       <ulink url="https://www.postgresql.org/docs/current/app-pgrewind.html">https://www.postgresql.org/docs/current/app-pgrewind.html</ulink>.
     </para>
-
+    <para>
+      <application>pg_rewind</application> has been part of the core PostgreSQL distribution since
+      version 9.5. Users of PostgreSQL 9.4 will need to manually install it; the source code is available here:
+      <ulink url="https://github.com/vmware/pg_rewind">https://github.com/vmware/pg_rewind</ulink>.
+      If the <application>pg_rewind</application>
+      binary is not installed in the PostgreSQL <filename>bin</filename> directory, provide
+      its full path  on the demotion candidate  with <option>--force-rewind</option>.
+    </para>
+    <para>
+      Note that building the 9.4 version of <application>pg_rewind</application> requires the PostgreSQL
+      source code.
+    </para>
   </sect2>
 
 

doc/upgrading-repmgr.xml

@@ -71,12 +71,6 @@
 	  <secondary>minor release</secondary>
 	</indexterm>
 
-    <para>
-	  A minor release upgrade involves updating &repmgr; from one minor release to another
-	  minor release within the same major release (e.g. <literal>5.3.1</literal> to <literal>5.3.2</literal>).
-	  An upgrade between minor releases of differing major releases (e.g. <literal>5.2.1</literal> to <literal>5.3.2</literal>)
-	  is a <link linkend="upgrading-major-version">major upgrade</link>.
-    </para>
     <para>
       The process for installing minor version upgrades is quite straightforward:
 
@@ -111,17 +105,15 @@
 	</para>
 
 	<para>
-	  A PostgreSQL restart is usually <emphasis>not</emphasis> required for minor version upgrades
+	  A PostgreSQL restart is <emphasis>not</emphasis> required for minor version upgrades.
-	  within the same major version (e.g. <literal>5.3.1</literal> to <literal>5.3.2</literal>).
-	  Be sure to check the <link linkend="appendix-release-notes">release notes</link>.
 	</para>
 
     <note>
 	  <para>
-		The same &repmgr; &quot;major version&quot; (e.g. <literal>5.3</literal>) must be
+	    The same &repmgr; &quot;major version&quot; (e.g. <literal>4.2</literal>) must be
 	    installed on all nodes in the replication cluster. While it's possible to have differing
-		&repmgr; &quot;minor versions&quot; (e.g. <literal>5.3.1</literal> and <literal>5.3.2</literal>)
+	    &repmgr; &quot;minor versions&quot; (e.g. <literal>4.2.1</literal>)  on different nodes,
-		on different nodes, we strongly recommend updating all nodes to the latest minor version.
+	    we strongly recommend updating all nodes to the latest minor version.
 	  </para>
     </note>
 

repmgr-client.c

@@ -3634,7 +3634,7 @@ can_use_pg_rewind(PGconn *conn, const char *data_directory, PQExpBufferData *rea
 	/* "full_page_writes" must be on in any case */
 	if (guc_set(conn, "full_page_writes", "=", "off"))
 	{
-		appendPQExpBufferStr(reason,
+		appendPQExpBuffer(reason,
 						  _("\"full_page_writes\" must be set to \"on\""));
 
 		can_use = false;
@@ -3653,18 +3653,18 @@ can_use_pg_rewind(PGconn *conn, const char *data_directory, PQExpBufferData *rea
 		if (data_checksum_version == UNKNOWN_DATA_CHECKSUM_VERSION)
 		{
 			if (can_use == false)
-				appendPQExpBufferStr(reason, "; ");
+				appendPQExpBuffer(reason, "; ");
 
-			appendPQExpBufferStr(reason,
+			appendPQExpBuffer(reason,
 							  _("\"wal_log_hints\" is set to \"off\" but unable to determine data checksum version"));
 			can_use = false;
 		}
 		else if (data_checksum_version == 0)
 		{
 			if (can_use == false)
-				appendPQExpBufferStr(reason, "; ");
+				appendPQExpBuffer(reason, "; ");
 
-			appendPQExpBufferStr(reason,
+			appendPQExpBuffer(reason,
 							  _("\"wal_log_hints\" is set to \"off\" and data checksums are disabled"));
 
 			can_use = false;
@@ -3873,17 +3873,19 @@ drop_replication_slot_if_exists(PGconn *conn, int node_id, char *slot_name)
 		 */
 
 		bool use_replication_protocol = false;
-		PGconn *slot_conn = _get_replication_slot_connection(conn,
+		PGconn *slot_conn = NULL;
+
+		slot_conn = _get_replication_slot_connection(conn,
 													 replication_user,
 													 &use_replication_protocol);
 
 		if (use_replication_protocol == true)
 		{
-			success = drop_replication_slot_replprot(slot_conn, slot_name);
+			success = drop_replication_slot_replprot(conn, slot_name);
 		}
 		else
 		{
-			success = drop_replication_slot_sql(slot_conn, slot_name);
+			success = drop_replication_slot_sql(conn, slot_name);
 		}
 
 		if (success == true)
@@ -3963,15 +3965,11 @@ _determine_replication_slot_user(PGconn *conn, t_node_info *upstream_node_record
 			/* This should never happen */
 			log_error("unable to determine replication slot user");
 			if (upstream_node_record != NULL)
-			{
 				log_debug("%i %s %s", upstream_node_record->node_id, upstream_node_record->repluser, PQuser(conn));
-			}
 			else
-			{
 				log_debug("upstream_node_record not provided");
 		}
 	}
-	}
 }
 
 
@@ -3986,12 +3984,12 @@ _get_replication_slot_connection(PGconn *conn, char *replication_user, bool *use
 	switch (ReplicationSlotUser)
 	{
 		case USER_TYPE_UNKNOWN:
-			log_error("unable to determine user for managing replication slots");
+			log_error("unable to determine user for replication slot creation");
 			return NULL;
 
 		case  REPMGR_USER:
 			slot_conn = conn;
-			log_verbose(LOG_INFO, _("managing replication slot as user \"%s\""),
+			log_info(_("creating replication slot as user \"%s\""),
 					 PQuser(conn));
 			break;
 
@@ -4003,7 +4001,7 @@ _get_replication_slot_connection(PGconn *conn, char *replication_user, bool *use
 											 true);
 			if (slot_conn == NULL || PQstatus(slot_conn) != CONNECTION_OK)
 			{
-				log_error(_("unable to manage replication connection as replication user \"%s\""),
+				log_error(_("unable to create replication connection as user \"%s\""),
 						  runtime_options.replication_user);
 				log_detail("%s", PQerrorMessage(slot_conn));
 
@@ -4011,7 +4009,7 @@ _get_replication_slot_connection(PGconn *conn, char *replication_user, bool *use
 				return NULL;
 			}
 			*use_replication_protocol = true;
-			log_verbose(LOG_INFO, _("managing replication slot as replication user \"%s\""),
+			log_info(_("creating replication slot as replication user \"%s\""),
 					 replication_user);
 		}
 		break;
@@ -4023,7 +4021,7 @@ _get_replication_slot_connection(PGconn *conn, char *replication_user, bool *use
 											 false);
 			if (slot_conn == NULL || PQstatus(slot_conn )!= CONNECTION_OK)
 			{
-				log_error(_("unable to create superuser connection as user \"%s\""),
+				log_error(_("unable to create super connection as user \"%s\""),
 						  runtime_options.superuser);
 				log_detail("%s", PQerrorMessage(slot_conn));
 
@@ -4031,7 +4029,7 @@ _get_replication_slot_connection(PGconn *conn, char *replication_user, bool *use
 
 				return NULL;
 			}
-			log_verbose(LOG_INFO, _("creating replication slot as superuser \"%s\""),
+			log_info(_("creating replication slot as superuser \"%s\""),
 					 runtime_options.superuser);
 		}
 		break;

repmgr.c

@@ -86,6 +86,7 @@ static shmem_request_hook_type prev_shmem_request_hook = NULL;
 static shmem_startup_hook_type prev_shmem_startup_hook = NULL;
 
 void		_PG_init(void);
+void		_PG_fini(void);
 
 #if (PG_VERSION_NUM >= 150000)
 static void repmgr_shmem_request(void);
@@ -144,6 +145,21 @@ _PG_init(void)
 
 }
 
+
+/*
+ * Module unload callback
+ */
+void
+_PG_fini(void)
+{
+	/* Uninstall hook */
+#if (PG_VERSION_NUM >= 150000)
+	shmem_request_hook = prev_shmem_request_hook;
+#endif
+
+	shmem_startup_hook = prev_shmem_startup_hook;
+}
+
 #if (PG_VERSION_NUM >= 150000)
 /*
  * shmem_requst_hook: request shared memory
@@ -161,7 +177,7 @@ repmgr_shmem_request(void)
 #endif
 
 /*
- * shmem_startup hook: allocate or attach to shared memory
+ * shmem_ hook: allocate or attach to shared memory,
  */
 static void
 repmgr_shmem_startup(void)

repmgrd-physical.c

@@ -1587,7 +1587,7 @@ monitor_streaming_standby(void)
 					/* TODO: possibly add pre-action event here */
 					if (upstream_node_info.type == STANDBY)
 					{
-						create_event_notification(primary_conn,
+						create_event_record(primary_conn,
 											&config_file_options,
 											config_file_options.node_id,
 											"repmgrd_upstream_disconnect",
@@ -1597,7 +1597,7 @@ monitor_streaming_standby(void)
 					else
 					{
 						/* primary connection lost - script notification only */
-						create_event_notification(NULL,
+						create_event_record(NULL,
 											&config_file_options,
 											config_file_options.node_id,
 											"repmgrd_upstream_disconnect",
@@ -2482,7 +2482,7 @@ monitor_streaming_witness(void)
 									  _("unable to connect to primary node \"%s\" (ID: %i)"),
 									  upstream_node_info.node_name, upstream_node_info.node_id);
 
-					create_event_notification(NULL,
+					create_event_record(NULL,
 										&config_file_options,
 										config_file_options.node_id,
 										"repmgrd_upstream_disconnect",