doc: update "repmgr primary unregister" description

As noted by GitHub user yonj1e in GitHub #396.
doc: update FAQ
2026-03-23 15:16:29 +00:00 · 2018-03-08 15:01:25 +09:00 · 2018-03-08 10:04:30 +09:00 · 2018-03-08 10:04:30 +09:00 · 2018-03-07 19:14:18 +09:00 · 2018-03-07 14:17:04 +09:00
47 changed files with 3302 additions and 1001 deletions
--- a/42
+++ b/42
@@ -1,3 +1,44 @@
+4.0.4   2018-03-08
+        repmgr: add "standby clone --recovery-conf-only" option; GitHub #382 (Ian)
+        repmgr: make "standby promote" timeout values configurable; GitHub #387 (Ian)
+        repmgr: improve replication slot warnings generated by "node status";
+          GitHub #385 (Ian)
+        repmgr: remove restriction on replication slots when cloning from
+          a Barman server; GitHub #379 (Ian)
+        repmgr: ensure "node rejoin" honours "--dry-run" option; GitHub #383 (Ian)
+        repmgr: fix --superuser handling when cloning a standby; GitHub #380 (Ian)
+        repmgr: update various help options; GitHub #391, #392 (hasegeli)
+        repmgrd: add event "repmgrd_shutdown"; GitHub #393 (Ian)
+        repmgrd: improve detection of status change from primary to standby (Ian)
+        repmgrd: improve log output in various situations (Ian)
+        repmgrd: improve reconnection to the local node after a failover (Ian)
+        repmgrd: ensure witness server connects to new primary after a failover (Ian)
+
+4.0.3   2018-02-15
+        repmgr: improve switchover handling when "pg_ctl" used to control the
+          server and logging output is not explicitly redirected (Ian)
+        repmgr: improve switchover log messages and exit code when old primary could
+          not be shut down cleanly (Ian)
+        repmgr: check demotion candidate can make a replication connection to the
+          promotion candidate before executing a switchover; GitHub #370 (Ian)
+        repmgr: add check for sufficient walsenders/replication slots before executing
+          a switchover; GitHub #371 (Ian)
+        repmgr: add --dry-run mode to "repmgr standby follow"; GitHub #368 (Ian)
+        repmgr: provide information about the primary node for "standby_register" and
+          "standby_follow" event notifications; GitHub #375 (Ian)
+        repmgr: add "standby_register_sync" event notification; GitHub #374 (Ian)
+        repmgr: output any connection error messages in "cluster show"'s list of
+          warnings; GitHub #369 (Ian)
+        repmgr: ensure an inactive data directory can be deleted; GitHub #366 (Ian)
+        repmgr: fix upstream node display in "repmgr node status"; GitHub #363 (fanf2)
+        repmgr: improve/clarify documentation and update --help output for
+          "primary unregister"; GitHub #373 (Ian)
+        repmgr: allow replication slots when Barman is configured; GitHub #379 (Ian)
+        repmgr: fix parsing of "pg_basebackup_options"; GitHub #376 (Ian)
+        repmgr: ensure "pg_subtrans" directory is created when cloning a standby in
+          Barman mode (Ian)
+        repmgr: fix primary node check in "witness register"; GitHub #377 (Ian)
+
 4.0.2   2018-01-18
        repmgr: add missing -W option to getopt_long() invocation; GitHub #350 (Ian)
        repmgr: automatically create slot name if missing; GitHub #343 (Ian)
@@ -21,7 +62,6 @@
          GitHub #344 (Ian)
        repmgr: delete any replication slots copied by pg_rewind; GitHub #334 (Ian)
        repmgr: fix configuration file sanity check; GitHub #342 (Ian)
-        Improve event notification documentation (Ian)

 4.0.0   2017-11-21
        Complete rewrite with many changes; for details see the repmgr 4.0.0 release
--- a/config.h.in
+++ b/config.h.in
@@ -1,4 +1,2 @@
 /* config.h.in.  Generated from configure.in by autoheader.  */

-/* Only build repmgr for BDR */
-#undef BDR_ONLY
--- a/configfile.c
+++ b/configfile.c
@@ -303,7 +303,7 @@ _parse_config(t_configuration_options *options, ItemList *error_list, ItemList *
 	options->log_status_interval = DEFAULT_LOG_STATUS_INTERVAL;

 	/*-----------------------
-	 * standby action settings
+	 * standby clone settings
 	 *------------------------
 	 */
 	options->use_replication_slots = false;
@@ -317,6 +317,13 @@ _parse_config(t_configuration_options *options, ItemList *error_list, ItemList *
 	options->use_primary_conninfo_password = false;
 	memset(options->passfile, 0, sizeof(options->passfile));

+	/*-----------------------
+	 * standby promote settings
+	 *------------------------
+	 */
+	options->promote_check_timeout = DEFAULT_PROMOTE_CHECK_TIMEOUT;
+	options->promote_check_interval = DEFAULT_PROMOTE_CHECK_INTERVAL;
+
 	/*-----------------
 	 * repmgrd settings
 	 *-----------------
@@ -337,6 +344,7 @@ _parse_config(t_configuration_options *options, ItemList *error_list, ItemList *
 	options->async_query_timeout = DEFAULT_ASYNC_QUERY_TIMEOUT;
 	options->primary_notification_timeout = DEFAULT_PRIMARY_NOTIFICATION_TIMEOUT;
 	options->primary_follow_timeout = DEFAULT_PRIMARY_FOLLOW_TIMEOUT;
+	options->standby_reconnect_timeout = DEFAULT_STANDBY_RECONNECT_TIMEOUT;

 	/*-------------
 	 * witness settings
@@ -505,6 +513,13 @@ _parse_config(t_configuration_options *options, ItemList *error_list, ItemList *
 		else if (strcmp(name, "passfile") == 0)
 			strncpy(options->passfile, value, sizeof(options->passfile));

+		/* standby promote settings */
+		else if (strcmp(name, "promote_check_timeout") == 0)
+			options->promote_check_timeout = repmgr_atoi(value, name, error_list, 1);
+
+		else if (strcmp(name, "promote_check_interval") == 0)
+			options->promote_check_interval = repmgr_atoi(value, name, error_list, 1);
+
 		/* node check settings */
 		else if (strcmp(name, "archive_ready_warning") == 0)
 			options->archive_ready_warning = repmgr_atoi(value, name, error_list, 1);
@@ -556,6 +571,8 @@ _parse_config(t_configuration_options *options, ItemList *error_list, ItemList *
 			options->primary_notification_timeout = repmgr_atoi(value, name, error_list, 0);
 		else if (strcmp(name, "primary_follow_timeout") == 0)
 			options->primary_follow_timeout = repmgr_atoi(value, name, error_list, 0);
+		else if (strcmp(name, "standby_reconnect_timeout") == 0)
+			options->standby_reconnect_timeout = repmgr_atoi(value, name, error_list, 0);

 		/* witness settings */
 		else if (strcmp(name, "witness_sync_interval") == 0)
@@ -671,7 +688,7 @@ _parse_config(t_configuration_options *options, ItemList *error_list, ItemList *
 		 * Raise an error if a known parameter is provided with an empty
 		 * value. Currently there's no reason why empty parameters are needed;
 		 * if we want to accept those, we'd need to add stricter default
-		 * checking, as currently e.g. an empty `node` value will be converted
+		 * checking, as currently e.g. an empty `node_id` value will be converted
 		 * to '0'.
 		 */
 		if (known_parameter == true && !strlen(value))
@@ -1028,7 +1045,7 @@ reload_config(t_configuration_options *orig_options)
 		return false;
 	}

-	if (strcmp(new_options.node_name, orig_options->node_name) != 0)
+	if (strncmp(new_options.node_name, orig_options->node_name, MAXLEN) != 0)
 	{
 		log_warning(_("\"node_name\" cannot be changed, keeping current configuration"));
 		return false;
@@ -1072,7 +1089,7 @@ reload_config(t_configuration_options *orig_options)
 	}

 	/* conninfo */
-	if (strcmp(orig_options->conninfo, new_options.conninfo) != 0)
+	if (strncmp(orig_options->conninfo, new_options.conninfo, MAXLEN) != 0)
 	{
 		/* Test conninfo string works */
 		conn = establish_db_connection(new_options.conninfo, false);
@@ -1099,7 +1116,7 @@ reload_config(t_configuration_options *orig_options)
 	}

 	/* event_notification_command */
-	if (strcmp(orig_options->event_notification_command, new_options.event_notification_command) != 0)
+	if (strncmp(orig_options->event_notification_command, new_options.event_notification_command, MAXLEN) != 0)
 	{
 		strncpy(orig_options->event_notification_command, new_options.event_notification_command, MAXLEN);
 		log_info(_("\"event_notification_command\" is now \"%s\""), new_options.event_notification_command);
@@ -1108,7 +1125,7 @@ reload_config(t_configuration_options *orig_options)
 	}

 	/* event_notifications */
-	if (strcmp(orig_options->event_notifications_orig, new_options.event_notifications_orig) != 0)
+	if (strncmp(orig_options->event_notifications_orig, new_options.event_notifications_orig, MAXLEN) != 0)
 	{
 		strncpy(orig_options->event_notifications_orig, new_options.event_notifications_orig, MAXLEN);
 		log_info(_("\"event_notifications\" is now \"%s\""), new_options.event_notifications_orig);
@@ -1128,7 +1145,7 @@ reload_config(t_configuration_options *orig_options)
 	}

 	/* follow_command */
-	if (strcmp(orig_options->follow_command, new_options.follow_command) != 0)
+	if (strncmp(orig_options->follow_command, new_options.follow_command, MAXLEN) != 0)
 	{
 		strncpy(orig_options->follow_command, new_options.follow_command, MAXLEN);
 		log_info(_("\"follow_command\" is now \"%s\""), new_options.follow_command);
@@ -1165,7 +1182,7 @@ reload_config(t_configuration_options *orig_options)


 	/* promote_command */
-	if (strcmp(orig_options->promote_command, new_options.promote_command) != 0)
+	if (strncmp(orig_options->promote_command, new_options.promote_command, MAXLEN) != 0)
 	{
 		strncpy(orig_options->promote_command, new_options.promote_command, MAXLEN);
 		log_info(_("\"promote_command\" is now \"%s\""), new_options.promote_command);
@@ -1205,18 +1222,18 @@ reload_config(t_configuration_options *orig_options)
 	 */

 	/* log_facility */
-	if (strcmp(orig_options->log_facility, new_options.log_facility) != 0)
+	if (strncmp(orig_options->log_facility, new_options.log_facility, MAXLEN) != 0)
 	{
-		strcpy(orig_options->log_facility, new_options.log_facility);
+		strncpy(orig_options->log_facility, new_options.log_facility, MAXLEN);
 		log_info(_("\"log_facility\" is now \"%s\""), new_options.log_facility);

 		log_config_changed = true;
 	}

 	/* log_file */
-	if (strcmp(orig_options->log_file, new_options.log_file) != 0)
+	if (strncmp(orig_options->log_file, new_options.log_file, MAXLEN) != 0)
 	{
-		strcpy(orig_options->log_file, new_options.log_file);
+		strncpy(orig_options->log_file, new_options.log_file, MAXLEN);
 		log_info(_("\"log_file\" is now \"%s\""), new_options.log_file);

 		log_config_changed = true;
@@ -1224,9 +1241,9 @@ reload_config(t_configuration_options *orig_options)


 	/* log_level */
-	if (strcmp(orig_options->log_level, new_options.log_level) != 0)
+	if (strncmp(orig_options->log_level, new_options.log_level, MAXLEN) != 0)
 	{
-		strcpy(orig_options->log_level, new_options.log_level);
+		strncpy(orig_options->log_level, new_options.log_level, MAXLEN);
 		log_info(_("\"log_level\" is now \"%s\""), new_options.log_level);

 		log_config_changed = true;
@@ -1600,31 +1617,109 @@ clear_event_notification_list(t_configuration_options *options)
 }


-bool
-parse_pg_basebackup_options(const char *pg_basebackup_options, t_basebackup_options *backup_options, int server_version_num, ItemList *error_list)
+int
+parse_output_to_argv(const char *string, char ***argv_array)
 {
 	int			options_len = 0;
 	char	   *options_string = NULL;
 	char	   *options_string_ptr = NULL;
+	int			c = 1,
+	   			argc_item = 1;
+	char	   *argv_item = NULL;
+	char	  **local_argv_array = NULL;
+	ItemListCell *cell;

 	/*
 	 * Add parsed options to this list, then copy to an array to pass to
 	 * getopt
 	 */
-	static ItemList option_argv = {NULL, NULL};
+	ItemList option_argv = {NULL, NULL};

-	char	   *argv_item = NULL;
-	int			c,
-				argc_item = 1;
+	options_len = strlen(string) + 1;
+	options_string = pg_malloc0(options_len);
+	options_string_ptr = options_string;
+
+	/* Copy the string before operating on it with strtok() */
+	strncpy(options_string, string, options_len);
+
+	/* Extract arguments into a list and keep a count of the total */
+	while ((argv_item = strtok(options_string_ptr, " ")) != NULL)
+	{
+		item_list_append(&option_argv, trim(argv_item));
+
+		argc_item++;
+
+		if (options_string_ptr != NULL)
+			options_string_ptr = NULL;
+	}
+
+	pfree(options_string);
+
+	/*
+	 * Array of argument values to pass to getopt_long - this will need to
+	 * include an empty string as the first value (normally this would be the
+	 * program name)
+	 */
+	local_argv_array = pg_malloc0(sizeof(char *) * (argc_item + 2));
+
+	/* Insert a blank dummy program name at the start of the array */
+	local_argv_array[0] = pg_malloc0(1);
+
+	/*
+	 * Copy the previously extracted arguments from our list to the array
+	 */
+	for (cell = option_argv.head; cell; cell = cell->next)
+	{
+		int			argv_len = strlen(cell->string) + 1;
+
+		local_argv_array[c] = (char *)pg_malloc0(argv_len);
+
+		strncpy(local_argv_array[c], cell->string, argv_len);
+
+		c++;
+	}
+
+	local_argv_array[c] = NULL;
+
+	item_list_free(&option_argv);
+
+	*argv_array = local_argv_array;
+
+	return argc_item;
+}
+
+
+void
+free_parsed_argv(char ***argv_array)
+{
+	char	  **local_argv_array = *argv_array;
+	int			i = 0;
+
+	while (local_argv_array[i] != NULL)
+	{
+		pfree((char *)local_argv_array[i]);
+		i++;
+	}
+
+	pfree((char **)local_argv_array);
+	*argv_array = NULL;
+}
+
+
+bool
+parse_pg_basebackup_options(const char *pg_basebackup_options, t_basebackup_options *backup_options, int server_version_num, ItemList *error_list)
+{
+	bool		backup_options_ok = true;
+
+	int			c = 0,
+				argc_item = 0;

 	char	  **argv_array = NULL;
-	ItemListCell *cell = NULL;

 	int			optindex = 0;

 	struct option *long_options = NULL;

-	bool		backup_options_ok = true;

 	/* We're only interested in these options */
 	static struct option long_options_9[] =
@@ -1650,56 +1745,12 @@ parse_pg_basebackup_options(const char *pg_basebackup_options, t_basebackup_opti
 	if (!strlen(pg_basebackup_options))
 		return backup_options_ok;

-	options_len = strlen(pg_basebackup_options) + 1;
-	options_string = pg_malloc(options_len);
-	options_string_ptr = options_string;
-
 	if (server_version_num >= 100000)
 		long_options = long_options_10;
 	else
 		long_options = long_options_9;

-	/* Copy the string before operating on it with strtok() */
-	strncpy(options_string, pg_basebackup_options, options_len);
-
-	/* Extract arguments into a list and keep a count of the total */
-	while ((argv_item = strtok(options_string_ptr, " ")) != NULL)
-	{
-		item_list_append(&option_argv, argv_item);
-
-		argc_item++;
-
-		if (options_string_ptr != NULL)
-			options_string_ptr = NULL;
-	}
-
-	/*
-	 * Array of argument values to pass to getopt_long - this will need to
-	 * include an empty string as the first value (normally this would be the
-	 * program name)
-	 */
-	argv_array = pg_malloc0(sizeof(char *) * (argc_item + 2));
-
-	/* Insert a blank dummy program name at the start of the array */
-	argv_array[0] = pg_malloc0(1);
-
-	c = 1;
-
-	/*
-	 * Copy the previously extracted arguments from our list to the array
-	 */
-	for (cell = option_argv.head; cell; cell = cell->next)
-	{
-		int			argv_len = strlen(cell->string) + 1;
-
-		argv_array[c] = pg_malloc0(argv_len);
-
-		strncpy(argv_array[c], cell->string, argv_len);
-
-		c++;
-	}
-
-	argv_array[c] = NULL;
+	argc_item = parse_output_to_argv(pg_basebackup_options, &argv_array);

 	/* Reset getopt's optind variable */
 	optind = 0;
@@ -1743,15 +1794,7 @@ parse_pg_basebackup_options(const char *pg_basebackup_options, t_basebackup_opti
 		backup_options_ok = false;
 	}

-	pfree(options_string);
-
-	{
-		int			i;
-
-		for (i = 0; i < argc_item + 2; i++)
-			pfree(argv_array[i]);
-	}
-	pfree(argv_array);
+	free_parsed_argv(&argv_array);

 	return backup_options_ok;
 }
--- a/configfile.h
+++ b/configfile.h
@@ -82,7 +82,7 @@ typedef struct
 	char		log_file[MAXLEN];
 	int			log_status_interval;

-	/* standby action settings */
+	/* standby clone settings */
 	bool		use_replication_slots;
 	char		pg_basebackup_options[MAXLEN];
 	char		restore_command[MAXLEN];
@@ -92,6 +92,10 @@ typedef struct
 	bool		use_primary_conninfo_password;
 	char		passfile[MAXPGPATH];

+	/* standby promote settings */
+	int			promote_check_timeout;
+	int			promote_check_interval;
+
 	/* node check settings */
 	int			archive_ready_warning;
 	int			archive_ready_critical;
@@ -115,6 +119,7 @@ typedef struct
 	int			async_query_timeout;
 	int			primary_notification_timeout;
 	int			primary_follow_timeout;
+	int			standby_reconnect_timeout;

 	/* BDR settings */
 	bool		bdr_local_monitoring_only;
@@ -158,6 +163,8 @@ typedef struct
 		"", "", "", DEFAULT_LOG_STATUS_INTERVAL,	\
 		/* standby action settings */ \
 		false, "", "", { NULL, NULL }, "", false, false, "",	\
+		/* standby promote settings */ \
+		DEFAULT_PROMOTE_CHECK_TIMEOUT, DEFAULT_PROMOTE_CHECK_INTERVAL, \
 		/* node check settings */ \
 		DEFAULT_ARCHIVE_READY_WARNING, DEFAULT_ARCHIVE_READY_CRITICAL, \
 		DEFAULT_REPLICATION_LAG_WARNING, DEFAULT_REPLICATION_LAG_CRITICAL, \
@@ -172,6 +179,7 @@ typedef struct
 		DEFAULT_ASYNC_QUERY_TIMEOUT, \
 		DEFAULT_PRIMARY_NOTIFICATION_TIMEOUT,	\
 		DEFAULT_PRIMARY_FOLLOW_TIMEOUT,	\
+		DEFAULT_STANDBY_RECONNECT_TIMEOUT,	\
 		/* BDR settings */ \
 		false, DEFAULT_BDR_RECOVERY_TIMEOUT, \
 		/* service settings */ \
@@ -248,7 +256,6 @@ typedef struct
 }


-
 void		set_progname(const char *argv0);
 const char *progname(void);

@@ -263,12 +270,15 @@ int repmgr_atoi(const char *s,
 			ItemList *error_list,
 			int minval);

-
 bool parse_pg_basebackup_options(const char *pg_basebackup_options,
 							t_basebackup_options *backup_options,
 							int server_version_num,
 							ItemList *error_list);

+int parse_output_to_argv(const char *string, char ***argv_array);
+void free_parsed_argv(char ***argv_array);
+
+
 /* called by repmgr-client and repmgrd */
 void		exit_with_cli_errors(ItemList *error_list);
 void		print_item_list(ItemList *item_list);
--- a/38
+++ b/38
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for repmgr 4.0.2.
+# Generated by GNU Autoconf 2.69 for repmgr 4.0.4.
 #
 # Report bugs to <pgsql-bugs@postgresql.org>.
 #
@@ -582,8 +582,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='repmgr'
 PACKAGE_TARNAME='repmgr'
-PACKAGE_VERSION='4.0.2'
-PACKAGE_STRING='repmgr 4.0.2'
+PACKAGE_VERSION='4.0.4'
+PACKAGE_STRING='repmgr 4.0.4'
 PACKAGE_BUGREPORT='pgsql-bugs@postgresql.org'
 PACKAGE_URL='https://2ndquadrant.com/en/resources/repmgr/'

@@ -633,7 +633,6 @@ SHELL'
 ac_subst_files=''
 ac_user_opts='
 enable_option_checking
-with_bdr_only
 '
      ac_precious_vars='build_alias
 host_alias
@@ -1179,7 +1178,7 @@ if test "$ac_init_help" = "long"; then
  # Omit some internal or obsolete options to make the list less imposing.
  # This message is too long to be a string in the A/UX 3.1 sh.
  cat <<_ACEOF
-\`configure' configures repmgr 4.0.2 to adapt to many kinds of systems.
+\`configure' configures repmgr 4.0.4 to adapt to many kinds of systems.

 Usage: $0 [OPTION]... [VAR=VALUE]...

@@ -1240,15 +1239,10 @@ fi

 if test -n "$ac_init_help"; then
  case $ac_init_help in
-     short | recursive ) echo "Configuration of repmgr 4.0.2:";;
+     short | recursive ) echo "Configuration of repmgr 4.0.4:";;
   esac
  cat <<\_ACEOF

-Optional Packages:
-  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
-  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-  --with-bdr-only         BDR-only build
-
 Some influential environment variables:
  PG_CONFIG   Location to find pg_config for target PostgreSQL (default PATH)

@@ -1319,7 +1313,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
  cat <<\_ACEOF
-repmgr configure 4.0.2
+repmgr configure 4.0.4
 generated by GNU Autoconf 2.69

 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1338,7 +1332,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.

-It was created by repmgr $as_me 4.0.2, which was
+It was created by repmgr $as_me 4.0.4, which was
 generated by GNU Autoconf 2.69.  Invocation command line was

  $ $0 $@
@@ -1694,20 +1688,6 @@ ac_config_headers="$ac_config_headers config.h"



-
-# Check whether --with-bdr_only was given.
-if test "${with_bdr_only+set}" = set; then :
-  withval=$with_bdr_only;
-fi
-
-if test "x$with_bdr_only" != "x"; then :
-
-$as_echo "#define BDR_ONLY \"1\"" >>confdefs.h
-
-
-fi
-
-
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
 $as_echo_n "checking for a sed that does not truncate output... " >&6; }
 if ${ac_cv_path_SED+:} false; then :
@@ -2379,7 +2359,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by repmgr $as_me 4.0.2, which was
+This file was extended by repmgr $as_me 4.0.4, which was
 generated by GNU Autoconf 2.69.  Invocation command line was

  CONFIG_FILES    = $CONFIG_FILES
@@ -2442,7 +2422,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-repmgr config.status 4.0.2
+repmgr config.status 4.0.4
 configured by $0, generated by GNU Autoconf 2.69,
  with options \\"\$ac_cs_config\\"

--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-AC_INIT([repmgr], [4.0.2], [pgsql-bugs@postgresql.org], [repmgr], [https://2ndquadrant.com/en/resources/repmgr/])
+AC_INIT([repmgr], [4.0.4], [pgsql-bugs@postgresql.org], [repmgr], [https://2ndquadrant.com/en/resources/repmgr/])

 AC_COPYRIGHT([Copyright (c) 2010-2018, 2ndQuadrant Ltd.])

@@ -6,12 +6,6 @@ AC_CONFIG_HEADER(config.h)

 AC_ARG_VAR([PG_CONFIG], [Location to find pg_config for target PostgreSQL (default PATH)])

-AC_ARG_WITH([bdr_only], [AS_HELP_STRING([--with-bdr-only], [BDR-only build])])
-AS_IF([test "x$with_bdr_only" != "x"],
-    [AC_DEFINE([BDR_ONLY], ["1"], [Only build repmgr for BDR])]
-)
-
-
 AC_PROG_SED

 if test -z "$PG_CONFIG"; then
--- a/dbutils.c
+++ b/dbutils.c
@@ -219,8 +219,7 @@ establish_db_connection_quiet(const char *conninfo)
 }


-PGconn
-		   *
+PGconn *
 establish_primary_db_connection(PGconn *conn,
 								const bool exit_on_error)
 {
@@ -237,36 +236,6 @@ establish_primary_db_connection(PGconn *conn,
 }


-PGconn *
-establish_db_connection_as_user(const char *conninfo,
-								const char *user,
-								const bool exit_on_error)
-{
-	PGconn	   *conn = NULL;
-	t_conninfo_param_list conninfo_params = T_CONNINFO_PARAM_LIST_INITIALIZER;
-	bool		parse_success = false;
-	char	   *errmsg = NULL;
-
-	initialize_conninfo_params(&conninfo_params, false);
-
-	parse_success = parse_conninfo_string(conninfo, &conninfo_params, errmsg, true);
-
-	if (parse_success == false)
-	{
-		log_error(_("unable to pass provided conninfo string:\n	 %s"), errmsg);
-		return NULL;
-	}
-
-	param_set(&conninfo_params, "user", user);
-
-	conn = establish_db_connection_by_params(&conninfo_params, false);
-
-	return conn;
-}
-
-
-
-
 PGconn *
 establish_db_connection_by_params(t_conninfo_param_list *param_list,
 								  const bool exit_on_error)
@@ -437,15 +406,18 @@ free_conninfo_params(t_conninfo_param_list *param_list)

 	for (c = 0; c < param_list->size; c++)
 	{
-		if (param_list->keywords[c] != NULL)
+		if (param_list->keywords != NULL && param_list->keywords[c] != NULL)
 			pfree(param_list->keywords[c]);

-		if (param_list->values[c] != NULL)
+		if (param_list->values != NULL && param_list->values[c] != NULL)
 			pfree(param_list->values[c]);
 	}

-	pfree(param_list->keywords);
-	pfree(param_list->values);
+	if (param_list->keywords != NULL)
+		pfree(param_list->keywords);
+
+	if (param_list->values != NULL)
+		pfree(param_list->values);
 }


@@ -1057,7 +1029,7 @@ get_server_version(PGconn *conn, char *server_version)
 	}

 	if (server_version != NULL)
-		strcpy(server_version, PQgetvalue(res, 0, 1));
+		strncpy(server_version, PQgetvalue(res, 0, 1), MAXVERSIONSTR);

 	server_version_num = atoi(PQgetvalue(res, 0, 0));

@@ -1255,7 +1227,7 @@ get_primary_node_id(PGconn *conn)
 	initPQExpBuffer(&query);
 	appendPQExpBuffer(&query,
 					  "SELECT node_id		  "
-					  "	 FROM repmgr.nodes	  "
+					  "	 FROM repmgr.nodes    "
 					  " WHERE type = 'primary' "
 					  "   AND active IS TRUE  ");

@@ -1800,7 +1772,7 @@ _populate_node_record(PGresult *res, t_node_info *node_info, int row)
 	strncpy(node_info->config_file, PQgetvalue(res, row, 10), MAXLEN);

 	/* This won't normally be set */
-	strncpy(node_info->upstream_node_name, PQgetvalue(res, row, 10), MAXLEN);
+	strncpy(node_info->upstream_node_name, PQgetvalue(res, row, 11), MAXLEN);

 	/* Set remaining struct fields with default values */
 	node_info->node_status = NODE_STATUS_UNKNOWN;
@@ -1866,8 +1838,38 @@ get_node_record(PGconn *conn, int node_id, t_node_info *node_info)
 	initPQExpBuffer(&query);
 	appendPQExpBuffer(&query,
 					  "SELECT " REPMGR_NODES_COLUMNS
-					  "  FROM repmgr.nodes "
-					  " WHERE node_id = %i",
+					  "  FROM repmgr.nodes n "
+					  " WHERE n.node_id = %i",
+					  node_id);
+
+	log_verbose(LOG_DEBUG, "get_node_record():\n  %s", query.data);
+
+	result = _get_node_record(conn, query.data, node_info);
+	termPQExpBuffer(&query);
+
+	if (result == RECORD_NOT_FOUND)
+	{
+		log_verbose(LOG_DEBUG, "get_node_record(): no record found for node %i", node_id);
+	}
+
+	return result;
+}
+
+
+RecordStatus
+get_node_record_with_upstream(PGconn *conn, int node_id, t_node_info *node_info)
+{
+	PQExpBufferData query;
+	RecordStatus result;
+
+	initPQExpBuffer(&query);
+	appendPQExpBuffer(&query,
+					  "    SELECT n.node_id, n.type, n.upstream_node_id, n.node_name, n.conninfo, n.repluser, "
+					  "           n.slot_name, n.location, n.priority, n.active, n.config_file, un.node_name AS upstream_node_name "
+					  "      FROM repmgr.nodes n "
+					  " LEFT JOIN repmgr.nodes un "
+					  "        ON un.node_id = n.upstream_node_id"
+					  " WHERE n.node_id = %i",
 					  node_id);

 	log_verbose(LOG_DEBUG, "get_node_record():\n  %s", query.data);
@@ -1894,8 +1896,8 @@ get_node_record_by_name(PGconn *conn, const char *node_name, t_node_info *node_i

 	appendPQExpBuffer(&query,
 					  "SELECT " REPMGR_NODES_COLUMNS
-					  "  FROM repmgr.nodes "
-					  " WHERE node_name = '%s' ",
+					  "  FROM repmgr.nodes n "
+					  " WHERE n.node_name = '%s' ",
 					  node_name);

 	log_verbose(LOG_DEBUG, "get_node_record_by_name():\n  %s", query.data);
@@ -2020,8 +2022,8 @@ get_all_node_records(PGconn *conn, NodeInfoList *node_list)

 	appendPQExpBuffer(&query,
 					  "  SELECT " REPMGR_NODES_COLUMNS
-					  "    FROM repmgr.nodes "
-					  "ORDER BY node_id ");
+					  "    FROM repmgr.nodes n "
+					  "ORDER BY n.node_id ");

 	log_verbose(LOG_DEBUG, "get_all_node_records():\n%s", query.data);

@@ -2046,9 +2048,9 @@ get_downstream_node_records(PGconn *conn, int node_id, NodeInfoList *node_list)

 	appendPQExpBuffer(&query,
 					  "  SELECT " REPMGR_NODES_COLUMNS
-					  "    FROM repmgr.nodes "
-					  "   WHERE upstream_node_id = %i "
-					  "ORDER BY node_id ",
+					  "    FROM repmgr.nodes n "
+					  "   WHERE n.upstream_node_id = %i "
+					  "ORDER BY n.node_id ",
 					  node_id);

 	log_verbose(LOG_DEBUG, "get_downstream_node_records():\n%s", query.data);
@@ -2075,11 +2077,11 @@ get_active_sibling_node_records(PGconn *conn, int node_id, int upstream_node_id,

 	appendPQExpBuffer(&query,
 					  "  SELECT " REPMGR_NODES_COLUMNS
-					  "    FROM repmgr.nodes "
-					  "   WHERE upstream_node_id = %i "
-					  "     AND node_id != %i "
-					  "     AND active IS TRUE "
-					  "ORDER BY node_id ",
+					  "    FROM repmgr.nodes n "
+					  "   WHERE n.upstream_node_id = %i "
+					  "     AND n.node_id != %i "
+					  "     AND n.active IS TRUE "
+					  "ORDER BY n.node_id ",
 					  upstream_node_id,
 					  node_id);

@@ -2107,8 +2109,8 @@ get_node_records_by_priority(PGconn *conn, NodeInfoList *node_list)

 	appendPQExpBuffer(&query,
 					  "  SELECT " REPMGR_NODES_COLUMNS
-					  "    FROM repmgr.nodes "
-					  "ORDER BY priority DESC, node_name ");
+					  "    FROM repmgr.nodes n "
+					  "ORDER BY n.priority DESC, n.node_name ");

 	log_verbose(LOG_DEBUG, "get_node_records_by_priority():\n%s", query.data);

@@ -2123,7 +2125,11 @@ get_node_records_by_priority(PGconn *conn, NodeInfoList *node_list)
 	return;
 }

-void
+/*
+ * return all node records together with their upstream's node name,
+ * if available.
+ */
+bool
 get_all_node_records_with_upstream(PGconn *conn, NodeInfoList *node_list)
 {
 	PQExpBufferData query;
@@ -2133,7 +2139,7 @@ get_all_node_records_with_upstream(PGconn *conn, NodeInfoList *node_list)

 	appendPQExpBuffer(&query,
 					  "    SELECT n.node_id, n.type, n.upstream_node_id, n.node_name, n.conninfo, n.repluser, "
-					  "           n.slot_name, n.location, n.priority, n.active, un.node_name AS upstream_node_name "
+					  "           n.slot_name, n.location, n.priority, n.active, n.config_file, un.node_name AS upstream_node_name "
 					  "      FROM repmgr.nodes n "
 					  " LEFT JOIN repmgr.nodes un "
 					  "        ON un.node_id = n.upstream_node_id"
@@ -2145,15 +2151,62 @@ get_all_node_records_with_upstream(PGconn *conn, NodeInfoList *node_list)

 	termPQExpBuffer(&query);

+	if (PQresultStatus(res) != PGRES_TUPLES_OK)
+	{
+		log_error(_("unable to retrieve node records"));
+		log_detail("%s", PQerrorMessage(conn));
+		PQclear(res);
+		return false;
+	}
+
 	_populate_node_records(res, node_list);

 	PQclear(res);

-	return;
+	return true;
 }



+bool
+get_downstream_nodes_with_missing_slot(PGconn *conn, int this_node_id, NodeInfoList *node_list)
+{
+	PQExpBufferData query;
+	PGresult   *res = NULL;
+
+	initPQExpBuffer(&query);
+
+	appendPQExpBuffer(&query,
+					  "   SELECT " REPMGR_NODES_COLUMNS
+					  "     FROM repmgr.nodes n "
+					  "LEFT JOIN pg_catalog.pg_replication_slots rs "
+					  "       ON rs.slot_name = n.slot_name "
+					  "    WHERE n.slot_name IS NOT NULL"
+                      "      AND rs.slot_name IS NULL "
+                      "      AND n.upstream_node_id = %i ",
+					  this_node_id);
+
+	log_verbose(LOG_DEBUG, "get_all_node_records_with_missing_slot():\n%s", query.data);
+
+	res = PQexec(conn, query.data);
+
+	termPQExpBuffer(&query);
+
+	if (PQresultStatus(res) != PGRES_TUPLES_OK)
+	{
+		log_error(_("unable to retrieve node records"));
+		log_detail("%s", PQerrorMessage(conn));
+		PQclear(res);
+		return false;
+	}
+
+	_populate_node_records(res, node_list);
+
+	PQclear(res);
+
+	return true;
+}
+
 bool
 create_node_record(PGconn *conn, char *repmgr_action, t_node_info *node_info)
 {
@@ -2271,9 +2324,11 @@ _create_update_node_record(PGconn *conn, char *action, t_node_info *node_info)

 	if (PQresultStatus(res) != PGRES_COMMAND_OK)
 	{
-		log_error(_("unable to %s node record:\n  %s"),
+		log_error(_("unable to %s node record for node \"%s\" (ID: %i)"),
 				  action,
-				  PQerrorMessage(conn));
+				  node_info->node_name,
+				  node_info->node_id);
+		log_detail("%s", PQerrorMessage(conn));
 		PQclear(res);
 		return false;
 	}
@@ -2292,8 +2347,7 @@ update_node_record_set_active(PGconn *conn, int this_node_id, bool active)

 	initPQExpBuffer(&query);

-	appendPQExpBuffer(
-					  &query,
+	appendPQExpBuffer(&query,
 					  "UPDATE repmgr.nodes SET active = %s "
 					  " WHERE node_id = %i",
 					  active == true ? "TRUE" : "FALSE",
@@ -2318,6 +2372,40 @@ update_node_record_set_active(PGconn *conn, int this_node_id, bool active)
 }


+bool
+update_node_record_set_active_standby(PGconn *conn, int this_node_id)
+{
+	PQExpBufferData query;
+	PGresult   *res = NULL;
+
+	initPQExpBuffer(&query);
+
+	appendPQExpBuffer(&query,
+					  "UPDATE repmgr.nodes "
+					  "   SET type = 'standby', "
+					  "       active = TRUE "
+					  " WHERE node_id = %i",
+					  this_node_id);
+
+	log_verbose(LOG_DEBUG, "update_node_record_set_active_standby():\n  %s", query.data);
+
+	res = PQexec(conn, query.data);
+	termPQExpBuffer(&query);
+
+	if (PQresultStatus(res) != PGRES_COMMAND_OK)
+	{
+		log_error(_("unable to update node record:\n  %s"),
+				  PQerrorMessage(conn));
+		PQclear(res);
+		return false;
+	}
+
+	PQclear(res);
+
+	return true;
+}
+
+
 bool
 update_node_record_set_primary(PGconn *conn, int this_node_id)
 {
@@ -2633,6 +2721,11 @@ get_node_replication_stats(PGconn *conn, int server_version_num, t_node_info *no
 	PQExpBufferData query;
 	PGresult   *res = NULL;

+	if (server_version_num == UNKNOWN_SERVER_VERSION_NUM)
+		server_version_num = get_server_version(conn, NULL);
+
+	Assert(server_version_num != UNKNOWN_SERVER_VERSION_NUM);
+
 	initPQExpBuffer(&query);

 	appendPQExpBuffer(&query,
@@ -2653,8 +2746,8 @@ get_node_replication_stats(PGconn *conn, int server_version_num, t_node_info *no
 		appendPQExpBuffer(&query,
 						  "        current_setting('max_replication_slots')::INT AS max_replication_slots, "
 						  "        (SELECT COUNT(*) FROM pg_catalog.pg_replication_slots) AS total_replication_slots, "
-						  "        (SELECT COUNT(*) FROM pg_catalog.pg_replication_slots WHERE active = TRUE)  AS active_replication_slots, "
-						  "        (SELECT COUNT(*) FROM pg_catalog.pg_replication_slots WHERE active = FALSE) AS inactive_replication_slots, ");
+						  "        (SELECT COUNT(*) FROM pg_catalog.pg_replication_slots WHERE active IS TRUE)  AS active_replication_slots, "
+						  "        (SELECT COUNT(*) FROM pg_catalog.pg_replication_slots WHERE active IS FALSE) AS inactive_replication_slots, ");
 	}


@@ -3251,14 +3344,14 @@ _create_event(PGconn *conn, t_configuration_options *options, int node_id, char
 						}
 						break;
 					case 'p':
-						/* %p: former primary id ("repmgr standby switchover") */
+						/* %p: primary id ("standby_switchover": former primary id) */
 						src_ptr++;
-						if (event_info->former_primary_id != UNKNOWN_NODE_ID)
+						if (event_info->node_id != UNKNOWN_NODE_ID)
 						{
 							PQExpBufferData node_id;
 							initPQExpBuffer(&node_id);
 							appendPQExpBuffer(&node_id,
-											  "%i", event_info->former_primary_id);
+											  "%i", event_info->node_id);
 							strlcpy(dst_ptr, node_id.data, end_ptr - dst_ptr);
 							dst_ptr += strlen(dst_ptr);
 							termPQExpBuffer(&node_id);
@@ -3401,6 +3494,9 @@ create_replication_slot(PGconn *conn, char *slot_name, int server_version_num, P
 	PGresult   *res = NULL;
 	t_replication_slot slot_info = T_REPLICATION_SLOT_INITIALIZER;

+	if (server_version_num == UNKNOWN_SERVER_VERSION_NUM)
+		server_version_num = get_server_version(conn, NULL);
+
 	/*
 	 * Check whether slot exists already; if it exists and is active, that
 	 * means another active standby is using it, which creates an error
@@ -3550,6 +3646,45 @@ get_slot_record(PGconn *conn, char *slot_name, t_replication_slot *record)
 	return RECORD_FOUND;
 }

+
+int
+get_free_replication_slots(PGconn *conn)
+{
+	PQExpBufferData query;
+	PGresult   *res = NULL;
+	int			free_slots = 0;
+
+	initPQExpBuffer(&query);
+
+	appendPQExpBuffer(&query,
+					  " SELECT pg_catalog.current_setting('max_replication_slots')::INT - "
+					  "        COUNT(*) AS free_slots"
+					  "   FROM pg_catalog.pg_replication_slots");
+
+	res = PQexec(conn, query.data);
+	termPQExpBuffer(&query);
+
+	if (PQresultStatus(res) != PGRES_TUPLES_OK)
+	{
+		log_error(_("unable to execute replication slot query"));
+		log_detail("%s", PQerrorMessage(conn));
+		PQclear(res);
+		return -1;
+	}
+
+	if (PQntuples(res) == 0)
+	{
+		PQclear(res);
+		return -1;
+	}
+
+	free_slots = atoi(PQgetvalue(res, 0, 0));
+
+	PQclear(res);
+	return free_slots;
+}
+
+
 /* ==================== */
 /* tablespace functions */
 /* ==================== */
@@ -4255,8 +4390,8 @@ is_bdr_repmgr(PGconn *conn)

 	appendPQExpBuffer(&query,
 					  "SELECT COUNT(*)"
-					  "  FROM repmgr.nodes"
-					  " WHERE type != 'bdr' ");
+					  "  FROM repmgr.nodes n"
+					  " WHERE n.type != 'bdr' ");

 	res = PQexec(conn, query.data);
 	termPQExpBuffer(&query);
@@ -4425,9 +4560,9 @@ get_bdr_other_node_name(PGconn *conn, int node_id, char *node_name)
 	initPQExpBuffer(&query);

 	appendPQExpBuffer(&query,
-					  " SELECT node_name "
-					  "   FROM repmgr.nodes "
-					  "  WHERE node_id != %i",
+					  " SELECT n.node_name "
+					  "   FROM repmgr.nodes n "
+					  "  WHERE n.node_id != %i",
 					  node_id);

 	log_verbose(LOG_DEBUG, "get_bdr_other_node_name():\n  %s", query.data);
--- a/dbutils.h
+++ b/dbutils.h
@@ -28,7 +28,7 @@
 #include "strutil.h"
 #include "voting.h"

-#define REPMGR_NODES_COLUMNS "node_id, type, upstream_node_id, node_name, conninfo, repluser, slot_name, location, priority, active, config_file, '' AS upstream_node_name "
+#define REPMGR_NODES_COLUMNS "n.node_id, n.type, n.upstream_node_id, n.node_name, n.conninfo, n.repluser, n.slot_name, n.location, n.priority, n.active, n.config_file, '' AS upstream_node_name "
 #define BDR_NODES_COLUMNS "node_sysid, node_timeline, node_dboid, node_status, node_name, node_local_dsn, node_init_from_dsn, node_read_only, node_seq_id"

 #define ERRBUFF_SIZE 512
@@ -79,6 +79,14 @@ typedef enum
 	NODE_STATUS_UNCLEAN_SHUTDOWN
 } NodeStatus;

+typedef enum
+{
+	CONN_UNKNOWN = -1,
+	CONN_OK,
+	CONN_BAD,
+	CONN_ERROR
+} ConnectionStatus;
+
 typedef enum
 {
 	SLOT_UNKNOWN = -1,
@@ -175,7 +183,7 @@ typedef struct s_event_info
 {
 	char	   *node_name;
 	char	   *conninfo_str;
-	int			former_primary_id;
+	int			node_id;
 } t_event_info;

 #define T_EVENT_INFO_INITIALIZER { \
@@ -335,9 +343,6 @@ bool		atobool(const char *value);
 PGconn *establish_db_connection(const char *conninfo,
 						const bool exit_on_error);
 PGconn	   *establish_db_connection_quiet(const char *conninfo);
-PGconn *establish_db_connection_as_user(const char *conninfo,
-								const char *user,
-								const bool exit_on_error);

 PGconn *establish_db_connection_by_params(t_conninfo_param_list *param_list,
 								  const bool exit_on_error);
@@ -400,6 +405,8 @@ t_server_type parse_node_type(const char *type);
 const char *get_node_type_string(t_server_type type);

 RecordStatus get_node_record(PGconn *conn, int node_id, t_node_info *node_info);
+RecordStatus get_node_record_with_upstream(PGconn *conn, int node_id, t_node_info *node_info);
+
 RecordStatus get_node_record_by_name(PGconn *conn, const char *node_name, t_node_info *node_info);
 t_node_info *get_node_record_pointer(PGconn *conn, int node_id);

@@ -410,7 +417,8 @@ void		get_all_node_records(PGconn *conn, NodeInfoList *node_list);
 void		get_downstream_node_records(PGconn *conn, int node_id, NodeInfoList *nodes);
 void		get_active_sibling_node_records(PGconn *conn, int node_id, int upstream_node_id, NodeInfoList *node_list);
 void		get_node_records_by_priority(PGconn *conn, NodeInfoList *node_list);
-void		get_all_node_records_with_upstream(PGconn *conn, NodeInfoList *node_list);
+bool		get_all_node_records_with_upstream(PGconn *conn, NodeInfoList *node_list);
+bool		get_downstream_nodes_with_missing_slot(PGconn *conn, int this_node_id, NodeInfoList *noede_list);

 bool		create_node_record(PGconn *conn, char *repmgr_action, t_node_info *node_info);
 bool		update_node_record(PGconn *conn, char *repmgr_action, t_node_info *node_info);
@@ -419,6 +427,7 @@ bool		truncate_node_records(PGconn *conn);

 bool		update_node_record_set_active(PGconn *conn, int this_node_id, bool active);
 bool		update_node_record_set_primary(PGconn *conn, int this_node_id);
+bool		update_node_record_set_active_standby(PGconn *conn, int this_node_id);
 bool		update_node_record_set_upstream(PGconn *conn, int this_node_id, int new_upstream_node_id);
 bool		update_node_record_status(PGconn *conn, int this_node_id, char *type, int upstream_node_id, bool active);
 bool		update_node_record_conn_priority(PGconn *conn, t_configuration_options *options);
@@ -445,6 +454,7 @@ void		create_slot_name(char *slot_name, int node_id);
 bool		create_replication_slot(PGconn *conn, char *slot_name, int server_version_num, PQExpBufferData *error_msg);
 bool		drop_replication_slot(PGconn *conn, char *slot_name);
 RecordStatus get_slot_record(PGconn *conn, char *slot_name, t_replication_slot *record);
+int			get_free_replication_slots(PGconn *conn);

 /* tablespace functions */
 bool		get_tablespace_name_by_location(PGconn *conn, const char *location, char *name);
--- a/dirutil.c
+++ b/dirutil.c
@@ -21,6 +21,7 @@

 #include <unistd.h>
 #include <dirent.h>
+#include <signal.h>
 #include <sys/stat.h>
 #include <errno.h>
 #include <stdio.h>
@@ -34,34 +35,33 @@
 #include "dirutil.h"
 #include "strutil.h"
 #include "log.h"
+#include "controldata.h"

 static int	unlink_dir_callback(const char *fpath, const struct stat *sb, int typeflag, struct FTW *ftwbuf);

+/* PID can be negative if backend is standalone */
+typedef long pgpid_t;


 /*
- * make sure the directory either doesn't exist or is empty
- * we use this function to check the new data directory and
- * the directories for tablespaces
+ * Check if a directory exists, and if so whether it is empty.
 *
- * This is the same check initdb does on the new PGDATA dir
- *
- * Returns 0 if nonexistent, 1 if exists and empty, 2 if not empty,
- * or -1 if trouble accessing directory
+ * This function is used for checking both the data directory
+ * and tablespace directories.
 */
-int
+DataDirState
 check_dir(char *path)
 {
-	DIR		   *chkdir;
-	struct dirent *file;
-	int			result = 1;
+	DIR		   *chkdir = NULL;
+	struct dirent *file = NULL;
+	int			result = DIR_EMPTY;

 	errno = 0;

 	chkdir = opendir(path);

 	if (!chkdir)
-		return (errno == ENOENT) ? 0 : -1;
+		return (errno == ENOENT) ? DIR_NOENT : DIR_ERROR;

 	while ((file = readdir(chkdir)) != NULL)
 	{
@@ -73,25 +73,15 @@ check_dir(char *path)
 		}
 		else
 		{
-			result = 2;			/* not empty */
+			result = DIR_NOT_EMPTY;
 			break;
 		}
 	}

-#ifdef WIN32
-
-	/*
-	 * This fix is in mingw cvs (runtime/mingwex/dirent.c rev 1.4), but not in
-	 * released version
-	 */
-	if (GetLastError() == ERROR_NO_MORE_FILES)
-		errno = 0;
-#endif
-
 	closedir(chkdir);

 	if (errno != 0)
-		return -1;				/* some kind of I/O error? */
+		return DIR_ERROR;				/* some kind of I/O error? */

 	return result;
 }
@@ -106,12 +96,13 @@ create_dir(char *path)
 	if (mkdir_p(path, 0700) == 0)
 		return true;

-	log_error(_("unable to create directory \"%s\": %s"),
-			  path, strerror(errno));
+	log_error(_("unable to create directory \"%s\""), path);
+	log_detail("%s", strerror(errno));

 	return false;
 }

+
 bool
 set_dir_permissions(char *path)
 {
@@ -146,26 +137,6 @@ mkdir_p(char *path, mode_t omode)
 	oumask = 0;
 	retval = 0;

-#ifdef WIN32
-	/* skip network and drive specifiers for win32 */
-	if (strlen(p) >= 2)
-	{
-		if (p[0] == '/' && p[1] == '/')
-		{
-			/* network drive */
-			p = strstr(p + 2, "/");
-			if (p == NULL)
-				return 1;
-		}
-		else if (p[1] == ':' &&
-				 ((p[0] >= 'a' && p[0] <= 'z') ||
-				  (p[0] >= 'A' && p[0] <= 'Z')))
-		{
-			/* local drive */
-			p += 2;
-		}
-	}
-#endif

 	if (p[0] == '/')			/* Skip leading '/'. */
 		++p;
@@ -242,17 +213,91 @@ is_pg_dir(char *path)
 	return false;
 }

+/*
+ * Attempt to determine if a PostgreSQL data directory is in use
+ * by reading the pidfile. This is the same mechanism used by
+ * "pg_ctl".
+ *
+ * This function will abort with appropriate log messages if a file error
+ * is encountered, as the user will need to address the situation before
+ * any further useful progress can be made.
+ */
+PgDirState
+is_pg_running(char *path)
+{
+	long		pid;
+	FILE	   *pidf;
+
+	char pid_file[MAXPGPATH];
+
+	/* it's reasonable to assume the pidfile name will not change */
+	snprintf(pid_file, MAXPGPATH, "%s/postmaster.pid", path);
+
+	pidf = fopen(pid_file, "r");
+	if (pidf == NULL)
+	{
+		/*
+		 * No PID file - PostgreSQL shouldn't be running. From 9.3 (the
+		 * earliesty version we care about) removal of the PID file will
+		 * cause the postmaster to shut down, so it's highly unlikely
+		 * that PostgreSQL will still be running.
+		 */
+		if (errno == ENOENT)
+		{
+			return PG_DIR_NOT_RUNNING;
+		}
+		else
+		{
+			log_error(_("unable to open PostgreSQL PID file \"%s\""), pid_file);
+			log_detail("%s", strerror(errno));
+			exit(ERR_BAD_CONFIG);
+		}
+	}
+
+
+	/*
+	 * In the unlikely event we're unable to extract a PID from the PID file,
+	 * log a warning but assume we're not dealing with a running instance
+	 * as PostgreSQL should have shut itself down in these cases anyway.
+	 */
+	if (fscanf(pidf, "%ld", &pid) != 1)
+	{
+		/* Is the file empty? */
+		if (ftell(pidf) == 0 && feof(pidf))
+		{
+			log_warning(_("PostgreSQL PID file \"%s\" is empty"), path);
+		}
+		else
+		{
+			log_warning(_("invalid data in PostgreSQL PID file \"%s\""), path);
+		}
+
+		return PG_DIR_NOT_RUNNING;
+	}
+
+	fclose(pidf);
+
+	if (pid == getpid())
+		return PG_DIR_NOT_RUNNING;
+
+	if (pid == getppid())
+		return PG_DIR_NOT_RUNNING;
+
+	if (kill(pid, 0) == 0)
+		return PG_DIR_RUNNING;
+
+	return PG_DIR_NOT_RUNNING;
+}
+

 bool
 create_pg_dir(char *path, bool force)
 {
-	bool		pg_dir = false;
-
-	/* Check this directory could be used as a PGDATA dir */
+	/* Check this directory can be used as a PGDATA dir */
 	switch (check_dir(path))
 	{
-		case 0:
-			/* dir not there, must create it */
+		case DIR_NOENT:
+			/* directory does not exist, attempt to create it */
 			log_info(_("creating directory \"%s\"..."), path);

 			if (!create_dir(path))
@@ -262,52 +307,51 @@ create_pg_dir(char *path, bool force)
 				return false;
 			}
 			break;
-		case 1:
-			/* Present but empty, fix permissions and use it */
-			log_info(_("checking and correcting permissions on existing directory %s"),
+		case DIR_EMPTY:
+			/* exists but empty, fix permissions and use it */
+			log_info(_("checking and correcting permissions on existing directory \"%s\""),
 					 path);

 			if (!set_dir_permissions(path))
 			{
-				log_error(_("unable to change permissions of directory \"%s\":\n  %s"),
-						  path, strerror(errno));
+				log_error(_("unable to change permissions of directory \"%s\""), path);
+				log_detail("%s", strerror(errno));
 				return false;
 			}
 			break;
-		case 2:
-			/* Present and not empty */
+		case DIR_NOT_EMPTY:
+			/* exists but is not empty */
 			log_warning(_("directory \"%s\" exists but is not empty"),
 						path);

-			pg_dir = is_pg_dir(path);
-
-			if (pg_dir && force)
+			if (is_pg_dir(path))
 			{
-				/* TODO: check DB state, if not running overwrite */
-
-				if (false)
+				if (force == true)
 				{
-					log_notice(_("deleting existing data directory \"%s\""), path);
+					log_notice(_("-F/--force provided - deleting existing data directory \"%s\""), path);
 					nftw(path, unlink_dir_callback, 64, FTW_DEPTH | FTW_PHYS);
+					return true;
 				}
-				/* Let it continue */
-				break;
-			}
-			else if (pg_dir && !force)
-			{
-				log_hint(_("This looks like a PostgreSQL directory.\n"
-						   "If you are sure you want to clone here, "
-						   "please check there is no PostgreSQL server "
-						   "running and use the -F/--force option"));
+
 				return false;
 			}
-
-			return false;
-		default:
+			else
+			{
+				if (force == true)
+				{
+					log_notice(_("deleting existing directory \"%s\""), path);
+					nftw(path, unlink_dir_callback, 64, FTW_DEPTH | FTW_PHYS);
+					return true;
+				}
+				return false;
+			}
+			break;
+		case DIR_ERROR:
 			log_error(_("could not access directory \"%s\": %s"),
 					  path, strerror(errno));
 			return false;
 	}
+
 	return true;
 }

--- a/dirutil.h
+++ b/dirutil.h
@@ -19,12 +19,29 @@
 #ifndef _DIRUTIL_H_
 #define _DIRUTIL_H_

+typedef enum
+{
+	DIR_ERROR = -1,
+	DIR_NOENT,
+	DIR_EMPTY,
+	DIR_NOT_EMPTY
+} DataDirState;
+
+typedef enum
+{
+	PG_DIR_ERROR = -1,
+	PG_DIR_NOT_RUNNING,
+	PG_DIR_RUNNING
+} PgDirState;
+
 extern int	mkdir_p(char *path, mode_t omode);
 extern bool set_dir_permissions(char *path);

-extern int	check_dir(char *path);
+extern DataDirState	check_dir(char *path);
 extern bool create_dir(char *path);
 extern bool is_pg_dir(char *path);
+extern PgDirState is_pg_running(char *path);
 extern bool create_pg_dir(char *path, bool force);
 extern int rmdir_recursive(char *path);
+
 #endif
--- a/doc/appendix-faq.sgml
+++ b/doc/appendix-faq.sgml
@@ -69,12 +69,35 @@
    in a streaming replication cluster.
   </para>
  </sect2>
+
+  <sect2 id="faq-upgrades" xreflabel="Upgrading PostgreSQL with repmgr">
+   <title>Can &repmgr; assist with upgrading a PostgreSQL cluster?</title>
+   <para>
+     For <emphasis>minor</emphasis> version upgrades, e.g. from 9.6.7 to 9.6.8, a common
+     approach is to upgrade a standby to the latest version, perform a
+     <link linkend="performing-switchover">switchover</link> promoting it to a primary,
+     then upgrade the former primary.
+   </para>
+   <para>
+     For <emphasis>major</emphasis> version upgrades (e.g. from PostgreSQL 9.6 to PostgreSQL 10),
+     the traditional approach is to "reseed" a cluster by upgrading a single
+     node with <ulink url="https://www.postgresql.org/docs/current/static/pgupgrade.html">pg_upgrade</ulink>
+     and recloning standbys from this.
+   </para>
+   <para>
+     To minimize downtime during major upgrades, for more recent PostgreSQL
+     versions <ulink url="https://www.2ndquadrant.com/en/resources/pglogical/">pglogical</ulink>
+     can be used to set up a parallel cluster using the newer PostgreSQL version,
+     which can be kept in sync with the existing production cluster until the
+     new cluster is ready to be put into production.
+   </para>
+  </sect2>
 </sect1>

 <sect1 id="faq-repmgr" xreflabel="repmgr">
  <title><command>repmgr</command></title>

-  <sect2 id="faq-register-existing-node" xreflabel="">
+  <sect2 id="faq-register-existing-node" xreflabel="registering an existing node">
   <title>Can I register an existing PostgreSQL server with repmgr?</title>
   <para>
    Yes, any existing PostgreSQL server which is part of the same replication
@@ -82,6 +105,18 @@
    standby to have been cloned using &repmgr;.
   </para>
  </sect2>
+  <sect2 id="faq-repmgr-clone-other-source" >
+   <title>Can I use a standby not cloned by &repmgr; as a &repmgr; node?</title>
+
+   <para>
+     For a standby which has been manually cloned or recovered from an external
+     backup manager such as Barman, the command
+     <command><link linkend="repmgr-standby-clone">repmgr standby clone --recovery-conf-only</link></command>
+     can be used to create the correct <filename>recovery.conf</filename> file for
+     use with &repmgr; (and will create a replication slot if required). Once this has been done,
+     <link linkend="repmgr-standby-register">register the node</link> as usual.
+   </para>
+  </sect2>

  <sect2 id="faq-repmgr-failed-primary-standby" xreflabel="Reintegrate a failed primary as a standby">
   <title>How can a failed primary be re-added as a standby?</title>
@@ -180,6 +215,9 @@
   </para>
  </sect2>

+
+
+
 </sect1>

 <sect1 id="faq-repmgrd" xreflabel="repmgrd">
--- a/doc/appendix-release-notes.sgml
+++ b/doc/appendix-release-notes.sgml
@@ -11,18 +11,277 @@
    before performing an upgrade, as there may be version-specific upgrade steps.
  </para>

-
  <para>
    See also: <xref linkend="upgrading-repmgr">
  </para>

+  <sect1 id="release-4.0.4">
+    <title>Release 4.0.4</title>
+    <para><emphasis>Thu Mar 8, 2018</emphasis></para>
+
+    <para>
+      &repmgr; 4.0.4 contains some bug fixes and and a number of
+      usability enhancements related to logging/diagnostics,
+      event notifications and pre-action checks.
+    </para>
+    <para>
+      This release can be installed as a simple package upgrade from repmgr 4.0 ~ 4.0.3;
+      <application>repmgrd</application> (if running) should be restarted. See <xref linkend="upgrading-repmgr">
+      for more details.
+    </para>
+
+    <sect2>
+      <title>Usability enhancements</title>
+
+      <para>
+        <itemizedlist>
+
+          <listitem>
+            <para>
+              add <command><link linkend="repmgr-standby-clone">repmgr standby clone --recovery-conf-only</link></command>
+              option to enable integration of a standby cloned from another source into a &repmgr; cluster (GitHub #382)
+            </para>
+          </listitem>
+
+         <listitem>
+            <para>
+              remove restriction on using replication slots when cloning from a Barman server (GitHub #379)
+            </para>
+          </listitem>
+
+          <listitem>
+            <para>
+              make <command><link linkend="repmgr-standby-promote">repmgr standby promote</link></command>
+              timeout values configurable (GitHub #387)
+            </para>
+          </listitem>
+
+          <listitem>
+            <para>
+              add missing options to main <literal>--help</literal> output (GitHub #391, #392)
+            </para>
+          </listitem>
+
+        </itemizedlist>
+      </para>
+
+    </sect2>
+
+    <sect2>
+      <title>Bug fixes</title>
+      <para>
+
+        <itemizedlist>
+
+          <listitem>
+            <para>
+              ensure <command><link linkend="repmgr-node-rejoin">repmgr node rejoin</link></command>
+              honours the <option>--dry-run</option> option (GitHub #383)
+           </para>
+          </listitem>
+
+          <listitem>
+            <para>
+              improve replication slot warnings generated by
+              <command><link linkend="repmgr-node-status">repmgr node status</link></command>
+              (GitHub #385)
+            </para>
+          </listitem>
+
+          <listitem>
+            <para>
+              fix --superuser handling when cloning a standby (GitHub #380)
+           </para>
+          </listitem>
+
+          <listitem>
+            <para>
+              <application>repmgrd</application>: improve detection of status change from primary to
+              standby
+           </para>
+          </listitem>
+
+          <listitem>
+            <para>
+              <application>repmgrd</application>:  improve reconnection to the local node after a
+              failover (previously a connection error due to the node starting up was being
+              interpreted as the node being unavailable)
+           </para>
+          </listitem>
+
+          <listitem>
+            <para>
+              <application>repmgrd</application>: when running on a witness server, correctly connect
+              to new primary after a failover
+           </para>
+          </listitem>
+
+          <listitem>
+            <para>
+              <application>repmgrd</application>: add <link linkend="event-notifications">event notification</link>
+              <literal>repmgrd_shutdown</literal> (GitHub #393)
+           </para>
+          </listitem>
+
+        </itemizedlist>
+
+      </para>
+    </sect2>
+
+  </sect1>
+
+  <sect1 id="release-4.0.3">
+    <title>Release 4.0.3</title>
+    <para><emphasis>Thu Feb 15, 2018</emphasis></para>
+
+    <para>
+      &repmgr; 4.0.3 contains some bug fixes and and a number of
+      usability enhancements related to logging/diagnostics,
+      event notifications and pre-action checks.
+    </para>
+
+    <para>
+      This release can be installed as a simple package upgrade from repmgr 4.0 ~ 4.0.2;
+      repmgrd (if running) should be restarted.
+    </para>
+    <sect2>
+      <title>Usability enhancements</title>
+
+      <para>
+        <itemizedlist>
+
+          <listitem>
+            <para>
+              improve <command><link linkend="repmgr-standby-switchover">repmgr standby switchover</link></command>
+              behaviour when <command>pg_ctl</command> is used to control the server and logging output is
+              not explicitly redirected
+            </para>
+          </listitem>
+
+          <listitem>
+            <para>
+              improve <command><link linkend="repmgr-standby-switchover">repmgr standby switchover</link></command>
+              log messages and provide new exit code <literal>ERR_SWITCHOVER_INCOMPLETE</literal> when old primary could
+              not be shut down cleanly
+            </para>
+          </listitem>
+
+         <listitem>
+            <para>
+              add check to verify the demotion candidate can make a replication connection to the
+              promotion candidate before executing a switchover (GitHub #370)
+            </para>
+         </listitem>
+
+         <listitem>
+            <para>
+              add check for sufficient walsenders and replication slots on the promotion candidate  before executing
+              <command><link linkend="repmgr-standby-switchover">repmgr standby switchover</link></command>
+              (GitHub #371)
+            </para>
+         </listitem>
+
+          <listitem>
+            <para>
+              add --dry-run mode to <command><link linkend="repmgr-standby-switchover">repmgr standby follow</link></command>
+              (GitHub #368)
+            </para>
+          </listitem>
+
+          <listitem>
+            <para>
+              provide information about the primary node for
+              <command><link linkend="repmgr-standby-register">repmgr standby register</link></command> and
+              <command><link linkend="repmgr-standby-follow">repmgr standby follow</link></command> event notifications (GitHub #375)
+            </para>
+          </listitem>
+
+          <listitem>
+            <para>
+              add <literal>standby_register_sync</literal> <link linkend="event-notifications">event notification</link>, which is fired when
+              <command><link linkend="repmgr-standby-register">repmgr standby register</link></command>
+              is run with the <option>--wait-sync</option> option and the new or updated standby node
+              record has synchronised to the standby (GitHub #374)
+            </para>
+          </listitem>
+
+          <listitem>
+            <para>
+              when running <command><link linkend="repmgr-cluster-show">repmgr cluster show</link></command>,
+              if any node is unreachable, output the error message encountered in the list of warnings
+              (GitHub #369)
+            </para>
+          </listitem>
+
+        </itemizedlist>
+      </para>
+    </sect2>
+
+    <sect2>
+      <title>Bug fixes</title>
+
+      <para>
+        <itemizedlist>
+          <listitem>
+            <para>
+              ensure an inactive data directory can be overwritten when
+              cloning a standby (GitHub #366)
+            </para>
+          </listitem>
+
+          <listitem>
+            <para>
+              <command><link linkend="repmgr-node-status">repmgr node status</link></command>
+              upstream node display fixed (GitHub #363)
+            </para>
+          </listitem>
+
+          <listitem>
+            <para>
+              <command><link linkend="repmgr-primary-unregister">repmgr primary unregister</link></command>:
+              clarify usage and fix <literal>--help</literal> output (GitHub #373)
+            </para>
+          </listitem>
+
+          <listitem>
+            <para>
+              parsing of <varname>pg_basebackup_options</varname> fixed (GitHub #376)
+            </para>
+          </listitem>
+
+          <listitem>
+            <para>
+              ensure the <filename>pg_subtrans</filename> directory is created when cloning a
+              standby in Barman mode
+            </para>
+          </listitem>
+
+          <listitem>
+            <para>
+              <command><link linkend="repmgr-witness-register">repmgr witness register</link></command>:
+              fix primary node check (GitHub #377).
+            </para>
+          </listitem>
+        </itemizedlist>
+
+      </para>
+    </sect2>
+
+  </sect1>
+
+
  <sect1 id="release-4.0.2">
    <title>Release 4.0.2</title>
    <para><emphasis>Thu Jan 18, 2018</emphasis></para>

    <para>
-      repmgr 4.0.2 contains some bug fixes and minor usability enhancements.
+      &repmgr; 4.0.2 contains some bug fixes and small usability enhancements.
    </para>
+    <para>
+      This release can be installed as a simple package upgrade from &repmgr; 4.0.1 or 4.0;
+      <application>repmgrd</application> (if running) should be restarted.
+    </para>
+
    <sect2>
      <title>Usability enhancements</title>

@@ -121,7 +380,7 @@
  <para><emphasis>Wed Dec 13, 2017</emphasis></para>

  <para>
-    repmgr 4.0.1 is a bugfix release.
+    &repmgr; 4.0.1 is a bugfix release.
  </para>
  <sect2>
    <title>Bug fixes</title>
--- a/doc/event-notifications.sgml
+++ b/doc/event-notifications.sgml
@@ -37,7 +37,7 @@
  <filename>repmgr.conf</filename>.
 </para>
 <para>
-  This parameter accepts the following format placeholders:
+  The following format placeholders are provided for all event notifications:
 </para>

 <variablelist>
@@ -84,18 +84,8 @@
    </para>
   </listitem>
  </varlistentry>
-
-
-  <varlistentry>
-   <term><option>%p</option></term>
-   <listitem>
-    <para>
-     node ID of the demoted standby (<xref linkend="repmgr-standby-switchover"> only)
-    </para>
-   </listitem>
-  </varlistentry>
-
 </variablelist>
+
 <para>
  The values provided for <literal>%t</literal> and <literal>%d</literal>
  will probably contain spaces, so should be quoted in the provided command
@@ -104,34 +94,60 @@
    event_notification_command='/path/to/some/script %n %e %s "%t" "%d"'
  </programlisting>
 </para>
+
 <para>
-  Additionally the following format placeholders are available for the event
-  type <varname>bdr_failover</varname> and optionally <varname>bdr_recovery</varname>:
+   The following parameters are provided for a subset of event notifications:
 </para>
+
 <variablelist>
+  <varlistentry>
+   <term><option>%p</option></term>
+   <listitem>
+    <para>
+     node ID of the current primary (<xref linkend="repmgr-standby-register"> and <xref linkend="repmgr-standby-follow">)
+    </para>
+    <para>
+     node ID of the demoted primary (<xref linkend="repmgr-standby-switchover"> only)
+    </para>
+   </listitem>
+  </varlistentry>
  <varlistentry>
   <term><option>%c</option></term>
   <listitem>
    <para>
-     conninfo string of the next available node
+     <literal>conninfo</literal> string of the primary node
+     (<xref linkend="repmgr-standby-register"> and <xref linkend="repmgr-standby-follow">)
+    </para>
+    <para>
+      <literal>conninfo</literal> string of the next available node
+      (<varname>bdr_failover</varname> and  <varname>bdr_recovery</varname>)
    </para>
   </listitem>
  </varlistentry>
+
  <varlistentry>
   <term><option>%a</option></term>
   <listitem>
    <para>
-     name of the next available node
+     name of the current primary node (<xref linkend="repmgr-standby-register"> and <xref linkend="repmgr-standby-follow">)
+    </para>
+    <para>
+     name of the next available node (<varname>bdr_failover</varname> and  <varname>bdr_recovery</varname>)
    </para>
   </listitem>
  </varlistentry>
+
 </variablelist>
+
 <para>
-  These should always be quoted.
+  The values provided for <literal>%c</literal> and <literal>%a</literal>
+  will probably contain spaces, so should always be quoted.
 </para>
+
 <para>
  By default, all notification types will be passed to the designated script;
-  the notification types can be filtered to explicitly named ones:
+  the notification types can be filtered to explicitly named ones using the
+  <varname>event_notifications</varname> parameter:

  <itemizedlist spacing="compact" mark="bullet">

@@ -144,6 +160,9 @@
   <listitem>
    <simpara><literal>standby_register</literal></simpara>
   </listitem>
+   <listitem>
+    <simpara><literal>standby_register_sync</literal></simpara>
+   </listitem>
   <listitem>
    <simpara><literal>standby_unregister</literal></simpara>
   </listitem>
@@ -186,6 +205,18 @@
   <listitem>
    <simpara><literal>repmgrd_failover_follow</literal></simpara>
   </listitem>
+   <listitem>
+    <simpara><literal>repmgrd_upstream_disconnect</literal></simpara>
+   </listitem>
+   <listitem>
+    <simpara><literal>repmgrd_upstream_reconnect</literal></simpara>
+   </listitem>
+   <listitem>
+    <simpara><literal>repmgrd_promote_error</literal></simpara>
+   </listitem>
+   <listitem>
+    <simpara><literal>repmgrd_failover_promote</literal></simpara>
+   </listitem>
   <listitem>
    <simpara><literal>bdr_failover</literal></simpara>
   </listitem>
@@ -204,6 +235,7 @@

  </itemizedlist>
 </para>
+
 <para>
  Note that under some circumstances (e.g. when no replication cluster primary
  could be located), it will not be possible to write an entry into the
--- a/doc/overview.sgml
+++ b/doc/overview.sgml
@@ -178,8 +178,8 @@
  <para>
   In order to effectively manage a replication cluster, &repmgr; needs to store
   information about the servers in the cluster in a dedicated database schema.
-   This schema is automatically by the &repmgr; extension, which is installed
-   during the first step in initialising a &repmgr;-administered cluster
+   This schema is automatically created by the &repmgr; extension, which is installed
+   during the first step in initializing a &repmgr;-administered cluster
   (<command><link linkend="repmgr-primary-register">repmgr primary register</link></command>)
   and contains the following objects:
   <variablelist>
--- a/doc/repmgr-bdr.sgml
+++ b/doc/repmgr-bdr.sgml
@@ -1,37 +0,0 @@
-<chapter id="repmgrd-bdr">
-  <indexterm>
-    <primary>repmgrd</primary>
-    <secondary>BDR</secondary>
-  </indexterm>
-
-  <indexterm>
-    <primary>BDR</primary>
-  </indexterm>
-
-  <title>BDR failover with repmgrd</title>
-  <para>
-    &repmgr; 4.x provides support for monitoring BDR nodes and taking action in
-    case one of the nodes fails.
-  </para>
-  <note>
-    <simpara>
-      Due to the nature of BDR, it's only safe to use this solution for
-      a two-node scenario. Introducing additional nodes will create an inherent
-      risk of node desynchronisation if a node goes down without being cleanly
-      removed from the cluster.
-    </simpara>
-  </note>
-  <para>
-    In contrast to streaming replication, there's no concept of "promoting" a new
-    primary node with BDR. Instead, "failover" involves monitoring both nodes
-    with `repmgrd` and redirecting queries from the failed node to the remaining
-    active node. This can be done by using an
-    <link linkend="event-notifications">event notification</link> script
-    which is called by <application>repmgrd</application> to dynamically
-    reconfigure a proxy server/connection pooler such as <application>PgBouncer</application>.
-  </para>
-
-  <sect1 id="prerequisites" xreflable="BDR prequisites">
-  </sect1>
-</chapter>
-
--- a/doc/repmgr-primary-register.sgml
+++ b/doc/repmgr-primary-register.sgml
@@ -26,7 +26,7 @@
  <refsect1>
    <title>Execution</title>
    <para>
-      Execute with the <literal>--dry-run</literal> option to check what would happen without
+      Execute with the <option>--dry-run</option> option to check what would happen without
      actually registering the primary.
    </para>
    <para>
@@ -36,7 +36,7 @@

    <note>
    <para>
-      If providing the configuration file location with <literal>-f/--config-file</literal>,
+      If providing the configuration file location with <option>-f/--config-file</option>,
      avoid using a relative path, as &repmgr; stores the configuration file location
      in the repmgr metadata for use when &repmgr; is executed remotely (e.g. during
      <xref linkend="repmgr-standby-switchover">). &repmgr; will attempt to convert the
@@ -48,6 +48,33 @@
    </note>
  </refsect1>

+  <refsect1>
+
+    <title>Options</title>
+    <variablelist>
+
+      <varlistentry>
+        <term><option>--dry-run</option></term>
+        <listitem>
+          <para>
+            Check prerequisites but don't actually register the primary.
+          </para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+       <term><option>-F</option><option>--force</option></term>
+        <listitem>
+          <para>
+            Overwrite an existing node record
+          </para>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+  </refsect1>
+
+
  <refsect1>
    <title>Event notifications</title>
    <para>
--- a/doc/repmgr-primary-unregister.sgml
+++ b/doc/repmgr-primary-unregister.sgml
@@ -21,6 +21,10 @@

  <refsect1>
    <title>Execution</title>
+    <para>
+      <command>repmgr primary unregister</command> can be run on any active &repmgr; node,
+      with the ID of the node to unregister passed as <option>--node-id</option>.
+    </para>
    <para>
      Execute with the <literal>--dry-run</literal> option to check what would happen without
      actually unregistering the node.
@@ -32,6 +36,34 @@
    </para>
  </refsect1>

+  <refsect1>
+
+    <title>Options</title>
+
+    <variablelist>
+
+      <varlistentry>
+        <term><option>--dry-run</option></term>
+        <listitem>
+          <para>
+            Check prerequisites but don't actually unregister the primary.
+          </para>
+        </listitem>
+      </varlistentry>
+
+     <varlistentry>
+        <term><option>--node-id</option></term>
+        <listitem>
+          <para>
+            ID of the inactive primary to be unregistered.
+          </para>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </refsect1>
+
  <refsect1>
    <title>Event notifications</title>
    <para>
--- a/doc/repmgr-standby-clone.sgml
+++ b/doc/repmgr-standby-clone.sgml
@@ -100,6 +100,150 @@
   </note>
  </refsect1>

+
+  <refsect1 id="repmgr-standby-create-recovery-conf">
+   <title>Using a standby cloned by another method</title>
+   <para>
+     &repmgr; supports standbys cloned by another method (e.g. using <application>barman</application>'s
+     <command>barman recover</command> command).
+   </para>
+   <para>
+     To integrate the standby as a &repmgr; node, ensure the <filename>repmgr.conf</filename>
+     file is created for the node, 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
+     upstream node if required.
+   </para>
+   <para>
+     Note that the upstream node must be running. An existing
+     <filename>recovery.conf</filename> will not be overwritten unless the
+     <option>-F/--force</option> option is provided.
+   </para>
+   <para>
+     Execute <command>repmgr standby clone --recovery-conf-only --dry-run</command>
+     to check the prerequisites for creating the <filename>recovery.conf</filename> file,
+     and display the contents of the file without actually creating it.
+   </para>
+  </refsect1>
+
+  <refsect1>
+
+    <title>Options</title>
+
+    <variablelist>
+
+      <varlistentry>
+        <term><option>--dry-run</option></term>
+        <listitem>
+          <para>
+            Check prerequisites but don't actually clone the standby.
+          </para>
+          <para>
+            If <option>--recovery-conf-only</option> specified, the contents of
+            the generated <filename>recovery.conf</filename> file will be displayed
+            but the file itself not written.
+          </para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><option>-c, --fast-checkpoint</option></term>
+        <listitem>
+          <para>
+            force fast checkpoint (not effective when cloning from Barman
+          </para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><option>--copy-external-config-files[={samepath|pgdata}]</option></term>
+        <listitem>
+          <para>
+            copy configuration files located outside the data directory on the source
+            node to the same path on the standby (default) or to the
+            PostgreSQL data directory.
+          </para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><option>--no-upstream-connection</option></term>
+        <listitem>
+          <para>
+            when using Barman, do not connect to upstream node
+          </para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><option>-R, --remote-user=USERNAME</option></term>
+        <listitem>
+          <para>
+            remote system username for SSH operations (default: current local system username)
+          </para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><option> --recovery-conf-only</option></term>
+        <listitem>
+          <para>
+            create <filename>recovery.conf</filename> file for a previously cloned instance
+          </para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><option>--replication-user</option></term>
+        <listitem>
+          <para>
+            user to make replication connections with (optional, not usually required)
+          </para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><option>--superuser</option></term>
+        <listitem>
+          <para>
+            if the &repmgr; user is not a superuser, the name of a valid superuser must
+            be provided with this option
+          </para>
+        </listitem>
+      </varlistentry>
+
+
+      <varlistentry>
+        <term><option>--upstream-conninfo</option></term>
+        <listitem>
+          <para>
+            <literal>primary_conninfo</literal> value to write in recovery.conf
+            when the intended upstream server does not yet exist
+          </para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><option>--upstream-node-id</option></term>
+        <listitem>
+          <para>
+            ID of the upstream node to replicate from (optional, defaults to primary node)
+          </para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--without-barman </option></term>
+        <listitem>
+          <para>
+            do not use Barman even if configured
+          </para>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+  </refsect1>
+
  <refsect1>
    <title>Event notifications</title>
    <para>
--- a/doc/repmgr-standby-follow.sgml
+++ b/doc/repmgr-standby-follow.sgml
@@ -30,6 +30,7 @@
      To re-add an inactive node to the replication cluster, see
      <xref linkend="repmgr-node-rejoin">
    </para>
+
  </refsect1>

  <refsect1>
@@ -48,14 +49,56 @@
    </para>
  </refsect1>

+  <refsect1>
+    <title>Options</title>
+    <variablelist>
+
+      <varlistentry>
+        <term><option>--dry-run</option></term>
+        <listitem>
+          <para>
+            Check prerequisites but don't actually follow a new standby.
+          </para>
+          <important>
+            <para>
+              This does not guarantee the standby can follow the primary; in
+              particular, whether the primary and standby timelines have diverged,
+              can currently only be determined by actually attempting to
+              attach the standby to the primary.
+            </para>
+          </important>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><option>-W</option></term>
+        <term><option>--wait</option></term>
+        <listitem>
+          <para>
+            Wait for a primary to appear. &repmgr; will wait for up to
+            <varname>primary_follow_timeout</varname> seconds
+            (default: 60 seconds) to verify that the standby is following the new primary.
+            This value can be defined in <filename>repmgr.conf</filename>.
+          </para>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+  </refsect1>
+
  <refsect1>
    <title>Event notifications</title>
    <para>
      A <literal>standby_follow</literal> <link linkend="event-notifications">event notification</link> will be generated.
    </para>
+    <para>
+      If provided, &repmgr; will subsitute the placeholders <literal>%p</literal> with the node ID of the primary
+      being followed, <literal>%c</literal> with its <literal>conninfo</literal> string, and
+      <literal>%a</literal> with its node name.
+    </para>
  </refsect1>

- <refsect1>
+  <refsect1>
    <title>See also</title>
    <para>
     <xref linkend="repmgr-node-rejoin">
--- a/doc/repmgr-standby-promote.sgml
+++ b/doc/repmgr-standby-promote.sgml
@@ -26,6 +26,12 @@
      by using <xref linkend="repmgr-standby-follow">; if <application>repmgrd</application>
        is active, it will handle this automatically.
    </para>
+    <para>
+      Note that &repmgr; will wait for up to <varname>promote_check_timeout</varname> seconds
+      (default: 60 seconds) to verify that the standby has been promoted, and will
+      check the promotion every <varname>promote_check_interval</varname> seconds (default: 1 second).
+      Both values can be defined in <filename>repmgr.conf</filename>.
+    </para>
  </refsect1>

  <refsect1>
@@ -42,6 +48,7 @@
    </para>
  </refsect1>

+
  <refsect1>
    <title>Event notifications</title>
    <para>
--- a/doc/repmgr-standby-register.sgml
+++ b/doc/repmgr-standby-register.sgml
@@ -57,16 +57,16 @@
  <refsect1 id="repmgr-standby-register-wait-sync" xreflabel="repmgr standby register --wait-sync">
   <title>Waiting for the registration to propagate to the standby</title>
   <para>
-     Depending on your environment and workload, it may take some time for
-     the standby's node record to propagate from the primary to the standby. Some
-     actions (such as starting <application>repmgrd</application>) require that the standby's node record
+     Depending on your environment and workload, it may take some time for the standby's node record
+     to propagate from the primary to the standby. Some actions (such as starting
+     <application>repmgrd</application>) require that the standby's node record
     is present and up-to-date to function correctly.
   </para>
   <para>
-    By providing the option <literal>--wait-sync</literal> to the
+    By providing the option <option>--wait-sync</option> to the
    <command>repmgr standby register</command> command, &repmgr; will wait
    until the record is synchronised before exiting. An optional timeout (in
-    seconds) can be added to this option (e.g. <literal>--wait-sync=60</literal>).
+    seconds) can be added to this option (e.g. <option>--wait-sync=60</option>).
   </para>
  </refsect1>

@@ -75,29 +75,109 @@
   <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 <literal>-F/--force</literal>
+    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.
   </para>
   <para>
    Similarly, with cascading replication it may be necessary to register
    a standby whose upstream node has not yet been registered - in this case,
-    using <literal>-F/--force</literal> will result in the creation of an inactive placeholder
+    using <option>-F/--force</option> will result in the creation of an inactive placeholder
    record for the upstream node, which will however later need to be registered
-    with the <literal>-F/--force</literal> option too.
+    with the <option>-F/--force</option> option too.
   </para>
   <para>
    When used with <command>repmgr standby register</command>, care should be taken that use of the
-    <literal>-F/--force</literal> option does not result in an incorrectly configured cluster.
+    <option>-F/--force</option> option does not result in an incorrectly configured cluster.
   </para>
  </refsect1>

+  <refsect1 id="repmgr-standby-register-node-cloned-other-source">
+    <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
+     <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.
+    </para>
+  </refsect1>
+
+  <refsect1>
+
+    <title>Options</title>
+
+    <variablelist>
+
+      <varlistentry>
+        <term><option>--dry-run</option></term>
+        <listitem>
+          <para>
+            Check prerequisites but don't actually register the standby.
+          </para>
+        </listitem>
+      </varlistentry>
+
+
+      <varlistentry>
+       <term><option>-F</option><option>--force</option></term>
+        <listitem>
+          <para>
+            Overwrite an existing node record
+          </para>
+        </listitem>
+      </varlistentry>
+
+
+      <varlistentry>
+        <term><option>--upstream-node-id</option></term>
+        <listitem>
+          <para>
+            ID of the upstream node to replicate from (optional)
+          </para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><option>--wait-start</option></term>
+        <listitem>
+          <para>
+            wait for the standby to start (timeout in seconds, default 30 seconds)
+          </para>
+        </listitem>
+      </varlistentry>
+
+     <varlistentry>
+        <term><option>--wait-sync</option></term>
+        <listitem>
+          <para>
+            wait for the node record to synchronise to the standby (optional timeout in seconds)
+          </para>
+        </listitem>
+      </varlistentry>
+
+
+    </variablelist>
+  </refsect1>
+
  <refsect1>
    <title>Event notifications</title>
    <para>
      A <literal>standby_register</literal> <link linkend="event-notifications">event notification</link>
-      will be generated.
+      will be generated immediately after the node record is updated on the primary.
    </para>
+
+    <para>
+      If the <option>--wait-sync</option> option is provided, a <literal>standby_register_sync</literal>
+      event notification  will be generated immediately after the node record has synchronised to the
+      standby.
+    </para>
+
+    <para>
+      If provided, &repmgr; will subsitute the placeholders <literal>%p</literal> with the node ID of the
+      primary node, <literal>%c</literal> with its <literal>conninfo</literal> string, and
+      <literal>%a</literal> with its node name.
+    </para>
+
  </refsect1>

 </refentry>
--- a/doc/repmgr-standby-switchover.sgml
+++ b/doc/repmgr-standby-switchover.sgml
@@ -22,9 +22,19 @@
    </para>
    <para>
      If other standbys are connected to the demotion candidate, &repmgr; can instruct
-    these to follow the new primary if the option <literal>--siblings-follow</literal>
-      is specified.
+      these to follow the new primary if the option <literal>--siblings-follow</literal>
+      is specified. This requires a passwordless SSH connection between the promotion
+      candidate (new primary) and the standbys attached to the demotion candidate
+      (existing primary).
    </para>
+    <note>
+      <para>
+        Performing a switchover is a non-trivial operation. In particular it
+        relies on the current primary being able to shut down cleanly and quickly.
+        &repmgr; will attempt to check for potential issues but cannot guarantee
+        a successful switchover.
+      </para>
+    </note>
  </refsect1>

  <refsect1>
@@ -47,6 +57,13 @@
          <para>
            Check prerequisites but don't actually execute a switchover.
          </para>
+          <important>
+            <para>
+              Success of <option>--dry-run</option> does not imply the switchover will
+              complete successfully, only that
+              the prerequisites for performing the operation are met.
+            </para>
+          </important>
        </listitem>
      </varlistentry>

@@ -57,6 +74,12 @@
          <para>
            Ignore warnings and continue anyway.
          </para>
+          <para>
+            Specifically, if a problem is encountered when shutting down the current primary,
+            using <option>-F/--force</option> will cause &repmgr; to continue by promoting
+            the standby to be the new primary, and if <option>--siblings-follow</option> is
+            specified, attach any other standbys to the new primary.
+          </para>
        </listitem>
      </varlistentry>

@@ -103,6 +126,11 @@
      <application>repmgrd</application> should not be active on any nodes while a switchover is being
      executed. This restriction may be lifted in a later version.
    </para>
+    <para>
+      External database connections, e.g. from an application, should not be permitted while
+      the switchover is taking place. In particular, active transactions on the primary
+      can potentially disrupt the shutdown process.
+    </para>
  </refsect1>

  <refsect1>
@@ -115,10 +143,48 @@
    <para>
      If using an event notification script, <literal>standby_switchover</literal>
      will populate the placeholder parameter <literal>%p</literal> with the node ID of
-      the former standby.
+      the former primary.
    </para>
  </refsect1>

+  <refsect1>
+    <title>Exit codes</title>
+    <para>
+      Following exit codes can be emitted by <literal>repmgr standby switchover</literal>:
+    </para>
+    <variablelist>
+
+      <varlistentry>
+        <term><option>SUCCESS (0)</option></term>
+        <listitem>
+          <para>
+            The switchover completed successfully.
+          </para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><option>ERR_SWITCHOVER_FAIL (18)</option></term>
+        <listitem>
+          <para>
+            The switchover could not be executed.
+          </para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><option>ERR_SWITCHOVER_INCOMPLETE (22)</option></term>
+        <listitem>
+          <para>
+            The switchover was executed but a problem was encountered.
+            Typically this means the former primary could not be reattached
+            as a standby.
+          </para>
+        </listitem>
+      </varlistentry>
+
+   </variablelist>
+  </refsect1>

  <refsect1>
    <title>See also</title>
--- a/doc/repmgr-standby-unregister.sgml
+++ b/doc/repmgr-standby-unregister.sgml
@@ -43,6 +43,22 @@
    </para>
  </refsect1>

+  <refsect1>
+    <title>Options</title>
+    <variablelist>
+
+      <varlistentry>
+        <term><option>--node-id</option></term>
+        <listitem>
+          <para>
+            <varname>node_id</varname> of the node to unregister (optional)
+          </para>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+  </refsect1>
+
  <refsect1>
    <title>Event notifications</title>
    <para>
--- a/doc/repmgrd-bdr.sgml
+++ b/doc/repmgrd-bdr.sgml
@@ -24,7 +24,7 @@
  <para>
    In contrast to streaming replication, there's no concept of "promoting" a new
    primary node with BDR. Instead, "failover" involves monitoring both nodes
-    with `repmgrd` and redirecting queries from the failed node to the remaining
+    with <application>repmgrd</application> and redirecting queries from the failed node to the remaining
    active node. This can be done by using an
    <link linkend="event-notifications">event notification</link> script
    which is called by <application>repmgrd</application> to dynamically
@@ -174,17 +174,13 @@
    <para>
      Key to "failover" execution is the <literal>event_notification_command</literal>,
      which is a user-definable script specified in <filename>repmpgr.conf</filename>
-      and which should reconfigure the proxy server/ connection pooler to point
-      to the other, still-active node.
+      and which can use a &repmgr; <link linkend="event-notifications">event notification</link>
+      to reconfigure the proxy server / connection pooler so it points to the other, still-active node.
+      Details of the event will be passed as parameters to the script.
    </para>
    <para>
-      Each time &repmgr; (or <application>repmgrd</application>) records an event,
-      it can optionally execute the script defined in
-      <literal>event_notification_command</literal> to take further action;
-      details of the event will be passed as parameters.
-    </para>
-    <para>
-      Following placeholders are available to the script:
+      Following parameter placeholders are available for the script definition in <filename>repmpgr.conf</filename>;
+      these will be replaced with the appropriate value when the script is executed:
    </para>

    <variablelist>
@@ -231,20 +227,37 @@
          </para>
        </listitem>
      </varlistentry>
+      <varlistentry>
+        <term><option>%c</option></term>
+        <listitem>
+          <para>
+            conninfo string of the next available node (<varname>bdr_failover</varname> and <varname>bdr_recovery</varname>)
+          </para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>%a</option></term>
+        <listitem>
+          <para>
+            name of the next available node (<varname>bdr_failover</varname> and <varname>bdr_recovery</varname>)
+          </para>
+        </listitem>
+      </varlistentry>
    </variablelist>

    <para>
-      Note that <literal>%c</literal> and <literal>%a</literal> will only be provided during
-      <varname>bdr_failover</varname> events, which is what is of interest here.
+      Note that <literal>%c</literal> and <literal>%a</literal> are only provided with
+      particular failover events, in this case <varname>bdr_failover</varname>.
    </para>
    <para>
-      The provided sample script (`scripts/bdr-pgbouncer.sh`) is configured like
-      this:
+      The provided sample script
+     (<literal><ulink url="https://raw.githubusercontent.com/2ndQuadrant/repmgr/master/scripts/bdr-pgbouncer.sh">scripts/bdr-pgbouncer.sh</ulink></literal>)
+      is configured as follows:
      <programlisting>
        event_notification_command='/path/to/bdr-pgbouncer.sh %n %e %s "%c" "%a"'</programlisting>
    </para>
    <para>
-      and parses the configures parameters like this:
+      and parses the placeholder parameters like this:
      <programlisting>
        NODE_ID=$1
        EVENT_TYPE=$2
@@ -252,12 +265,14 @@
        NEXT_CONNINFO=$4
        NEXT_NODE_NAME=$5</programlisting>
    </para>
-    <para>
-      The script also contains some hard-coded values about the <application>PgBouncer</application>
-      configuration for both nodes; these will need to be adjusted for your local environment
-      (ideally the scripts would be maintained as templates and generated by some
-      kind of provisioning system).
-    </para>
+    <note>
+      <para>
+        The sample script also contains some hard-coded values for the <application>PgBouncer</application>
+        configuration for both nodes; these will need to be adjusted for your local environment
+        (ideally the scripts would be maintained as templates and generated by some
+        kind of provisioning system).
+      </para>
+    </note>

    <para>
      The script performs following steps:
--- a/doc/repmgrd-degraded-monitoring.sgml
+++ b/doc/repmgrd-degraded-monitoring.sgml
@@ -40,7 +40,7 @@
   </listitem>

   <listitem>
-    <simpara>repmgrd is monitoring the primary node, but it is not available</simpara>
+    <simpara>repmgrd is monitoring the primary node, but it is not available (and no other node has been promoted as primary)</simpara>
   </listitem>
  </itemizedlist>
 </para>
@@ -69,7 +69,15 @@
  By default, <literal>repmgrd</literal> will continue in degraded monitoring mode indefinitely.
  However a timeout (in seconds) can be set with <varname>degraded_monitoring_timeout</varname>,
  after which <application>repmgrd</application> will terminate.
-
 </para>

+ <note>
+   <para>
+     If <application>repmgrd</application> is monitoring a primary mode which has been stopped
+     and manually restarted as a standby attached to a new primary, it will automatically detect
+     the status change and update the node record to reflect the node's new status
+     as an active standby. It will then resume monitoring the node as a standby.
+   </para>
+ </note>
+
 </chapter>
--- a/doc/switchover.sgml
+++ b/doc/switchover.sgml
@@ -60,6 +60,13 @@
    &repmgr;  being able to shut down the current primary server quickly and cleanly.
   </para>

+   <para>
+     Ensure that a passwordless SSH connection is possible from the promotion candidate
+     (standby) to the demotion candidate (current primary). If <literal>--siblings-follow</literal>
+     will be used, ensure that passwordless SSH connections are possible from the
+     promotion candidate to all standbys attached to the demotion candidate.
+   </para>
+
   <para>
    Double-check which commands will be used to stop/start/restart the current
    primary; on the primary execute:
--- a/doc/upgrading-repmgr.sgml
+++ b/doc/upgrading-repmgr.sgml
@@ -11,22 +11,86 @@
  containing bugfixes and other minor improvements. Any substantial new
  functionality will be included in a feature release (e.g. 4.0.x to 4.1.x).
 </para>
- <para>
-  &repmgr; is implemented as a PostgreSQL extension; to upgrade it, first
-  install the updated package (or compile the updated source), then in the
-  database where the &repmgr; extension is installed, execute
-  <command>ALTER EXTENSION repmgr UPDATE</command>.
- </para>
- <para>
-  If <application>repmgrd</application> is running, it may be necessary to restart
-  the PostgreSQL server if the upgrade contains changes to the shared object
-  file used by <application>repmgrd</application>; check the release notes for details.
- </para>

- <para>
-   Please check the <link linkend="appendix-release-notes">release notes</link> for every
-   release as they may contain upgrade instructions particular to individual versions.
- </para>
+ <sect1 id="upgrading-repmgr-extension" xreflabel="Upgrading repmgr 4.x and later">
+  <indexterm>
+   <primary>upgrading</primary>
+   <secondary>repmgr 4.x and later</secondary>
+  </indexterm>
+  <title>Upgrading repmgr 4.x and later</title>
+  <para>
+    &repmgr; 4.x is implemented as a PostgreSQL extension; normally the upgrade consists
+    of the two following steps:
+    <orderedlist>
+      <listitem>
+        <simpara>
+          Install the updated package (or compile the updated source)
+        </simpara>
+      </listitem>
+      <listitem>
+        <simpara>
+          In the database where the &repmgr; extension is installed, execute
+          <command>ALTER EXTENSION repmgr UPDATE</command>.
+        </simpara>
+      </listitem>
+    </orderedlist>
+  </para>
+
+  <para>
+    Always check the <link linkend="appendix-release-notes">release notes</link> for every
+    release as they may contain upgrade instructions particular to individual versions.
+  </para>
+
+  <para>
+    If the <application>repmgrd</application> daemon is in use, we recommend stopping it
+    before upgrading &repmgr;.
+  </para>
+  <para>
+    Note that it may be necessary to restart the PostgreSQL server if the upgrade contains
+    changes to the shared object file used by <application>repmgrd</application>; check the
+    release notes for details.
+  </para>
+ </sect1>
+
+ <sect1 id="upgrading-and-pg-upgrade" xreflabel="pg_upgrade and repmgr">
+  <indexterm>
+   <primary>upgrading</primary>
+   <secondary>pg_upgrade</secondary>
+  </indexterm>
+  <indexterm>
+    <primary>pg_upgrade</primary>
+  </indexterm>
+  <title>pg_upgrade and repmgr</title>
+
+  <para>
+    <application>pg_upgrade</application> requires that if any functions are
+    dependent on a shared library, this library must be present in both
+    the old and new installations before <application>pg_upgrade</application>
+    can be executed.
+  </para>
+  <para>
+    To minimize the risk of any upgrade issues (particularly if an upgrade to
+    a new major &repmgr; version is involved), we recommend upgrading
+    &repmgr; on the old server <emphasis>before</emphasis> running
+    <application>pg_upgrade</application> to ensure that old and new
+    versions are the same.
+  </para>
+  <note>
+    <simpara>
+      This issue applies to any PostgreSQL extension which has
+      dependencies on a shared library.
+    </simpara>
+  </note>
+  <para>
+    For further details please see the <ulink url="https://www.postgresql.org/docs/current/static/pgupgrade.html">pg_upgrade documentation</ulink>.
+  </para>
+  <para>
+    If replication slots are in use, bear in mind these will <emphasis>not</emphasis>
+    be recreated by <application>pg_upgrade</application>. These will need to
+    be recreated manually.
+  </para>
+ </sect1>
+

 <sect1 id="upgrading-from-repmgr-3" xreflabel="Upgrading from repmgr 3.x">
  <indexterm>
--- a/doc/version.sgml
+++ b/doc/version.sgml
@@ -1 +1 @@
-<!ENTITY repmgrversion "4.0.2">
+<!ENTITY repmgrversion "4.0.4">
--- a/errcode.h
+++ b/errcode.h
@@ -43,5 +43,6 @@
 #define ERR_BARMAN 19
 #define ERR_REGISTRATION_SYNC 20
 #define ERR_OUT_OF_MEMORY 21
+#define ERR_SWITCHOVER_INCOMPLETE 22

 #endif							/* _ERRCODE_H_ */
--- a/repmgr-action-cluster.c
+++ b/repmgr-action-cluster.c
@@ -82,6 +82,7 @@ do_cluster_show(void)
 	NodeInfoListCell *cell = NULL;
 	int			i = 0;
 	ItemList	warnings = {NULL, NULL};
+	bool		success = false;

 	/* Connect to local database to obtain cluster connection data */
 	log_verbose(LOG_INFO, _("connecting to database"));
@@ -91,11 +92,19 @@ do_cluster_show(void)
 	else
 		conn = establish_db_connection_by_params(&source_conninfo, true);

-	get_all_node_records_with_upstream(conn, &nodes);
+	success = get_all_node_records_with_upstream(conn, &nodes);
+
+	if (success == false)
+	{
+		/* get_all_node_records_with_upstream() will print error message */
+		PQfinish(conn);
+		exit(ERR_BAD_CONFIG);
+	}

 	if (nodes.node_count == 0)
 	{
-		log_error(_("unable to retrieve any node records"));
+		log_error(_("no node records were found"));
+		log_hint(_("ensure at least one node is registered"));
 		PQfinish(conn);
 		exit(ERR_BAD_CONFIG);
 	}
@@ -131,8 +140,14 @@ do_cluster_show(void)
 		}
 		else
 		{
+			char		error[MAXLEN];
+
+			strncpy(error, PQerrorMessage(cell->node_info->conn), MAXLEN);
 			cell->node_info->node_status = NODE_STATUS_DOWN;
 			cell->node_info->recovery_type = RECTYPE_UNKNOWN;
+			item_list_append_format(&warnings,
+									"when attempting to connect to node \"%s\" (ID: %i), following error encountered :\n\"%s\"",
+									cell->node_info->node_name, cell->node_info->node_id, trim(error));
 		}

 		initPQExpBuffer(&details);
@@ -158,15 +173,13 @@ do_cluster_show(void)
 									break;
 								case RECTYPE_STANDBY:
 									appendPQExpBuffer(&details, "! running as standby");
-									item_list_append_format(
-															&warnings,
+									item_list_append_format(&warnings,
 															"node \"%s\" (ID: %i) is registered as primary but running as standby",
 															cell->node_info->node_name, cell->node_info->node_id);
 									break;
 								case RECTYPE_UNKNOWN:
 									appendPQExpBuffer(&details, "! unknown");
-									item_list_append_format(
-															&warnings,
+									item_list_append_format(&warnings,
 															"node \"%s\" (ID: %i) has unknown replication status",
 															cell->node_info->node_name, cell->node_info->node_id);
 									break;
@@ -177,16 +190,14 @@ do_cluster_show(void)
 							if (cell->node_info->recovery_type == RECTYPE_PRIMARY)
 							{
 								appendPQExpBuffer(&details, "! running");
-								item_list_append_format(
-														&warnings,
+								item_list_append_format(&warnings,
 														"node \"%s\" (ID: %i) is running but the repmgr node record is inactive",
 														cell->node_info->node_name, cell->node_info->node_id);
 							}
 							else
 							{
 								appendPQExpBuffer(&details, "! running as standby");
-								item_list_append_format(
-														&warnings,
+								item_list_append_format(&warnings,
 														"node \"%s\" (ID: %i) is registered as an inactive primary but running as standby",
 														cell->node_info->node_name, cell->node_info->node_id);
 							}
@@ -199,8 +210,7 @@ do_cluster_show(void)
 						if (cell->node_info->active == true)
 						{
 							appendPQExpBuffer(&details, "? unreachable");
-							item_list_append_format(
-													&warnings,
+							item_list_append_format(&warnings,
 													"node \"%s\" (ID: %i) is registered as an active primary but is unreachable",
 													cell->node_info->node_name, cell->node_info->node_id);
 						}
@@ -226,8 +236,7 @@ do_cluster_show(void)
 									break;
 								case RECTYPE_PRIMARY:
 									appendPQExpBuffer(&details, "! running as primary");
-									item_list_append_format(
-															&warnings,
+									item_list_append_format(&warnings,
 															"node \"%s\" (ID: %i) is registered as standby but running as primary",
 															cell->node_info->node_name, cell->node_info->node_id);
 									break;
@@ -245,16 +254,14 @@ do_cluster_show(void)
 							if (cell->node_info->recovery_type == RECTYPE_STANDBY)
 							{
 								appendPQExpBuffer(&details, "! running");
-								item_list_append_format(
-														&warnings,
+								item_list_append_format(&warnings,
 														"node \"%s\" (ID: %i) is running but the repmgr node record is inactive",
 														cell->node_info->node_name, cell->node_info->node_id);
 							}
 							else
 							{
 								appendPQExpBuffer(&details, "! running as primary");
-								item_list_append_format(
-														&warnings,
+								item_list_append_format(&warnings,
 														"node \"%s\" (ID: %i) is running as primary but the repmgr node record is inactive",
 														cell->node_info->node_name, cell->node_info->node_id);
 							}
@@ -267,8 +274,7 @@ do_cluster_show(void)
 						if (cell->node_info->active == true)
 						{
 							appendPQExpBuffer(&details, "? unreachable");
-							item_list_append_format(
-													&warnings,
+							item_list_append_format(&warnings,
 													"node \"%s\" (ID: %i) is registered as an active standby but is unreachable",
 													cell->node_info->node_name, cell->node_info->node_id);
 						}
@@ -416,7 +422,7 @@ do_cluster_show(void)
 		printf(_("\nWARNING: following issues were detected\n"));
 		for (cell = warnings.head; cell; cell = cell->next)
 		{
-			printf(_("  %s\n"), cell->string);
+			printf(_("  - %s\n"), cell->string);
 		}
 	}
 }
@@ -1144,7 +1150,7 @@ build_cluster_crosscheck(t_node_status_cube ***dest_cube, int *name_length)
 		}
 		else
 		{
-			t_conninfo_param_list remote_conninfo;
+			t_conninfo_param_list remote_conninfo = T_CONNINFO_PARAM_LIST_INITIALIZER;
 			char	   *host = NULL;
 			PQExpBufferData quoted_command;

--- a/repmgr-action-node.c
+++ b/repmgr-action-node.c
@@ -41,6 +41,7 @@ static void _do_node_status_is_shutdown_cleanly(void);
 static void _do_node_archive_config(void);
 static void _do_node_restore_config(void);

+static void do_node_check_replication_connection(void);
 static CheckStatus do_node_check_archive_ready(PGconn *conn, OutputMode mode, CheckStatusList *list_output);
 static CheckStatus do_node_check_downstream(PGconn *conn, OutputMode mode, CheckStatusList *list_output);
 static CheckStatus do_node_check_replication_lag(PGconn *conn, OutputMode mode, t_node_info *node_info, CheckStatusList *list_output);
@@ -91,7 +92,7 @@ do_node_status(void)

 	/* Check node exists and is really a standby */

-	if (get_node_record(conn, config_file_options.node_id, &node_info) != RECORD_FOUND)
+	if (get_node_record_with_upstream(conn, config_file_options.node_id, &node_info) != RECORD_FOUND)
 	{
 		log_error(_("no record found for node %i"), config_file_options.node_id);
 		PQfinish(conn);
@@ -249,8 +250,7 @@ do_node_status(void)
 	if (node_info.max_wal_senders >= 0)
 	{
 		/* In CSV mode, raw values supplied as well */
-		key_value_list_set_format(
-								  &node_status,
+		key_value_list_set_format(&node_status,
 								  "Replication connections",
 								  "%i (of maximal %i)",
 								  node_info.attached_wal_receivers,
@@ -258,8 +258,7 @@ do_node_status(void)
 	}
 	else if (node_info.max_wal_senders == 0)
 	{
-		key_value_list_set_format(
-								  &node_status,
+		key_value_list_set_format(&node_status,
 								  "Replication connections",
 								  "disabled");
 	}
@@ -276,8 +275,7 @@ do_node_status(void)

 		initPQExpBuffer(&slotinfo);

-		appendPQExpBuffer(
-						  &slotinfo,
+		appendPQExpBuffer(&slotinfo,
 						  "%i (of maximal %i)",
 						  node_info.active_replication_slots + node_info.inactive_replication_slots,
 						  node_info.max_replication_slots);
@@ -289,8 +287,7 @@ do_node_status(void)
 							  "; %i inactive",
 							  node_info.inactive_replication_slots);

-			item_list_append_format(
-									&warnings,
+			item_list_append_format(&warnings,
 									_("- node has %i inactive replication slots"),
 									node_info.inactive_replication_slots);
 		}
@@ -309,13 +306,46 @@ do_node_status(void)
 	}


+	/*
+	 * check for missing replication slots - we do this regardless of
+	 * what "max_replication_slots" is set to, in case the downstream
+	 * node was configured with "use_replication_slots=true" and is
+	 * expecting a replication slot to be available
+	 */
+
+	{
+		NodeInfoList missing_slots = T_NODE_INFO_LIST_INITIALIZER;
+		get_downstream_nodes_with_missing_slot(conn,
+											   config_file_options.node_id,
+											   &missing_slots);
+
+		if (missing_slots.node_count > 0)
+		{
+			NodeInfoListCell *missing_slot_cell = NULL;
+
+			item_list_append_format(&warnings,
+									_("- replication slots missing for following %i node(s):"),
+									missing_slots.node_count);
+
+			for (missing_slot_cell = missing_slots.head; missing_slot_cell; missing_slot_cell = missing_slot_cell->next)
+			{
+				item_list_append_format(&warnings,
+										_("  - %s (ID: %i, slot name: \"%s\")"),
+										missing_slot_cell->node_info->node_name,
+										missing_slot_cell->node_info->node_id,
+										missing_slot_cell->node_info->slot_name);
+			}
+		}
+	}
+
+
 	if (node_info.type == STANDBY)
 	{
 		key_value_list_set_format(&node_status,
 								  "Upstream node",
 								  "%s (ID: %i)",
-								  node_info.node_name,
-								  node_info.node_id);
+								  node_info.upstream_node_name,
+								  node_info.upstream_node_id);

 		get_replication_info(conn, &replication_info);

@@ -463,8 +493,7 @@ _do_node_status_is_shutdown_cleanly(void)

 	initPQExpBuffer(&output);

-	appendPQExpBuffer(
-					  &output,
+	appendPQExpBuffer(&output,
 					  "--state=");

 	/* sanity-check we're dealing with a PostgreSQL directory */
@@ -580,6 +609,11 @@ do_node_check(void)
 		exit(return_code);
 	}

+	if (runtime_options.replication_connection == true)
+	{
+		do_node_check_replication_connection();
+		exit(SUCCESS);
+	}

 	if (strlen(config_file_options.conninfo))
 		conn = establish_db_connection(config_file_options.conninfo, true);
@@ -883,6 +917,67 @@ do_node_check_slots(PGconn *conn, OutputMode mode, t_node_info *node_info, Check
 }


+static void
+do_node_check_replication_connection(void)
+{
+	PGconn *local_conn = NULL;
+	PGconn *repl_conn = NULL;
+	t_node_info node_record = T_NODE_INFO_INITIALIZER;
+	RecordStatus record_status = RECORD_NOT_FOUND;
+	t_conninfo_param_list remote_conninfo = T_CONNINFO_PARAM_LIST_INITIALIZER;
+	PQExpBufferData output;
+
+
+	initPQExpBuffer(&output);
+	appendPQExpBuffer(&output,
+					  "--connection=");
+
+	if (runtime_options.remote_node_id == UNKNOWN_NODE_ID)
+	{
+		appendPQExpBuffer(&output, "UNKNOWN");
+		printf("%s\n", output.data);
+		termPQExpBuffer(&output);
+		return;
+	}
+
+	local_conn = establish_db_connection(config_file_options.conninfo, true);
+
+	record_status = get_node_record(local_conn, runtime_options.remote_node_id, &node_record);
+	PQfinish(local_conn);
+
+	if (record_status != RECORD_FOUND)
+	{
+		appendPQExpBuffer(&output, "UNKNOWN");
+		printf("%s\n", output.data);
+		termPQExpBuffer(&output);
+		return;
+	}
+
+	initialize_conninfo_params(&remote_conninfo, false);
+	parse_conninfo_string(node_record.conninfo, &remote_conninfo, NULL, false);
+
+	param_set(&remote_conninfo, "replication", "1");
+	param_set(&remote_conninfo, "user", node_record.repluser);
+
+	repl_conn = establish_db_connection_by_params(&remote_conninfo, false);
+
+	if (PQstatus(repl_conn) != CONNECTION_OK)
+	{
+		appendPQExpBuffer(&output, "BAD");
+		printf("%s\n", output.data);
+		termPQExpBuffer(&output);
+		return;
+	}
+
+	PQfinish(repl_conn);
+
+	appendPQExpBuffer(&output, "OK");
+	printf("%s\n", output.data);
+	termPQExpBuffer(&output);
+
+	return;
+}
+
 static CheckStatus
 do_node_check_archive_ready(PGconn *conn, OutputMode mode, CheckStatusList *list_output)
 {
@@ -1590,6 +1685,7 @@ do_node_rejoin(void)

 	bool		success = true;
 	int			server_version_num = UNKNOWN_SERVER_VERSION_NUM;
+	int			follow_error_code = SUCCESS;

 	/* check node is not actually running */

@@ -1720,7 +1816,7 @@ do_node_rejoin(void)
 	 * Forcibly rewind node if requested (this is mainly for use when this
 	 * action is being executed by "repmgr standby switchover")
 	 */
-	if (runtime_options.force_rewind == true)
+	if (runtime_options.force_rewind == true && runtime_options.dry_run == false)
 	{
 		int			ret;
 		PQExpBufferData		filebuf;
@@ -1855,11 +1951,41 @@ do_node_rejoin(void)
 		}
 	}

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

 	success = do_standby_follow_internal(upstream_conn,
 										 &primary_node_record,
-										 &follow_output);
+										 &follow_output,
+										 &follow_error_code);
+
+	if (success == false)
+	{
+		log_notice(_("NODE REJOIN failed"));
+		log_detail("%s", follow_output.data);
+
+		create_event_notification(upstream_conn,
+								  &config_file_options,
+								  config_file_options.node_id,
+								  "node_rejoin",
+								  success,
+								  follow_output.data);
+
+		PQfinish(upstream_conn);
+
+		termPQExpBuffer(&follow_output);
+		exit(follow_error_code);
+	}
+
+	/*
+	 * XXX add checks that node actually started and connected to primary,
+	 * if not exit with ERR_REJOIN_FAIL
+	 */

 	create_event_notification(upstream_conn,
 							  &config_file_options,
@@ -1870,19 +1996,12 @@ do_node_rejoin(void)

 	PQfinish(upstream_conn);

-	if (success == false)
-	{
-		log_notice(_("NODE REJOIN failed"));
-		log_detail("%s", follow_output.data);
-
-		termPQExpBuffer(&follow_output);
-		exit(ERR_DB_QUERY);
-	}
-
 	log_notice(_("NODE REJOIN successful"));
 	log_detail("%s", follow_output.data);

 	termPQExpBuffer(&follow_output);
+
+	return;
 }


--- a/repmgr-action-primary.c
+++ b/repmgr-action-primary.c
@@ -548,7 +548,8 @@ do_primary_help(void)
 	printf(_("  \"primary unregister\" unregisters an inactive primary node.\n"));
 	puts("");
 	printf(_("  --dry-run                           check what would happen, but don't actually unregister the primary\n"));
-	printf(_("  -F, --force                         force removal of the record\n"));
+	printf(_("  --node-id                           ID of the inactive primary node to unregister.\n"));
+	printf(_("  -F, --force                         force removal of an active record\n"));

 	puts("");

--- a/repmgr-action-standby.c
+++ b/repmgr-action-standby.c
--- a/repmgr-action-standby.h
+++ b/repmgr-action-standby.h
@@ -28,7 +28,7 @@ extern void do_standby_switchover(void);

 extern void do_standby_help(void);

-extern bool do_standby_follow_internal(PGconn *primary_conn, t_node_info *primary_node_record, PQExpBufferData *output);
+extern bool do_standby_follow_internal(PGconn *primary_conn, t_node_info *primary_node_record, PQExpBufferData *output, int *error_code);



--- a/repmgr-action-witness.c
+++ b/repmgr-action-witness.c
@@ -110,12 +110,12 @@ do_witness_register(void)
 	}

 	/* check primary node's recovery type */
-	recovery_type = get_recovery_type(witness_conn);
+	recovery_type = get_recovery_type(primary_conn);

 	if (recovery_type == RECTYPE_STANDBY)
 	{
 		log_error(_("provided primary node is a standby"));
-		log_error(_("provide the connection details of the cluster's primary server"));
+		log_hint(_("provide the connection details of the cluster's primary server"));

 		PQfinish(witness_conn);
 		PQfinish(primary_conn);
--- a/repmgr-client-global.h
+++ b/repmgr-client-global.h
@@ -68,6 +68,7 @@ typedef struct
 	int			node_id;
 	char		node_name[MAXLEN];
 	char		data_dir[MAXPGPATH];
+	int			remote_node_id;

 	/* "standby clone" options */
 	bool		copy_external_config_files;
@@ -79,6 +80,7 @@ typedef struct
 	char		replication_user[MAXLEN];
 	char		upstream_conninfo[MAXLEN];
 	bool		without_barman;
+	bool		recovery_conf_only;

 	/* "standby clone"/"standby follow" options */
 	int			upstream_node_id;
@@ -103,6 +105,7 @@ typedef struct
 	bool		role;
 	bool		slots;
 	bool		has_passfile;
+	bool		replication_connection;

 	/* "node join" options */
 	char		config_files[MAXLEN];
@@ -136,14 +139,14 @@ typedef struct
 		/* output options */ \
 		false, false, false,  \
 		/* database connection options */ \
-		"", "", "",	"",				  \
+		"", "", "",	"", \
 		/* other connection options */ \
-		"",	"",  \
-		/* node options */ \
-		UNKNOWN_NODE_ID, "", "", \
+		"",	"", \
+		/* general node options */ \
+		UNKNOWN_NODE_ID, "", "", UNKNOWN_NODE_ID, \
 		/* "standby clone" options */ \
 		false, CONFIG_FILE_SAMEPATH, false, false, false, "", "", "", \
-		false,  \
+		false, false, \
 		/* "standby clone"/"standby follow" options */ \
 		NO_UPSTREAM_NODE, \
 		/* "standby register" options */ \
@@ -153,7 +156,7 @@ typedef struct
 		/* "node status" options */ \
 		false, \
 		/* "node check" options */ \
-		false, false, false, false, false, false, \
+		false, false, false, false, false, false, false, \
 		/* "node join" options */ \
 		"", \
 		/* "node service" options */ \
@@ -162,7 +165,7 @@ typedef struct
 		false, "", CLUSTER_EVENT_LIMIT,	\
 		/* "cluster cleanup" options */ \
 		0, \
-		/* Following options for internal use */ \
+		/* following options for internal use */ \
 		"/tmp", OM_TEXT	\
 }

@@ -179,6 +182,7 @@ typedef enum
 	ACTION_NONE,
 	ACTION_START,
 	ACTION_STOP,
+	ACTION_STOP_WAIT,
 	ACTION_RESTART,
 	ACTION_RELOAD,
 	ACTION_PROMOTE
--- a/repmgr-client.c
+++ b/repmgr-client.c
@@ -60,7 +60,6 @@
 #include "repmgr-action-witness.h"
 #include "repmgr-action-bdr.h"
 #include "repmgr-action-node.h"
-
 #include "repmgr-action-cluster.h"

 #include <storage/fd.h>			/* for PG_TEMP_FILE_PREFIX */
@@ -73,7 +72,7 @@ t_runtime_options runtime_options = T_RUNTIME_OPTIONS_INITIALIZER;
 t_configuration_options config_file_options = T_CONFIGURATION_OPTIONS_INITIALIZER;

 /* conninfo params for the node we're operating on */
-t_conninfo_param_list source_conninfo;
+t_conninfo_param_list source_conninfo = T_CONNINFO_PARAM_LIST_INITIALIZER;

 bool		config_file_required = true;
 char		pg_bindir[MAXLEN] = "";
@@ -95,7 +94,7 @@ static ItemList cli_warnings = {NULL, NULL};
 int
 main(int argc, char **argv)
 {
-	t_conninfo_param_list default_conninfo;
+	t_conninfo_param_list default_conninfo = T_CONNINFO_PARAM_LIST_INITIALIZER;

 	int			optindex;
 	int			c;
@@ -177,7 +176,7 @@ main(int argc, char **argv)
 		strncpy(runtime_options.username, pw->pw_name, MAXLEN);
 	}

-	while ((c = getopt_long(argc, argv, "?Vb:f:FWd:h:p:U:R:S:D:ckL:tvC:", long_options,
+	while ((c = getopt_long(argc, argv, "?Vb:f:FWd:h:p:U:R:S:D:ck:L:tvC:", long_options,
 							&optindex)) != -1)
 	{
 		/*
@@ -329,6 +328,11 @@ main(int argc, char **argv)
 				strncpy(runtime_options.node_name, optarg, MAXLEN);
 				break;

+				/* --remote-node-id */
+			case OPT_REMOTE_NODE_ID:
+				runtime_options.remote_node_id = repmgr_atoi(optarg, "--remote-node-id", &cli_errors, false);
+				break;
+
 				/*
 				 * standby options * ---------------
 				 */
@@ -384,6 +388,11 @@ main(int argc, char **argv)
 				runtime_options.without_barman = true;
 				break;

+			case OPT_RECOVERY_CONF_ONLY:
+				runtime_options.recovery_conf_only = true;
+				break;
+
+
 				/*---------------------------
 				 * "standby register" options
 				 *---------------------------
@@ -455,6 +464,10 @@ main(int argc, char **argv)
 				runtime_options.has_passfile = true;
 				break;

+			case OPT_REPL_CONN:
+				runtime_options.replication_connection = true;
+				break;
+
 				/*--------------------
 				 * "node rejoin" options
 				 *--------------------
@@ -737,7 +750,6 @@ main(int argc, char **argv)

 	if (repmgr_command != NULL)
 	{
-#ifndef BDR_ONLY
 		if (strcasecmp(repmgr_command, "PRIMARY") == 0 || strcasecmp(repmgr_command, "MASTER") == 0)
 		{
 			if (help_option == true)
@@ -794,9 +806,6 @@ main(int argc, char **argv)
 				action = WITNESS_UNREGISTER;
 		}
 		else if (strcasecmp(repmgr_command, "BDR") == 0)
-#else
-		if (strcasecmp(repmgr_command, "BDR") == 0)
-#endif
 		{
 			if (help_option == true)
 			{
@@ -989,31 +998,10 @@ main(int argc, char **argv)
 	}


-
-	/* check for conflicts between runtime options and configuration file */
-	/* ================================================================== */
-
-	if (action == STANDBY_CLONE)
-	{
-		standy_clone_mode mode = get_standby_clone_mode();
-
-		if (mode == barman && runtime_options.without_barman == false
-			&& config_file_options.use_replication_slots == true)
-		{
-			log_error(_("STANDBY CLONE in Barman mode is incompatible with configuration option \"use_replication_slots\""));
-			log_hint(_("set \"use_replication_slots\" to \"no\" in repmgr.conf, or use --without-barman fo clone directly from the upstream server"));
-			exit(ERR_BAD_CONFIG);
-		}
-	}
-
-
 	/*
 	 * Check for configuration file items which can be overriden by runtime
 	 * options
-	 */
-
-	/*
-	 * ============================================================================
+	 * =====================================================================
 	 */

 	/*
@@ -1157,7 +1145,6 @@ main(int argc, char **argv)

 	switch (action)
 	{
-#ifndef BDR_ONLY
 			/* PRIMARY */
 		case PRIMARY_REGISTER:
 			do_primary_register();
@@ -1193,21 +1180,6 @@ main(int argc, char **argv)
 		case WITNESS_UNREGISTER:
 			do_witness_unregister();
 			break;
-#else
-			/* we won't ever reach here, but stop the compiler complaining */
-		case PRIMARY_REGISTER:
-		case PRIMARY_UNREGISTER:
-		case STANDBY_CLONE:
-		case STANDBY_REGISTER:
-		case STANDBY_UNREGISTER:
-		case STANDBY_PROMOTE:
-		case STANDBY_FOLLOW:
-		case STANDBY_SWITCHOVER:
-		case WITNESS_REGISTER:
-		case WITNESS_UNREGISTER:
-			break;
-
-#endif
 			/* BDR */
 		case BDR_REGISTER:
 			do_bdr_register();
@@ -1507,6 +1479,39 @@ check_cli_parameters(const int action)
 		}
 	}

+	if (runtime_options.replication_user[0])
+	{
+		switch (action)
+		{
+			case PRIMARY_REGISTER:
+			case STANDBY_REGISTER:
+			case STANDBY_CLONE:
+				break;
+
+			case STANDBY_FOLLOW:
+				item_list_append_format(&cli_warnings,
+										_("--replication-user ignored when executing %s"),
+										action_name(action));
+			default:
+				item_list_append_format(&cli_warnings,
+										_("--replication-user not required when executing %s"),
+										action_name(action));
+		}
+	}
+
+	if (runtime_options.recovery_conf_only == true)
+	{
+		switch (action)
+		{
+			case STANDBY_CLONE:
+				break;
+			default:
+				item_list_append_format(&cli_warnings,
+										_("--create-recovery-conf will be ignored when executing %s"),
+										action_name(action));
+		}
+	}
+
 	if (runtime_options.event[0])
 	{
 		switch (action)
@@ -1520,25 +1525,6 @@ check_cli_parameters(const int action)
 		}
 	}

-	if (runtime_options.replication_user[0])
-	{
-		switch (action)
-		{
-			case PRIMARY_REGISTER:
-			case STANDBY_REGISTER:
-				break;
-			case STANDBY_CLONE:
-			case STANDBY_FOLLOW:
-				item_list_append_format(&cli_warnings,
-										_("--replication-user ignored when executing %s)"),
-										action_name(action));
-			default:
-				item_list_append_format(&cli_warnings,
-										_("--replication-user not required when executing %s"),
-										action_name(action));
-		}
-	}
-
 	if (runtime_options.limit_provided)
 	{
 		switch (action)
@@ -1599,8 +1585,7 @@ check_cli_parameters(const int action)
 			case NODE_STATUS:
 				break;
 			default:
-				item_list_append_format(
-										&cli_warnings,
+				item_list_append_format(&cli_warnings,
 										_("--is-shutdown-cleanly will be ignored when executing %s"),
 										action_name(action));
 		}
@@ -1613,8 +1598,7 @@ check_cli_parameters(const int action)
 			case STANDBY_SWITCHOVER:
 				break;
 			default:
-				item_list_append_format(
-										&cli_warnings,
+				item_list_append_format(&cli_warnings,
 										_("--always-promote will be ignored when executing %s"),
 										action_name(action));
 		}
@@ -1628,8 +1612,7 @@ check_cli_parameters(const int action)
 			case NODE_REJOIN:
 				break;
 			default:
-				item_list_append_format(
-										&cli_warnings,
+				item_list_append_format(&cli_warnings,
 										_("--force-rewind will be ignored when executing %s"),
 										action_name(action));
 		}
@@ -1643,8 +1626,7 @@ check_cli_parameters(const int action)
 			case NODE_REJOIN:
 				break;
 			default:
-				item_list_append_format(
-										&cli_warnings,
+				item_list_append_format(&cli_warnings,
 										_("--config-files will be ignored when executing %s"),
 										action_name(action));
 		}
@@ -1658,6 +1640,7 @@ check_cli_parameters(const int action)
 			case PRIMARY_UNREGISTER:
 			case STANDBY_CLONE:
 			case STANDBY_REGISTER:
+			case STANDBY_FOLLOW:
 			case STANDBY_SWITCHOVER:
 			case WITNESS_REGISTER:
 			case WITNESS_UNREGISTER:
@@ -1665,8 +1648,7 @@ check_cli_parameters(const int action)
 			case NODE_SERVICE:
 				break;
 			default:
-				item_list_append_format(
-										&cli_warnings,
+				item_list_append_format(&cli_warnings,
 										_("--dry-run is not effective when executing %s"),
 										action_name(action));
 		}
@@ -1688,8 +1670,7 @@ check_cli_parameters(const int action)
 		if (used_options > 1)
 		{
 			/* TODO: list which options were used */
-			item_list_append(
-							 &cli_errors,
+			item_list_append(&cli_errors,
 							 "only one of --csv, --nagios and --optformat can be used");
 		}
 	}
@@ -1793,13 +1774,12 @@ do_help(void)
 	print_help_header();

 	printf(_("Usage:\n"));
-#ifndef BDR_ONLY
 	printf(_("    %s [OPTIONS] primary {register|unregister}\n"), progname());
-	printf(_("    %s [OPTIONS] standby {register|unregister|clone|promote|follow}\n"), progname());
-#endif
+	printf(_("    %s [OPTIONS] standby {register|unregister|clone|promote|follow|switchover}\n"), progname());
 	printf(_("    %s [OPTIONS] bdr     {register|unregister}\n"), progname());
-	printf(_("    %s [OPTIONS] node    status\n"), progname());
+	printf(_("    %s [OPTIONS] node    {status|check|rejoin|service}\n"), progname());
 	printf(_("    %s [OPTIONS] cluster {show|event|matrix|crosscheck}\n"), progname());
+	printf(_("    %s [OPTIONS] witness {register|unregister}\n"), progname());

 	puts("");

@@ -2123,9 +2103,12 @@ test_ssh_connection(char *host, char *remote_user)
 bool
 local_command(const char *command, PQExpBufferData *outputbuf)
 {
-	FILE	   *fp;
+	FILE	   *fp = NULL;
 	char		output[MAXLEN];
 	int			retval = 0;
+	bool		success;
+
+	log_verbose(LOG_DEBUG, "executing:\n  %s", command);

 	if (outputbuf == NULL)
 	{
@@ -2141,27 +2124,45 @@ local_command(const char *command, PQExpBufferData *outputbuf)
 		return false;
 	}

-	/* TODO: better error handling */
+
 	while (fgets(output, MAXLEN, fp) != NULL)
 	{
 		appendPQExpBuffer(outputbuf, "%s", output);
+		if (!feof(fp))
+		{
+			break;
+		}
 	}

-	pclose(fp);
+	retval = pclose(fp);
+
+	/*  */
+	success = (WEXITSTATUS(retval) == 0 || WEXITSTATUS(retval) == 141) ? true : false;
+
+	log_verbose(LOG_DEBUG, "result of command was %i (%i)", WEXITSTATUS(retval), retval);

 	if (outputbuf->data != NULL)
 		log_verbose(LOG_DEBUG, "local_command(): output returned was:\n%s", outputbuf->data);
 	else
 		log_verbose(LOG_DEBUG, "local_command(): no output returned");

-	return true;
+	return success;
 }


+/*
+ * get_superuser_connection()
+ *
+ * Check if provided connection "conn" is a superuser connection, if not attempt to
+ * make a superuser connection "superuser_conn" with the provided --superuser parameter.
+ *
+ * "privileged_conn" is set to whichever connection is the superuser connection.
+ */
 void
 get_superuser_connection(PGconn **conn, PGconn **superuser_conn, PGconn **privileged_conn)
 {
 	t_connection_user userinfo = T_CONNECTION_USER_INITIALIZER;
+	t_conninfo_param_list conninfo_params = T_CONNINFO_PARAM_LIST_INITIALIZER;
 	bool		is_superuser = false;

 	/* this should never happen */
@@ -2187,9 +2188,11 @@ get_superuser_connection(PGconn **conn, PGconn **superuser_conn, PGconn **privil
 		exit(ERR_BAD_CONFIG);
 	}

-	*superuser_conn = establish_db_connection_as_user(config_file_options.conninfo,
-													  runtime_options.superuser,
-													  false);
+	initialize_conninfo_params(&conninfo_params, false);
+	conn_to_param_list(*conn, &conninfo_params);
+	param_set(&conninfo_params, "user", runtime_options.superuser);
+
+	*superuser_conn = establish_db_connection_by_params(&conninfo_params, false);

 	if (PQstatus(*superuser_conn) != CONNECTION_OK)
 	{
@@ -2416,7 +2419,12 @@ remote_command(const char *host, const char *user, const char *command, PQExpBuf
 	pclose(fp);

 	if (outputbuf != NULL)
-		log_verbose(LOG_DEBUG, "remote_command(): output returned was:\n  %s", outputbuf->data);
+	{
+		if (strlen(outputbuf->data))
+			log_verbose(LOG_DEBUG, "remote_command(): output returned was:\n  %s", outputbuf->data);
+		else
+			log_verbose(LOG_DEBUG, "remote_command(): no output returned");
+	}

 	return true;
 }
@@ -2462,18 +2470,15 @@ get_server_action(t_server_action action, char *script, char *data_dir)
 				{
 					initPQExpBuffer(&command);

-					appendPQExpBuffer(
-									  &command,
+					appendPQExpBuffer(&command,
 									  "%s %s -w -D ",
 									  make_pg_path("pg_ctl"),
 									  config_file_options.pg_ctl_options);

-					appendShellString(
-									  &command,
+					appendShellString(&command,
 									  data_dir);

-					appendPQExpBuffer(
-									  &command,
+					appendPQExpBuffer(&command,
 									  " start");

 					strncpy(script, command.data, MAXLEN);
@@ -2485,6 +2490,7 @@ get_server_action(t_server_action action, char *script, char *data_dir)
 			}

 		case ACTION_STOP:
+		case ACTION_STOP_WAIT:
 			{
 				if (config_file_options.service_stop_command[0] != '\0')
 				{
@@ -2494,19 +2500,23 @@ get_server_action(t_server_action action, char *script, char *data_dir)
 				else
 				{
 					initPQExpBuffer(&command);
-					appendPQExpBuffer(
-									  &command,
+					appendPQExpBuffer(&command,
 									  "%s %s -D ",
 									  make_pg_path("pg_ctl"),
 									  config_file_options.pg_ctl_options);

-					appendShellString(
-									  &command,
+					appendShellString(&command,
 									  data_dir);

-					appendPQExpBuffer(
-									  &command,
-									  " -m fast -W stop");
+					if (action == ACTION_STOP_WAIT)
+						appendPQExpBuffer(&command,
+										  " -w");
+					else
+						appendPQExpBuffer(&command,
+										  " -W");
+
+					appendPQExpBuffer(&command,
+									  " -m fast stop");

 					strncpy(script, command.data, MAXLEN);

@@ -2525,18 +2535,15 @@ get_server_action(t_server_action action, char *script, char *data_dir)
 				else
 				{
 					initPQExpBuffer(&command);
-					appendPQExpBuffer(
-									  &command,
+					appendPQExpBuffer(&command,
 									  "%s %s -w -D ",
 									  make_pg_path("pg_ctl"),
 									  config_file_options.pg_ctl_options);

-					appendShellString(
-									  &command,
+					appendShellString(&command,
 									  data_dir);

-					appendPQExpBuffer(
-									  &command,
+					appendPQExpBuffer(&command,
 									  " restart");

 					strncpy(script, command.data, MAXLEN);
@@ -2556,18 +2563,15 @@ get_server_action(t_server_action action, char *script, char *data_dir)
 				else
 				{
 					initPQExpBuffer(&command);
-					appendPQExpBuffer(
-									  &command,
+					appendPQExpBuffer(&command,
 									  "%s %s -w -D ",
 									  make_pg_path("pg_ctl"),
 									  config_file_options.pg_ctl_options);

-					appendShellString(
-									  &command,
+					appendShellString(&command,
 									  data_dir);

-					appendPQExpBuffer(
-									  &command,
+					appendPQExpBuffer(&command,
 									  " reload");

 					strncpy(script, command.data, MAXLEN);
@@ -2588,18 +2592,15 @@ get_server_action(t_server_action action, char *script, char *data_dir)
 				else
 				{
 					initPQExpBuffer(&command);
-					appendPQExpBuffer(
-									  &command,
+					appendPQExpBuffer(&command,
 									  "%s %s -w -D ",
 									  make_pg_path("pg_ctl"),
 									  config_file_options.pg_ctl_options);

-					appendShellString(
-									  &command,
+					appendShellString(&command,
 									  data_dir);

-					appendPQExpBuffer(
-									  &command,
+					appendPQExpBuffer(&command,
 									  " promote");

 					strncpy(script, command.data, MAXLEN);
@@ -2633,6 +2634,7 @@ data_dir_required_for_action(t_server_action action)
 			return true;

 		case ACTION_STOP:
+		case ACTION_STOP_WAIT:
 			if (config_file_options.service_stop_command[0] != '\0')
 			{
 				return false;
@@ -2715,7 +2717,7 @@ init_node_record(t_node_info *node_record)

 	if (config_file_options.replication_user[0] != '\0')
 	{
-		/* replication user explicitly provided */
+		/* replication user explicitly provided in configuration file */
 		strncpy(node_record->repluser, config_file_options.replication_user, NAMEDATALEN);
 	}
 	else
--- a/repmgr-client.h
+++ b/repmgr-client.h
@@ -83,6 +83,9 @@
 #define OPT_CONFIG_ARCHIVE_DIR			   1034
 #define OPT_HAS_PASSFILE                   1035
 #define OPT_WAIT_START                     1036
+#define OPT_REPL_CONN                      1037
+#define OPT_REMOTE_NODE_ID                 1038
+#define OPT_RECOVERY_CONF_ONLY             1039

 /* deprecated since 3.3 */
 #define OPT_DATA_DIR						999
@@ -115,6 +118,7 @@ static struct option long_options[] =
 	{"pgdata", required_argument, NULL, 'D'},
 	{"node-id", required_argument, NULL, OPT_NODE_ID},
 	{"node-name", required_argument, NULL, OPT_NODE_NAME},
+	{"remote-node-id", required_argument, NULL, OPT_REMOTE_NODE_ID},

 /* logging options */
 	{"log-level", required_argument, NULL, 'L'},
@@ -136,6 +140,7 @@ static struct option long_options[] =
 	{"upstream-conninfo", required_argument, NULL, OPT_UPSTREAM_CONNINFO},
 	{"upstream-node-id", required_argument, NULL, OPT_UPSTREAM_NODE_ID},
 	{"without-barman", no_argument, NULL, OPT_WITHOUT_BARMAN},
+	{"recovery-conf-only", no_argument, NULL, OPT_RECOVERY_CONF_ONLY},

 /* "standby register" options */
 	{"wait-start", required_argument, NULL, OPT_WAIT_START},
@@ -158,6 +163,7 @@ static struct option long_options[] =
 	{"role", no_argument, NULL, OPT_ROLE},
 	{"slots", no_argument, NULL, OPT_SLOTS},
 	{"has-passfile", no_argument, NULL, OPT_HAS_PASSFILE},
+	{"replication-connection", no_argument, NULL, OPT_REPL_CONN},

 /* "node rejoin" options */
 	{"config-files", required_argument, NULL, OPT_CONFIG_FILES},
--- a/repmgr.c
+++ b/repmgr.c
@@ -288,7 +288,6 @@ standby_get_last_updated(PG_FUNCTION_ARGS)
 Datum
 notify_follow_primary(PG_FUNCTION_ARGS)
 {
-#ifndef BDR_ONLY
 	int			primary_node_id = UNKNOWN_NODE_ID;

 	if (!shared_state)
@@ -316,7 +315,7 @@ notify_follow_primary(PG_FUNCTION_ARGS)
 	}

 	LWLockRelease(shared_state->lock);
-#endif
+
 	PG_RETURN_VOID();
 }

@@ -329,14 +328,12 @@ get_new_primary(PG_FUNCTION_ARGS)
 	if (!shared_state)
 		PG_RETURN_NULL();

-#ifndef BDR_ONLY
 	LWLockAcquire(shared_state->lock, LW_SHARED);

 	if (shared_state->follow_new_primary == true)
 		new_primary_node_id = shared_state->candidate_node_id;

 	LWLockRelease(shared_state->lock);
-#endif

 	if (new_primary_node_id == UNKNOWN_NODE_ID)
 		PG_RETURN_NULL();
@@ -348,7 +345,6 @@ get_new_primary(PG_FUNCTION_ARGS)
 Datum
 reset_voting_status(PG_FUNCTION_ARGS)
 {
-#ifndef BDR_ONLY
 	if (!shared_state)
 		PG_RETURN_NULL();

@@ -366,7 +362,7 @@ reset_voting_status(PG_FUNCTION_ARGS)
 	}

 	LWLockRelease(shared_state->lock);
-#endif
+
 	PG_RETURN_VOID();
 }

--- a/repmgr.conf.sample
+++ b/repmgr.conf.sample
@@ -161,7 +161,7 @@ ssh_options='-q -o ConnectTimeout=10'	# Options to append to "ssh"


 #------------------------------------------------------------------------------
-# Standby clone settings
+# "standby clone" settings
 #------------------------------------------------------------------------------
 #
 # These settings apply when cloning a standby ("repmgr standby clone").
@@ -178,6 +178,20 @@ ssh_options='-q -o ConnectTimeout=10'	# Options to append to "ssh"
 #restore_command=''			# This will be placed in the recovery.conf
 					# file generated by repmgr

+
+#------------------------------------------------------------------------------
+# "standby promote" settings
+#------------------------------------------------------------------------------
+
+# These settings apply when instructing a standby to promote itself to the
+# new primary ("repmgr standby promote").
+
+#promote_check_timeout=60		# The length of time (in seconds) to wait
+					# for the new primary to finish promoting
+#promote_check_interval=1		# The interval (in seconds) to check whether
+					# the new primary has finished promoting
+
+
 #------------------------------------------------------------------------------
 # Standby follow settings
 #------------------------------------------------------------------------------
@@ -235,8 +249,11 @@ ssh_options='-q -o ConnectTimeout=10'	# Options to append to "ssh"
 #primary_notification_timeout=60	# Interval (in seconds) which repmgrd on a standby
 					# will wait for a notification from the new primary,
 					# before falling back to degraded monitoring
-#monitoring_history=no
+#standby_reconnect_timeout=60	# Interval (in seconds) which repmgrd on a standby will wait
+					# to reconnect to the local node after executing "follow_command"

+#monitoring_history=no                  # Whether to write monitoring data to the "montoring_history" table
+#monitor_interval_secs=2                # Interval (in seconds) at which to write monitoring data
 #degraded_monitoring_timeout=-1		# Interval (in seconds) after which repmgrd will terminate if the
 					# server being monitored is no longer available. -1 (default)
 					# disables the timeout completely.
--- a/repmgr.h
+++ b/repmgr.h
@@ -77,6 +77,9 @@
 #define DEFAULT_REPLICATION_LAG_CRITICAL     600 /* seconds */
 #define DEFAULT_WITNESS_SYNC_INTERVAL        15  /* seconds */
 #define DEFAULT_WAIT_START                   30  /* seconds */
+#define DEFAULT_PROMOTE_CHECK_TIMEOUT        60  /* seconds */
+#define DEFAULT_PROMOTE_CHECK_INTERVAL       1   /* seconds */
+#define DEFAULT_STANDBY_RECONNECT_TIMEOUT    60  /* seconds */

 #ifndef RECOVERY_COMMAND_FILE
 #define RECOVERY_COMMAND_FILE "recovery.conf"
--- a/repmgr_version.h.in
+++ b/repmgr_version.h.in
@@ -1,3 +1,3 @@
 #define REPMGR_VERSION_DATE ""
-#define REPMGR_VERSION "4.0.2"
+#define REPMGR_VERSION "4.0.4"

--- a/repmgrd-bdr.c
+++ b/repmgrd-bdr.c
@@ -35,6 +35,29 @@ do_bdr_node_check(void)
 	/* nothing to do at the moment */
 }

+void
+handle_sigint_bdr(SIGNAL_ARGS)
+{
+	PQExpBufferData event_details;
+
+	initPQExpBuffer(&event_details);
+
+	appendPQExpBuffer(&event_details,
+					  "%s signal received",
+					  postgres_signal_arg == SIGTERM
+					  ? "TERM" : "INT");
+
+	create_event_notification(local_conn,
+							  &config_file_options,
+							  config_file_options.node_id,
+							  "repmgrd_shutdown",
+							  true,
+							  event_details.data);
+	termPQExpBuffer(&event_details);
+
+	terminate(SUCCESS);
+}
+

 void
 monitor_bdr(void)
@@ -98,23 +121,6 @@ monitor_bdr(void)
 		exit(ERR_BAD_CONFIG);
 	}

-	/* Retrieve record for this node from the local database */
-	record_status = get_node_record(local_conn, config_file_options.node_id, &local_node_info);
-
-	/*
-	 * Terminate if we can't find the local node record. This is a
-	 * "fix-the-config" situation, not a lot else we can do.
-	 */
-	if (record_status != RECORD_FOUND)
-	{
-		log_error(_("unable to retrieve record for local node (ID: %i), terminating"),
-				  local_node_info.node_id);
-		log_hint(_("check that \"repmgr bdr register\" was executed for this node"));
-		PQfinish(local_conn);
-		exit(ERR_BAD_CONFIG);
-	}
-
-
 	if (local_node_info.active == false)
 	{
 		log_error(_("local node (ID: %i) is marked as inactive in repmgr"),
@@ -152,15 +158,16 @@ monitor_bdr(void)
 		cell->node_info->node_status = NODE_STATUS_UP;
 	}

-	log_debug("main_loop_bdr() monitoring local node %i", config_file_options.node_id);
+	log_info(_("starting continuous BDR node monitoring on node %i"),
+			 config_file_options.node_id);

-	log_info(_("starting continuous BDR node monitoring"));
+	INSTR_TIME_SET_CURRENT(log_status_interval_start);

 	while (true)
 	{

 		/* monitoring loop */
-		log_verbose(LOG_DEBUG, "BDR check loop...");
+		log_verbose(LOG_DEBUG, "BDR check loop - checking %i nodes", nodes.node_count);

 		for (cell = nodes.head; cell; cell = cell->next)
 		{
@@ -262,7 +269,6 @@ loop:
 		if (config_file_options.log_status_interval > 0)
 		{
 			int			log_status_interval_elapsed = calculate_elapsed(log_status_interval_start);
-
 			if (log_status_interval_elapsed >= config_file_options.log_status_interval)
 			{
 				log_info(_("monitoring BDR replication status on node \"%s\" (ID: %i)"),
@@ -273,8 +279,7 @@ loop:
 				{
 					if (cell->node_info->monitoring_state == MS_DEGRADED)
 					{
-						log_detail(
-								   _("monitoring node \"%s\" (ID: %i) in degraded mode"),
+						log_detail(_("monitoring node \"%s\" (ID: %i) in degraded mode"),
 								   cell->node_info->node_name,
 								   cell->node_info->node_id);
 					}
--- a/repmgrd-bdr.h
+++ b/repmgrd-bdr.h
@@ -22,4 +22,5 @@
 extern void do_bdr_node_check(void);
 extern void monitor_bdr(void);

+extern void	handle_sigint_bdr(SIGNAL_ARGS);
 #endif							/* _REPMGRD_BDR_H_ */
--- a/repmgrd-physical.c
+++ b/repmgrd-physical.c
@@ -54,7 +54,6 @@ typedef enum
 static PGconn *upstream_conn = NULL;
 static PGconn *primary_conn = NULL;

-#ifndef BDR_ONLY
 static FailoverState failover_state = FAILOVER_STATE_UNKNOWN;

 static int	primary_node_id = UNKNOWN_NODE_ID;
@@ -85,15 +84,42 @@ static void update_monitoring_history(void);

 static const char * format_failover_state(FailoverState failover_state);

-#endif

+void
+handle_sigint_physical(SIGNAL_ARGS)
+{
+	PGconn *writeable_conn;
+	PQExpBufferData event_details;
+
+	initPQExpBuffer(&event_details);
+
+	appendPQExpBuffer(&event_details,
+					  "%s signal received",
+					  postgres_signal_arg == SIGTERM
+					  ? "TERM" : "INT");
+
+	if (local_node_info.type == PRIMARY)
+		writeable_conn = local_conn;
+	else
+		writeable_conn = primary_conn;
+
+	create_event_notification(writeable_conn,
+							  &config_file_options,
+							  config_file_options.node_id,
+							  "repmgrd_shutdown",
+							  true,
+							  event_details.data);
+
+	termPQExpBuffer(&event_details);
+
+	terminate(SUCCESS);
+}

 /* perform some sanity checks on the node's configuration */

 void
 do_physical_node_check(void)
 {
-#ifndef BDR_ONLY
 	/*
 	 * Check if node record is active - if not, and `failover=automatic`, the
 	 * node won't be considered as a promotion candidate; this often happens
@@ -117,6 +143,14 @@ do_physical_node_check(void)
 				log_error(_("this node is marked as inactive and cannot be used as a failover target"));
 				log_hint(_("%s"), hint);
 				PQfinish(local_conn);
+
+				create_event_notification(NULL,
+										  &config_file_options,
+										  config_file_options.node_id,
+										  "repmgrd_shutdown",
+										  false,
+										  "node is inactive and cannot be used as a failover target");
+
 				terminate(ERR_BAD_CONFIG);

 			case FAILOVER_MANUAL:
@@ -163,7 +197,6 @@ do_physical_node_check(void)
 			exit(ERR_BAD_CONFIG);
 		}
 	}
-#endif
 }


@@ -174,7 +207,6 @@ do_physical_node_check(void)
 void
 monitor_streaming_primary(void)
 {
-#ifndef BDR_ONLY
 	instr_time	log_status_interval_start;
 	PQExpBufferData event_details;

@@ -286,6 +318,7 @@ monitor_streaming_primary(void)

 				monitoring_state = MS_DEGRADED;
 				INSTR_TIME_SET_CURRENT(degraded_monitoring_start);
+				log_notice(_("unable to connect to local node, falling back to degraded monitoring"));
 			}

 		}
@@ -309,7 +342,7 @@ monitor_streaming_primary(void)
 				create_event_notification(NULL,
 										  &config_file_options,
 										  config_file_options.node_id,
-										  "repmgrd_terminate",
+										  "repmgrd_shutdown",
 										  true,
 										  event_details.data);

@@ -331,22 +364,20 @@ monitor_streaming_primary(void)
 				else
 				{
 					local_node_info.node_status = NODE_STATUS_UP;
-					monitoring_state = MS_NORMAL;
-
-					initPQExpBuffer(&event_details);

 					/* check to see if the node has been restored as a standby */
 					if (get_recovery_type(local_conn) == RECTYPE_STANDBY)
 					{
 						PGconn *new_primary_conn;

+						initPQExpBuffer(&event_details);
+
 						appendPQExpBuffer(&event_details,
 										  _("reconnected to node after %i seconds, node is now a standby, switching to standby monitoring"),
 										  degraded_monitoring_elapsed);
 						log_notice("%s", event_details.data);
 						termPQExpBuffer(&event_details);

-
 						primary_node_id = UNKNOWN_NODE_ID;

 						new_primary_conn = get_primary_connection_quiet(local_conn, &primary_node_id, NULL);
@@ -359,54 +390,103 @@ monitor_streaming_primary(void)
 						else
 						{
 							RecordStatus record_status;
-							int i = 0;

 							log_debug("primary node id is now %i", primary_node_id);

-							/*
-							 * poll for a while until record type is returned as "STANDBY" - it's possible
-							 * that there's a gap between the server being restarted and the record
-							 * being updated
-							 */
-							for (i = 0; i < 30; i++)
-							{
-								/*
-								 * try and refresh the local node record from the primary, as the updated
-								 * local node record may not have been replicated yet
-								 */
-
-								record_status = get_node_record(new_primary_conn, config_file_options.node_id, &local_node_info);
-
-								if (record_status == RECORD_FOUND)
-								{
-									log_debug("type = %s", get_node_type_string(local_node_info.type));
-
-									if (local_node_info.type == STANDBY)
-									{
-										PQfinish(new_primary_conn);
-
-										/* XXX add event notification */
-										return;
-									}
-								}
-								sleep(1);
-							}
-
-							PQfinish(new_primary_conn);
+							record_status = get_node_record(new_primary_conn, config_file_options.node_id, &local_node_info);

 							if (record_status == RECORD_FOUND)
 							{
-								log_warning(_("repmgr node record is still %s"), get_node_type_string(local_node_info.type));
+								bool resume_monitoring = true;
+
+								log_debug("node %i is registered with type = %s",
+										  config_file_options.node_id,
+										  get_node_type_string(local_node_info.type));
+
+								/*
+								 * node has recovered but metadata not updated - we can do that ourselves,
+								 */
+								if (local_node_info.type == PRIMARY)
+								{
+									log_notice(_("node \"%s\" (ID: %i) still registered as primary, setting to standby"),
+											   config_file_options.node_name,
+											   config_file_options.node_id);
+
+									if (update_node_record_set_active_standby(new_primary_conn, config_file_options.node_id) == false)
+									{
+										resume_monitoring = false;
+									}
+									else
+									{
+										record_status = get_node_record(new_primary_conn, config_file_options.node_id, &local_node_info);
+
+										if (record_status != RECORD_FOUND)
+										{
+											resume_monitoring = false;
+										}
+									}
+								}
+
+								if (resume_monitoring == true)
+								{
+									monitoring_state = MS_NORMAL;
+									log_notice(_("former primary has been restored as standby after %i seconds, updating node record and resuming monitoring"),
+											   degraded_monitoring_elapsed);
+
+									initPQExpBuffer(&event_details);
+
+									appendPQExpBuffer(&event_details,
+													  _("node restored as standby after %i seconds, monitoring connection to upstream node %i"),
+													  degraded_monitoring_elapsed,
+													  local_node_info.upstream_node_id);
+
+									create_event_notification(new_primary_conn,
+															  &config_file_options,
+															  config_file_options.node_id,
+															  "repmgrd_standby_reconnect",
+															  true,
+															  event_details.data);
+
+
+									termPQExpBuffer(&event_details);
+
+									PQfinish(new_primary_conn);
+
+									/* restart monitoring as standby */
+									return;
+								}
 							}
-							else
+							else if (record_status == RECORD_NOT_FOUND)
 							{
-								log_error(_("no metadata record found for this node"));
+								PQExpBufferData event_details;
+								initPQExpBuffer(&event_details);
+
+								appendPQExpBuffer(&event_details,
+												  _("no metadata record found for this node on current primary %i"),
+												  primary_node_id);
+
+								log_error("%s", event_details.data);
 								log_hint(_("check that 'repmgr (primary|standby) register' was executed for this node"));
+
+								PQfinish(new_primary_conn);
+
+								create_event_notification(NULL,
+														  &config_file_options,
+														  config_file_options.node_id,
+														  "repmgrd_shutdown",
+														  false,
+														  event_details.data);
+								termPQExpBuffer(&event_details);
+
+								terminate(ERR_BAD_CONFIG);
 							}
 						}
 					}
 					else
 					{
+						monitoring_state = MS_NORMAL;
+
+						initPQExpBuffer(&event_details);
 						appendPQExpBuffer(&event_details,
 										  _("reconnected to primary node after %i seconds, resuming monitoring"),
 										  degraded_monitoring_elapsed);
@@ -447,7 +527,7 @@ loop:

 				if (monitoring_state == MS_DEGRADED)
 				{
-					log_detail(_("waiting for primary to reappear"));
+					log_detail(_("waiting for the node to become available"));
 				}

 				INSTR_TIME_SET_CURRENT(log_status_interval_start);
@@ -478,21 +558,17 @@ loop:
 			got_SIGHUP = false;
 		}

-
-
 		log_verbose(LOG_DEBUG, "sleeping %i seconds (parameter \"monitor_interval_secs\")",
 					config_file_options.monitor_interval_secs);

 		sleep(config_file_options.monitor_interval_secs);
 	}
-#endif
 }


 void
 monitor_streaming_standby(void)
 {
-#ifndef BDR_ONLY
 	RecordStatus record_status;
 	instr_time	log_status_interval_start;
 	PQExpBufferData event_details;
@@ -1017,16 +1093,17 @@ loop:
 			got_SIGHUP = false;
 		}

+		log_verbose(LOG_DEBUG, "sleeping %i seconds (parameter \"monitor_interval_secs\")",
+					config_file_options.monitor_interval_secs);
+
 		sleep(config_file_options.monitor_interval_secs);
 	}
-#endif
 }


 void
 monitor_streaming_witness(void)
 {
-#ifndef BDR_ONLY
 	instr_time	log_status_interval_start;
 	instr_time	witness_sync_interval_start;

@@ -1039,9 +1116,26 @@ monitor_streaming_witness(void)

 	if (get_primary_node_record(local_conn, &upstream_node_info) == false)
 	{
-		log_error(_("unable to retrieve record for primary node"));
+		PQExpBufferData event_details;
+
+		initPQExpBuffer(&event_details);
+
+		appendPQExpBuffer(&event_details,
+						  _("unable to retrieve record for primary node"));
+
+		log_error("%s", event_details.data);
 		log_hint(_("execute \"repmgr witness register --force\" to update the witness node "));
 		PQfinish(local_conn);
+
+		create_event_notification(NULL,
+								  &config_file_options,
+								  config_file_options.node_id,
+								  "repmgrd_shutdown",
+								  false,
+								  event_details.data);
+
+		termPQExpBuffer(&event_details);
+
 		terminate(ERR_BAD_CONFIG);
 	}

@@ -1349,15 +1443,17 @@ loop:
 			got_SIGHUP = false;
 		}

+		log_verbose(LOG_DEBUG, "sleeping %i seconds (parameter \"monitor_interval_secs\")",
+					config_file_options.monitor_interval_secs);
+
 		sleep(config_file_options.monitor_interval_secs);
 	}
-#endif
+
 	return;

 }


-#ifndef BDR_ONLY
 static bool
 do_primary_failover(void)
 {
@@ -1387,7 +1483,7 @@ do_primary_failover(void)

 		failover_state = promote_self();
 	}
-	else if (election_result == ELECTION_LOST)
+	else if (election_result == ELECTION_LOST || election_result == ELECTION_NOT_CANDIDATE)
 	{
 		log_info(_("follower node awaiting notification from the candidate node"));
 		failover_state = FAILOVER_STATE_WAITING_NEW_PRIMARY;
@@ -1403,7 +1499,7 @@ do_primary_failover(void)

 		/* TODO: rerun election if new primary doesn't appear after timeout */

-		/* either follow or time out; either way resume monitoring */
+		/* either follow, self-promote or time out; either way resume monitoring */
 		if (wait_primary_notification(&new_primary_id) == true)
 		{
 			/* if primary has reappeared, no action needed */
@@ -1454,11 +1550,9 @@ do_primary_failover(void)
 											  &config_file_options,
 											  local_node_info.node_id,
 											  "standby_disconnect_manual",
-
-					/*
-					 * here "true" indicates the action has occurred as
-					 * expected
-					 */
+											  /*
+											   * here "true" indicates the action has occurred as expected
+											   */
 											  true,
 											  event_details.data);
 					PQfinish(new_primary_conn);
@@ -1677,7 +1771,7 @@ do_upstream_standby_failover(void)
 	t_node_info primary_node_info = T_NODE_INFO_INITIALIZER;
 	RecordStatus record_status = RECORD_NOT_FOUND;
 	RecoveryType primary_type = RECTYPE_UNKNOWN;
-	int			r;
+	int			i, r;
 	char		parsed_follow_command[MAXPGPATH] = "";

 	PQfinish(upstream_conn);
@@ -1762,8 +1856,30 @@ do_upstream_standby_failover(void)
 		termPQExpBuffer(&event_details);
 	}

-	/* reconnect to local node */
-	local_conn = establish_db_connection(config_file_options.conninfo, false);
+	/*
+	 * It's possible that the standby is still starting up after the "follow_command"
+	 * completes, so poll for a while until we get a connection.
+	 */
+
+	for (i = 0; i < config_file_options.standby_reconnect_timeout; i++)
+	{
+		local_conn = establish_db_connection(local_node_info.conninfo, false);
+
+		if (PQstatus(local_conn) == CONNECTION_OK)
+			break;
+
+		log_debug("sleeping 1 second; %i of %i attempts to reconnect to local node",
+				  i + 1,
+				  config_file_options.standby_reconnect_timeout);
+		sleep(1);
+	}
+
+	if (PQstatus(local_conn) != CONNECTION_OK)
+	{
+		log_error(_("unable to reconnect to local node %i"),
+				  local_node_info.node_id);
+		return FAILOVER_STATE_FOLLOW_FAIL;
+	}

 	/* refresh shared memory settings which will have been zapped by the restart */
 	repmgrd_set_local_node_id(local_conn, config_file_options.node_id);
@@ -2043,7 +2159,7 @@ follow_new_primary(int new_primary_id)
 	char		parsed_follow_command[MAXPGPATH] = "";

 	PQExpBufferData event_details;
-	int			r;
+	int			i, r;

 	/* Store details of the failed node here */
 	t_node_info failed_primary = T_NODE_INFO_INITIALIZER;
@@ -2155,8 +2271,6 @@ follow_new_primary(int new_primary_id)
 		return FAILOVER_STATE_FOLLOW_FAIL;
 	}

-
-
 	/*
 	 * refresh local copy of local and primary node records - we get these
 	 * directly from the primary to ensure they're the current version
@@ -2179,7 +2293,30 @@ follow_new_primary(int new_primary_id)
 		return FAILOVER_STATE_FOLLOW_FAIL;
 	}

-	local_conn = establish_db_connection(local_node_info.conninfo, false);
+	/*
+	 * It's possible that the standby is still starting up after the "follow_command"
+	 * completes, so poll for a while until we get a connection.
+	 */
+
+	for (i = 0; i < config_file_options.standby_reconnect_timeout; i++)
+	{
+		local_conn = establish_db_connection(local_node_info.conninfo, false);
+
+		if (PQstatus(local_conn) == CONNECTION_OK)
+			break;
+
+		log_debug("sleeping 1 second; %i of %i attempts to reconnect to local node",
+				  i + 1,
+				  config_file_options.standby_reconnect_timeout);
+		sleep(1);
+	}
+
+	if (PQstatus(local_conn) != CONNECTION_OK)
+	{
+		log_error(_("unable to reconnect to local node %i"),
+				  local_node_info.node_id);
+		return FAILOVER_STATE_FOLLOW_FAIL;
+	}

 	/* refresh shared memory settings which will have been zapped by the restart */
 	repmgrd_set_local_node_id(local_conn, config_file_options.node_id);
@@ -2192,8 +2329,7 @@ follow_new_primary(int new_primary_id)

 	log_notice("%s", event_details.data);

-	create_event_notification(
-							  upstream_conn,
+	create_event_notification(upstream_conn,
 							  &config_file_options,
 							  local_node_info.node_id,
 							  "repmgrd_failover_follow",
@@ -2367,18 +2503,20 @@ do_election(void)

 	if (config_file_options.failover == FAILOVER_MANUAL)
 	{
-		log_notice(_("this node is not configured for automatic failover so will not be considered as promotion candidate"));
+		log_notice(_("this node is not configured for automatic failover so will not be considered as promotion candidate, and will not follow the new primary"));
+		log_detail(_("\"failover\" is set to \"manual\" in repmgr.conf"));
+		log_hint(_("manually execute \"repmgr standby follow\" to have this node follow the new primary"));

-		return ELECTION_LOST;
+		return ELECTION_NOT_CANDIDATE;
 	}

-	/* node priority is set to zero - don't ever become a candidate */
+	/* node priority is set to zero - don't become a candidate, and lose by default */
 	if (local_node_info.priority <= 0)
 	{
 		log_notice(_("this node's priority is %i so will not be considered as an automatic promotion candidate"),
 				   local_node_info.priority);

-		return ELECTION_NOT_CANDIDATE;
+		return ELECTION_LOST;
 	}

 	/* get all active nodes attached to upstream, excluding self */
@@ -2722,7 +2860,6 @@ format_failover_state(FailoverState failover_state)
 	return "UNKNOWN_FAILOVER_STATE";
 }

-#endif							/* #ifndef BDR_ONLY */

 void
 close_connections_physical()
--- a/repmgrd-physical.h
+++ b/repmgrd-physical.h
@@ -26,4 +26,6 @@ void		monitor_streaming_standby(void);
 void		monitor_streaming_witness(void);
 void		close_connections_physical(void);

+void		handle_sigint_physical(SIGNAL_ARGS);
+
 #endif							/* _REPMGRD_PHYSICAL_H_ */
--- a/repmgrd.c
+++ b/repmgrd.c
@@ -73,7 +73,6 @@ static void start_monitoring(void);
 #ifndef WIN32
 static void setup_event_handlers(void);
 static void handle_sighup(SIGNAL_ARGS);
-static void handle_sigint(SIGNAL_ARGS);
 #endif

 int			calculate_elapsed(instr_time start_time);
@@ -89,6 +88,7 @@ main(int argc, char **argv)
 	bool		cli_monitoring_history = false;

 	RecordStatus record_status;
+	ExtensionStatus extension_status = REPMGR_UNKNOWN;

 	FILE	   *fd;

@@ -254,6 +254,8 @@ main(int argc, char **argv)
 		strncpy(config_file_options.log_level, cli_log_level, MAXLEN);
 	}

+	log_notice(_("repmgrd (repmgr %s) starting up"), REPMGR_VERSION);
+
 	/*
 	 * -m/--monitoring-history, if provided, will override repmgr.conf's
 	 * monitoring_history; this is for backwards compatibility as it's
@@ -318,13 +320,58 @@ main(int argc, char **argv)
 	 * repmgr has not been properly configured.
 	 */

+	/* Check "repmgr" the extension is installed */
+	extension_status = get_repmgr_extension_status(local_conn);
+
+	if (extension_status != REPMGR_INSTALLED)
+	{
+		/* this is unlikely to happen */
+		if (extension_status == REPMGR_UNKNOWN)
+		{
+			log_error(_("unable to determine status of \"repmgr\" extension"));
+			log_detail("%s", PQerrorMessage(local_conn));
+			PQfinish(local_conn);
+			exit(ERR_DB_QUERY);
+		}
+
+		log_error(_("repmgr extension not found on this node"));
+
+		if (extension_status == REPMGR_AVAILABLE)
+		{
+			log_detail(_("repmgr extension is available but not installed in database \"%s\""),
+					   PQdb(local_conn));
+		}
+		else if (extension_status == REPMGR_UNAVAILABLE)
+		{
+			log_detail(_("repmgr extension is not available on this node"));
+		}
+
+		log_hint(_("check that this node is part of a repmgr cluster"));
+		PQfinish(local_conn);
+		exit(ERR_BAD_CONFIG);
+	}
+
 	/* Retrieve record for this node from the local database */
 	record_status = get_node_record(local_conn, config_file_options.node_id, &local_node_info);

+	/*
+	 * Terminate if we can't find the local node record. This is a
+	 * "fix-the-config" situation, not a lot else we can do.
+	 */
+
 	if (record_status != RECORD_FOUND)
 	{
 		log_error(_("no metadata record found for this node - terminating"));
-		log_hint(_("check that 'repmgr (primary|standby) register' was executed for this node"));
+
+		switch (config_file_options.replication_type)
+		{
+			case REPLICATION_TYPE_PHYSICAL:
+				log_hint(_("check that 'repmgr (primary|standby) register' was executed for this node"));
+				break;
+			case REPLICATION_TYPE_BDR:
+				log_hint(_("check that 'repmgr bdr register' was executed for this node"));
+				break;
+		}

 		PQfinish(local_conn);
 		terminate(ERR_BAD_CONFIG);
@@ -400,7 +447,6 @@ start_monitoring(void)
 	{
 		switch (local_node_info.type)
 		{
-#ifndef BDR_ONLY
 			case PRIMARY:
 				monitor_streaming_primary();
 				break;
@@ -410,11 +456,6 @@ start_monitoring(void)
 			case WITNESS:
 				monitor_streaming_witness();
 				break;
-#else
-			case PRIMARY:
-			case STANDBY:
-				return;
-#endif
 			case BDR:
 				monitor_bdr();
 				return;
@@ -587,11 +628,6 @@ check_and_create_pid_file(const char *pid_file)


 #ifndef WIN32
-static void
-handle_sigint(SIGNAL_ARGS)
-{
-	terminate(SUCCESS);
-}

 /* SIGHUP: set flag to re-read config file at next convenient time */
 static void
@@ -604,8 +640,23 @@ static void
 setup_event_handlers(void)
 {
 	pqsignal(SIGHUP, handle_sighup);
-	pqsignal(SIGINT, handle_sigint);
-	pqsignal(SIGTERM, handle_sigint);
+
+	/*
+	 * we want to be able to write a "repmgrd_shutdown" event, so delegate
+	 * signal handling to the respective replication type handler, as it
+	 * will know best which database connection to use
+	 */
+	switch (config_file_options.replication_type)
+	{
+		case REPLICATION_TYPE_BDR:
+			pqsignal(SIGINT, handle_sigint_bdr);
+			pqsignal(SIGTERM, handle_sigint_bdr);
+			break;
+		case REPLICATION_TYPE_PHYSICAL:
+			pqsignal(SIGINT, handle_sigint_physical);
+			pqsignal(SIGTERM, handle_sigint_physical);
+			break;
+	}
 }
 #endif
Author	SHA1	Message	Date
Ian Barwick	b17993abdb	doc: update "repmgr primary unregister" description As noted by GitHub user yonj1e in GitHub #396.	2018-03-08 15:01:25 +09:00
Ian Barwick	8f68344f9a	doc: update FAQ Additional clarification for "repmgr standby clone --recovery-conf-only"	2018-03-08 10:04:30 +09:00
Ian Barwick	125ac6c297	doc: update FAQ Add entry about upgrading PostgreSQL	2018-03-08 10:04:30 +09:00
Ian Barwick	955860923f	Fix parsing of -k/--keep-history option GitHub #394.	2018-03-07 19:14:18 +09:00
Ian Barwick	50626f90cc	Add 4.0.4 release notes	2018-03-07 14:17:04 +09:00
Ian Barwick	9aea5b8aa7	repmgrd: fix failover handling in "manual" mode Regression was introduced in commit `c7a585c555`	2018-03-06 22:35:51 +09:00
Ian Barwick	ed1bcb159e	repmgrd: remove duplicate local record check in BDR mode	2018-03-06 12:31:07 +09:00
Ian Barwick	9c72c0d66e	Add event "repmgrd_shutdown" Implements GitHub #393	2018-03-06 10:59:54 +09:00
Emre Hasegeli	0ddc226c2a	Add witness options to the main help GitHub #392	2018-03-06 10:57:33 +09:00
Ian Barwick	93830cad61	Fix directory creation when cloning from Barman	2018-03-05 19:31:53 +09:00
Ian Barwick	bca1660d5e	Improve repmgrd logging in BDR mode Also ensure interval status log line is shown as intended	2018-03-05 15:05:40 +09:00
Ian Barwick	5a52917421	repmgrd: add debug log output for "monitor_interval_secs" sleep in all modes	2018-03-05 14:23:58 +09:00
Emre Hasegeli	70752d7d4a	Add missing options to the main help	2018-03-05 09:52:04 +09:00
Ian Barwick	c29d1efc37	"standby clone": improve replication user selection Use the upstream node's replication user when checking the replication connection.	2018-03-02 16:21:32 +09:00
Ian Barwick	6fbbe2a97a	"standby clone": fix --superuser handling get_superuser_connection() was erroneously using the local node record to connect to as a superuser, which works when registering the primary but obviously not when cloning a standby. Addresses GitHub #380.	2018-03-02 14:49:17 +09:00
Ian Barwick	ce42d6827e	Update HISTORY	2018-03-01 15:51:09 +09:00
Ian Barwick	98384559a6	"standby clone": remove restriction on replication slots in Barman mode While it's preferable to avoid standby replication slots if Barman is in use, there's no technical reason to prevent this. Implements GitHub #379.	2018-03-01 15:47:28 +09:00
Ian Barwick	4a1477343b	repmgr: escape "restore_command" in generated recovery.conf	2018-03-01 10:39:04 +09:00
Ian Barwick	d2b9d20393	"standy clone": fix primary_conninfo when --upstream-conninfo provided	2018-03-01 09:18:40 +09:00
Ian Barwick	fe594c95ad	repmgrd: retry standby connection after cascading standby failover	2018-02-28 21:15:11 +09:00
Ian Barwick	60e63feaca	repmgrd: add configuration file parameter "standby_reconnect_timeout" This is used for determining a timeout when reconnecting to the standby after executing the "follow_command". This will normally not need to be set explicitly, but maybe useful in cases where the standby's startup phase can last longer than usual.	2018-02-28 18:56:33 +09:00
Ian Barwick	ae4d0f2622	repmgrd: fix main monitoring loop for witness server Missing "break" was breaking it when following a new primary.	2018-02-28 16:30:14 +09:00
Ian Barwick	5e8b41e221	repmgrd: retry standby connection after "follow_command" executed It's possible that the standby is still starting up after the "follow_command" completes, so poll for a while until we get a connection.	2018-02-28 15:35:47 +09:00
Ian Barwick	c7a585c555	repmgrd: improve log output - emit explicit startup NOTICE - emit NOTICE when falling back to degraded monitoring on a primary node - improve log message and event notification details when monitoring a former primary which has been reconnected as a standby	2018-02-28 12:35:13 +09:00
Ian Barwick	a27dd8c49c	doc: document "primary_follow_timeout" configuration file parameter.	2018-02-27 10:09:40 +09:00
Ian Barwick	9365bf3474	"standby promote": make timeout values configurable This introduces following new configuration file parameters, which were previously hard-coded values: - promote_check_timeout - promote_check_interval Implements GitHub #387.	2018-02-27 10:04:58 +09:00
Ian Barwick	e8ae0831fe	doc: add <options> section for various commands	2018-02-26 16:54:54 +09:00
Ian Barwick	518866eba5	"node status": improve replication slot warnings Addresses GitHub #385	2018-02-23 11:06:47 +09:00
Ian Barwick	ed0330c334	"standby clone": document --recovery-conf-only option	2018-02-23 10:54:42 +09:00
Ian Barwick	1f021dc9fa	"standby clone --recovery-conf-only": display generated file with --dry-run Refactor the original code which generates "recovery.conf" to place the output into a buffer, which can either be output as "recovery.conf" or copied to a buffer specified by the caller.	2018-02-23 10:16:47 +09:00
Ian Barwick	425839d764	Fix typo in function name	2018-02-22 15:48:41 +09:00
Ian Barwick	3a764f678a	"standby clone": add --recovery-conf-only option This will generate "recovery.conf" for an existing standby. Typical use-case is a standby cloned manually from an external data source (e.g. Barman), where "recovery.conf" needs to be created (and if required a replication slot). The --dry-run option will check the pre-requisites but not actually create "recovery.conf" or a replication slot. This requires that the upstream node is running, a replication connection can be made and if required a replication slot can be created. Implements GitHub #382.	2018-02-22 15:47:19 +09:00
Ian Barwick	829cf5cca4	repmgrd: improve detection of status change from primary to standby If repmgrd is running in degraded mode on a primary which has been stopped, then manually been brought back online as a standby (e.g. by creating recovery.conf and starting the server), ensure it not only detects the change but automatically updates the node record so it can resume monitoring the node as a standby. Previously, repmgrd was looping waiting for the record to be updated (as is done transparently when executing "repmgr node rejoin") but if the record was not updated within the timeout period (e.g. by "repmgr standby register) it would fail to resume monitoring as a standby. It seems reasonable to have repmgrd automatically update the node record, as this will restore failover capability as quickly as possible. If this is not desired, then the onus is on the user to shut down repmgrd while making the desired changes.	2018-02-22 11:35:47 +09:00
Ian Barwick	14420d83fa	"node rejoin": ensure --dry-run is honoured Addresses GitHub #383.	2018-02-20 15:28:39 +09:00
Ian Barwick	a80e22f0ed	Bump version 4.0.4	2018-02-16 12:19:31 +09:00
Ian Barwick	832993bfbc	doc: update 4.0.3 release notes	2018-02-16 12:15:10 +09:00
Ian Barwick	f1ea5e62df	doc: update release notes	2018-02-15 14:42:29 +09:00
Ian Barwick	b47448d0e5	Replace remaining instances of strcpy() with strncpy() Also use strncmp() to match.	2018-02-15 13:17:06 +09:00
Ian Barwick	a8232337d8	Catch various corner cases when restarting a PostgreSQL instance	2018-02-14 11:28:38 +09:00
Ian Barwick	c9eb1bfcc0	Always initialise t_conninfo_param_list structures	2018-02-13 10:48:18 +09:00
Ian Barwick	db552dfbc7	Bump version 4.0.3	2018-02-12 15:03:29 +09:00
Ian Barwick	9732f78565	repmgrd: check "repmgr" extension is installed before starting Implements GitHub #361.	2018-02-12 11:31:59 +09:00
Ian Barwick	eb7dca2919	"node status": add warning about missing replication slots Implements GitHub #364.	2018-02-12 10:53:31 +09:00
Ian Barwick	c113102926	Update repmgr.conf.sample Add missing parameter "monitor_interval_secs"	2018-02-12 09:35:57 +09:00
Ian Barwick	ed6a167915	Execute a CHECKPOINT immediately after promoting the server This ensures "pg_control" is updated with the latest timeline, mainly to ensure that if "pg_rewind" is executed as part of a switchover that it sees the latest timeline. Per suggestion from GitHub user "superflav" in GitHub #378. See also: https://www.postgresql.org/message-id/flat/20150428180253.GU30322%40tamriel.snowman.net	2018-02-09 12:09:16 +09:00
Ian Barwick	fbbe7afd61	doc: update HISTORY and release notes	2018-02-09 11:42:16 +09:00
Ian Barwick	ae1fc93e48	Ensure correct server version number used for replication stats query	2018-02-09 11:06:15 +09:00
Ian Barwick	7b4ee80af2	"standby switchover": check demotion candidate can make replication connection Check it's actually possible for the demotion candidate to attach to the promotion candidate before executing the switchover. As with other checks of this nature, there's a faint possibility the situation could change between the time the check is carried out and the demotion candidate is restarted to connect to the promotion candidate, but there's not a lot we can do about that. The main purpose is to be able to catch existing misconfigurations before anything gets changed. Implements GitHub #370.	2018-02-09 10:01:29 +09:00
Ian Barwick	0b8755e278	"witness register": fix primary node check Addresses GitHub #377, based on report by user yonj1e in #373.	2018-02-08 16:28:50 +09:00
Ian Barwick	d3e1937808	"standby switchover": additional sanity checks Check that sufficient walsenders will be available on the promotion candidate, and if replication slots are in use check if enough of those will be available. Note these checks can't guarantee that the walsenders/slots will be available at the appropriate points during the switchover process, but do ensure that existing configuration problems will be caught. Implements GitHub #371.	2018-02-08 15:23:10 +09:00
Ian Barwick	871d6fdee3	"standby clone": cowardly refuse to clone into an active data directory By checking the PID file in the same way pg_ctl does, we can be pretty much certain whether the target data directory contains an active PostgreSQL instance.	2018-02-08 11:43:24 +09:00
Ian Barwick	c7dfe9e040	Fix "standby clone" in Barman mode with --no-upstream-connection "--upstream-node-id", if provided, was not being passed through to the SQL query executed via the Barman server. Also modified the query to select the primary node if "--upstream-node-id" is not provided. Note: this is a very niche use case.	2018-02-07 16:36:44 +09:00
Ian Barwick	5c92a9e057	repmgr: simplify data directory checks when cloning Attempting to use the contents of pg_control to tell whether the directory is in use by PostgreSQL can result in false positives; we should use a check based on the pidfile. Also change the HINT to indicate a data directory can be overwritten if -F/--force is provided.	2018-02-07 14:37:57 +09:00
Ian Barwick	aa5f025738	"standby clone": ensure "pg_subtrans" directory is created in Barman mode	2018-02-07 10:56:18 +09:00
Ian Barwick	5b91a2d409	Update HISTORY and release notes	2018-02-07 09:55:36 +09:00
Ian Barwick	596a19ee37	Move parse_output_to_argv() to configfile.c So it can be used by parse_pg_basebackup_options(). Addresses GitHub #376.	2018-02-07 09:43:06 +09:00
Ian Barwick	23ff83b3b4	Fix typo in HINT	2018-02-07 08:55:51 +09:00
Ian Barwick	ba1f6bee0d	doc: fix GitHub reference in release notes	2018-02-07 08:53:23 +09:00
Ian Barwick	da9c8f2491	Update HISTORY and release notes	2018-02-06 10:38:13 +09:00
Ian Barwick	64035ef701	"standby register/follow": provide primary node details for event notifications For events generated by these commands, it may be useful to know details of the primary node. This makes following additional parameters available to event notification scripts: - %p: node ID of the primary - %a: node name of the primary - %c: conninfo string for the primary Implements GitHub #375	2018-02-06 09:36:46 +09:00
Ian Barwick	da3a5ab1dc	doc: fix descriptions of %p event notification script parameter	2018-02-05 15:54:06 +09:00
Ian Barwick	9d301b4789	"standby register": add event notification "standby_register_sync" Implements GitHub #374.	2018-02-05 15:21:38 +09:00
Ian Barwick	c070c649f7	doc: minor fixes to BDR docs Also remove duplicate file.	2018-02-05 15:21:34 +09:00
Ian Barwick	3b823396eb	doc: improve BDR failover documentation	2018-02-05 15:21:28 +09:00
Ian Barwick	c19e7f1025	"cluster show": output any connection error messagesin list of warnings This ensures any connection errors are displayed by default in a comprehensible, easily reportable way, and saves having to request/filter DEBUG output. Implements GitHub #369.	2018-02-05 10:32:20 +09:00
Ian Barwick	e4b5a1e19f	"cluster show": minor code cleanup	2018-02-05 10:25:05 +09:00
Ian Barwick	f96cc3b906	"cluster show": improve handling of database errors In particular, if running "repmgr cluster show" against a database without the repmgr metadata, showing the error (rather than just "no records found" etc.) will provide some clues about the problem.	2018-02-05 10:15:48 +09:00
Tony Finch	a481ca7ce2	"repmgr node status": correct upstream node info (#363 ) repmgr was printing the name and ID of this node instead of its upstream Signed-off-by: Tony Finch <dot@dotat.at>	2018-02-05 09:54:00 +09:00
Ian Barwick	32dc450a09	doc: add note about replication slots and PostgreSQL upgrades	2018-02-02 18:33:43 +09:00
Ian Barwick	34dbf64f50	Ensure an inactive PostgreSQL data directory can be deleted. Addresses GitHub #366.	2018-02-02 17:12:25 +09:00
Ian Barwick	ea653a8dbc	"standby follow": finalize implementation of --dry-run option	2018-02-02 15:42:08 +09:00
Ian Barwick	50894b6124	"standby follow": check for replication slot availability on target node	2018-02-02 15:01:23 +09:00
Ian Barwick	94e187c476	Improve "repmgr primary unregister" documentation and --help output Per observations in GitHub #373	2018-02-02 14:12:15 +09:00
Ian Barwick	de6284ae79	doc: note password SSH requirements for "standby switchover"	2018-02-02 14:01:58 +09:00
Ian Barwick	c54045bcd8	"standby follow": initial implementation of --dry-run option GitHub #363.	2018-02-01 14:18:40 +09:00
Ian Barwick	c0a53471e1	"standby switchover": improve log messages and add new exit code Previously, if an issue was encountered with the old primary, but user provided -F/--force to have repmgr promote the standby anyway, repmgr would exit with the log message "STANDBY SWITCHOVER is complete" and exit code 0 (SUCCESS). To better report this partial completion, repmgr will now emit the message "STANDBY SWITCHOVER has completed with issues" (and a HINT to check preceding log messages) and new exit code 22 (ERR_SWITCHOVER_INCOMPLETE).	2018-01-31 10:25:15 +09:00
Ian Barwick	2eec8b5d79	Have do_standby_follow_internal() not abort on error Pass the error code back to the caller instead, mainly so "repmgr node rejoin" can better report errors.	2018-01-30 16:53:04 +09:00
Ian Barwick	c11e92cf2a	repmgr: improve switchover handling when "pg_ctl" used If logging output not explicitly rediretced with "-l" in the pg_ctl options, repmgr would hang waiting for pg_ctl output. Note that we recommend using the OS-level service commands where available.	2018-01-30 13:43:37 +09:00
Ian Barwick	f294d09034	"repmgr standby register": improve error output when standby not running Add explicit HINT	2018-01-26 22:13:11 +09:00
Ian Barwick	26c597ef5a	doc: expand upgrade documentation Include section about using pg_upgrade	2018-01-23 10:57:19 +09:00
Vlad	b8efbb7a15	doc: add missing word in overview GitHub pull request #362	2018-01-19 09:11:54 +09:00
Ian Barwick	3044696c05	doc: update 4.0.2 release notes Add details about upgrading.	2018-01-19 09:09:59 +09:00
Ian Barwick	6dc1969ad5	Remove --bdr-only configuration option This was required for a specific use case during pre-release development and is no longer needed now the physical streaming replication handling is implemented.	2018-01-18 13:30:47 +09:00
Ian Barwick	cb41ef1733	doc: update list of event notifications	2018-01-18 11:48:10 +09:00