v3.0.2

Not yet tagged, pending a couple of tests
Update TODO
2026-03-23 07:06:30 +00:00 · 2015-10-02 11:46:13 +09:00 · 2015-10-02 11:46:13 +09:00 · 2015-10-02 11:45:57 +09:00 · 2015-10-02 11:45:57 +09:00 · 2015-10-02 10:18:06 +09:00
26 changed files with 1541 additions and 861 deletions
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -0,0 +1,29 @@
+License and Contributions
+=========================
+
+`repmgr` is licensed under the GPL v3.  All of its code and documentation is
+Copyright 2010-2015, 2ndQuadrant Limited.  See the files COPYRIGHT and LICENSE for
+details.
+
+The development of repmgr has primarily been sponsored by 2ndQuadrant customers.
+
+Additional work has been sponsored by the 4CaaST project for cloud computing,
+which has received funding from the European Union's Seventh Framework Programme
+(FP7/2007-2013) under grant agreement 258862.
+
+Contributions to `repmgr` are welcome, and will be listed in the file `CREDITS`.
+2ndQuadrant Limited requires that any contributions provide a copyright
+assignment and a disclaimer of any work-for-hire ownership claims from the
+employer of the developer.  This lets us make sure that all of the repmgr
+distribution remains free code.  Please contact info@2ndQuadrant.com for a
+copy of the relevant Copyright Assignment Form.
+
+Code style
+----------
+
+Code in repmgr is formatted to a consistent style using the following command:
+
+    astyle --style=ansi --indent=tab --suffix=none *.c *.h
+
+Contributors should reformat their code similarly before submitting code to
+the project, in order to minimize merge conflicts with other work.
--- a/FAILOVER.rst
+++ b/FAILOVER.rst
@@ -203,6 +203,12 @@ repmgr will also ask for the superuser password on the witness database so
 it can reconnect when needed (the command line option --initdb-no-pwprompt
 will set up a password-less superuser).

+By default the witness server will listen on port 5499; this value can be
+overridden by explicitly providing the port number in the conninfo string
+in repmgr.conf. (Note that it is also possible to specify the port number
+with the -l/--local-port option, however this option is now deprecated and
+will be overridden by a port setting in the conninfo string).
+
 Start the repmgrd daemons
 -------------------------

--- a/FAQ.md
+++ b/FAQ.md
@@ -90,6 +90,23 @@ General

  This option is only available when using the `--rsync-only` option.

+- How can I make the witness server use a particular port?
+
+  By default the witness server is configured to use port 5499; this
+  is intended to support running the witness server as  a separate
+  instance on a normal node server, rather than on its own dedicated server.
+
+  To specify a port for the witness server, supply the port number to
+  repmgr with the `-l/--local-port` command line option.
+
+- Do I need to include `shared_preload_libraries = 'repmgr_funcs'`
+  in `postgresql.conf` if I'm not using `repmgrd`?
+
+  No, the `repmgr_funcs` library is only needed when running `repmgrd`.
+  If you later decide to run `repmgrd`, you just need to add
+  `shared_preload_libraries = 'repmgr_funcs'` and restart PostgreSQL.
+
+
 `repmgrd`
 ---------

@@ -102,7 +119,7 @@ General

 - How can I prevent a node from ever being promoted to master?

-  In `rempgr.conf`, set its priority to a value of 0 or less.
+  In `repmgr.conf`, set its priority to a value of 0 or less.

 - Does `repmgrd` support delayed standbys?

--- a/30
+++ b/30
@@ -1,4 +1,27 @@
-3.0
+3.0.2   2015-09-
+        Improve handling of --help/--version options; and improve help output (Ian)
+        Improve handling of situation where logfile can't be opened (Ian)
+        Always pass -D/--pgdata option to pg_basebackup (Ian)
+        Bugfix: standby clone --force does not empty pg_xlog (Gianni)
+        Bugfix: autofailover with reconnect_attempts > 1 (Gianni)
+        Bugfix: ignore comments after values (soxwellfb)
+        Bugfix: handle string values in 'node' parameter correctly (Gregory Duchatelet)
+        Allow repmgr to be compiled with a newer libpq (Marco)
+        Bugfix: call update_node_record_set_upstream() for STANDBY FOLLOW (Tomas)
+        Update `repmgr --help` output (per Github report from renard)
+        Update tablespace remapping in --rsync-only mode for 9.5 and later (Ian)
+        Deprecate `-l/--local-port` option - the port can be extracted
+          from the conninfo string in repmgr.conf (Ian)
+        Add STANDBY UNREGISTE (Vik Fearing)
+
+3.0.1   2015-04-16
+        Prevent repmgrd from looping infinitely if node was not registered (Ian)
+        When promoting a standby, have repmgr (not repmgrd) handle metadata updates (Ian)
+        Re-use replication slot if it already exists (Ian)
+        Prevent a test SSH connection being made when not needed (Ian)
+        Correct monitoring table column names (Ian)
+
+3.0     2015-03-27
        Require PostgreSQL 9.3 or later (Ian)
        Use `pg_basebackup` by default (instead of `rsync`) to clone standby servers (Ian)
        Use `pg_ctl promote` to promote a standby to primary
@@ -11,6 +34,11 @@
        General usability and logging message improvements (Ian)
        Code consolidation and cleanup (Ian)

+2.0.3   2015-04-16
+        Add -S/--superuser option for witness database creation Ian)
+        Add -c/--fast-checkpoint option for cloning (Christoph)
+        Add option "--initdb-no-pwprompt" (Ian)
+
 2.0.2   2015-02-17
        Add "--checksum" in rsync when using "--force" (Jaime)
        Use createdb/createuser instead of psql (Jaime)
--- a/PACKAGES.md
+++ b/PACKAGES.md
@@ -4,10 +4,10 @@ Packaging
 Notes on RedHat Linux, Fedora, and CentOS Builds
 ------------------------------------------------

-The RPM packages of PostgreSQL put ``pg_config`` into the ``postgresql-devel``
+The RPM packages of PostgreSQL put `pg_config` into the `postgresql-devel`
 package, not the main server one.  And if you have a RPM install of PostgreSQL
 9.0, the entire PostgreSQL binary directory will not be in your PATH by default
-either.  Individual utilities are made available via the ``alternatives``
+either.  Individual utilities are made available via the `alternatives`
 mechanism, but not all commands will be wrapped that way.  The files installed
 by repmgr will certainly not be in the default PATH for the postgres user
 on such a system.  They will instead be in /usr/pgsql-9.0/bin/ on this
@@ -15,57 +15,61 @@ type of system.

 When building repmgr against a RPM packaged build, you may discover that some
 development packages are needed as well.  The following build errors can
-occur::
+occur:

-  /usr/bin/ld: cannot find -lxslt
-  /usr/bin/ld: cannot find -lpam
+    /usr/bin/ld: cannot find -lxslt
+    /usr/bin/ld: cannot find -lpam

-Install the following packages to correct those::
+Install the following packages to correct those:

-  yum install libxslt-devel
-  yum install pam-devel
+
+    yum install libxslt-devel
+    yum install pam-devel

 If building repmgr as a regular user, then doing the install into the system
-directories using sudo, the syntax is hard.  ``pg_config`` won't be in root's
-path either.  The following recipe should work::
+directories using sudo, the syntax is hard.  `pg_config` won't be in root's
+path either.  The following recipe should work:
+
+    sudo PATH="/usr/pgsql-9.0/bin:$PATH" make USE_PGXS=1 install

-  sudo PATH="/usr/pgsql-9.0/bin:$PATH" make USE_PGXS=1 install

 Issues with 32 and 64 bit RPMs
 ------------------------------

-If when building, you receive a series of errors of this form::
+If when building, you receive a series of errors of this form:

  /usr/bin/ld: skipping incompatible /usr/pgsql-9.0/lib/libpq.so when searching for -lpq

 This is likely because you have both the 32 and 64 bit versions of the
-``postgresql90-devel`` package installed.  You can check that like this::
+`postgresql90-devel` package installed.  You can check that like this:

-  rpm -qa --queryformat '%{NAME}\t%{ARCH}\n'  | grep postgresql90-devel
+    rpm -qa --queryformat '%{NAME}\t%{ARCH}\n'  | grep postgresql90-devel

 And if two packages appear, one for i386 and one for x86_64, that's not supposed
 to be allowed.

 This can happen when using the PGDG repo to install that package;
-here is an example sessions demonstrating the problem case appearing::
+here is an example sessions demonstrating the problem case appearing:

-  # yum install postgresql-devel
-  ..
-  Setting up Install Process
-  Resolving Dependencies
-  --> Running transaction check
-  ---> Package postgresql90-devel.i386 0:9.0.2-2PGDG.rhel5 set to be updated
-  ---> Package postgresql90-devel.x86_64 0:9.0.2-2PGDG.rhel5 set to be updated
-  --> Finished Dependency Resolution

-  Dependencies Resolved
+    # yum install postgresql-devel
+    ..
+    Setting up Install Process
+    Resolving Dependencies
+    --> Running transaction check
+    ---> Package postgresql90-devel.i386 0:9.0.2-2PGDG.rhel5 set to be updated
+    ---> Package postgresql90-devel.x86_64 0:9.0.2-2PGDG.rhel5 set to be updated
+    --> Finished Dependency Resolution
+
+    Dependencies Resolved
+
+    =========================================================================
+     Package               Arch      Version              Repository    Size
+    =========================================================================
+    Installing:
+     postgresql90-devel    i386      9.0.2-2PGDG.rhel5    pgdg90        1.5 M
+     postgresql90-devel    x86_64    9.0.2-2PGDG.rhel5    pgdg90        1.6 M

-  =========================================================================
-   Package               Arch      Version              Repository    Size
-  =========================================================================
-  Installing:
-   postgresql90-devel    i386      9.0.2-2PGDG.rhel5    pgdg90        1.5 M
-   postgresql90-devel    x86_64    9.0.2-2PGDG.rhel5    pgdg90        1.6 M

 Note how both the i386 and x86_64 platform architectures are selected for
 installation.  Your main PostgreSQL package will only be compatible with one of
@@ -73,14 +77,14 @@ those, and if the repmgr build finds the wrong postgresql90-devel these
 "skipping incompatible" messages appear.

 In this case, you can temporarily remove both packages, then just install the
-correct one for your architecture.  Example::
+correct one for your architecture.  Example:

-  rpm -e postgresql90-devel --allmatches
-  yum install postgresql90-devel-9.0.2-2PGDG.rhel5.x86_64
+    rpm -e postgresql90-devel --allmatches
+    yum install postgresql90-devel-9.0.2-2PGDG.rhel5.x86_64

 Instead just deleting the package from the wrong platform might not leave behind
 the correct files, due to the way in which these accidentally happen to interact.
-If you already tried to build repmgr before doing this, you'll need to do::
+If you already tried to build repmgr before doing this, you'll need to do:

    make USE_PGXS=1 clean

@@ -89,19 +93,19 @@ to get rid of leftover files from the wrong architecture.
 Notes on Ubuntu, Debian or other Debian-based Builds
 ----------------------------------------------------

-The Debian packages of PostgreSQL put ``pg_config`` into the development package
-called ``postgresql-server-dev-$version``.
+The Debian packages of PostgreSQL put `pg_config` into the development package
+called `postgresql-server-dev-$version`.

 When building repmgr against a Debian packages build, you may discover that some
 development packages are needed as well. You will need the following development
-packages installed::
+packages installed:

-  sudo apt-get install libxslt-dev libxml2-dev libpam-dev libedit-dev
+    sudo apt-get install libxslt-dev libxml2-dev libpam-dev libedit-dev

-If your using Debian packages for PostgreSQL and are building repmgr with the
-USE_PGXS option you also need to install the corresponding development package::
+If you're using Debian packages for PostgreSQL and are building repmgr with the
+USE_PGXS option you also need to install the corresponding development package:

-  sudo apt-get install postgresql-server-dev-9.0
+    sudo apt-get install postgresql-server-dev-9.0

 If you build and install repmgr manually it will not be on the system path. The
 binaries will be installed in /usr/lib/postgresql/$version/bin/ which is not on
@@ -110,14 +114,14 @@ multiple installed versions of PostgreSQL on the same system through a wrapper
 called pg_wrapper and repmgr is not (yet) known to this wrapper.

 You can solve this in many different ways, the most Debian like is to make an
-alternate for repmgr and repmgrd::
+alternate for repmgr and repmgrd:

-  sudo update-alternatives --install /usr/bin/repmgr repmgr /usr/lib/postgresql/9.0/bin/repmgr 10
-  sudo update-alternatives --install /usr/bin/repmgrd repmgrd /usr/lib/postgresql/9.0/bin/repmgrd 10
+    sudo update-alternatives --install /usr/bin/repmgr repmgr /usr/lib/postgresql/9.0/bin/repmgr 10
+    sudo update-alternatives --install /usr/bin/repmgrd repmgrd /usr/lib/postgresql/9.0/bin/repmgrd 10

-You can also make a deb package of repmgr using::
+You can also make a deb package of repmgr using:

-  make USE_PGXS=1 deb
+    make USE_PGXS=1 deb

 This will build a Debian package one level up from where you build, normally the
 same directory that you have your repmgr/ directory in.
--- a/QUICKSTART.md
+++ b/QUICKSTART.md
@@ -21,7 +21,8 @@ Master setup
 	CREATE DATABASE repmgr_db OWNER repmgr_usr;
 	```

-  - configure `postgresql.conf` for replication (see above)
+  - configure `postgresql.conf` for replication (see README.md for sample
+    settings)

  - update `pg_hba.conf`, e.g.:

@@ -71,7 +72,10 @@ Standby setup
        [2015-03-03 18:18:23] [NOTICE] HINT: You can now start your postgresql server
        [2015-03-03 18:18:23] [NOTICE] for example : pg_ctl -D  /path/to/standby/data start

-  Note that at this point it does not matter if the `repmgr.conf` file is not found.
+  Note that the `repmgr.conf` file is not required when cloning a standby.
+  However we recommend providing a valid `repmgr.conf` if you wish to use
+  replication slots, or want `repmgr` to log the clone event to the
+  `repl_events` table.

  This will clone the PostgreSQL database files from the master, including its
  `postgresql.conf` and `pg_hba.conf` files, and additionally automatically create
@@ -107,8 +111,8 @@ This concludes the basic `repmgr` setup of master and standby. The records
 created in the `repl_nodes` table should look something like this:

        repmgr_db=# SELECT * from repmgr_test.repl_nodes;
-         id |  type   | upstream_node_id | cluster | name  |                     conninfo                    | slot_name | priority | active
-        ----+---------+------------------+---------+-------+-------------------------------------------------+-----------+----------+--------
-          1 | primary |                  | test    | node1 | host=localhost user=repmgr_usr dbname=repmgr_db |           |        0 | t
-          2 | standby |                1 | test    | node2 | host=localhost user=repmgr_usr dbname=repmgr_db |           |        0 | t
+         id |  type   | upstream_node_id | cluster | name  |                      conninfo                      | slot_name | priority | active
+        ----+---------+------------------+---------+-------+----------------------------------------------------+-----------+----------+--------
+          1 | primary |                  | test    | node1 | host=repmgr_node1 user=repmgr_usr dbname=repmgr_db |           |        0 | t
+          2 | standby |                1 | test    | node2 | host=repmgr_node2 user=repmgr_usr dbname=repmgr_db |           |        0 | t
        (2 rows)
--- a/README.md
+++ b/README.md
@@ -7,7 +7,7 @@ hot-standby capabilities with tools to set up standby servers, monitor
 replication, and perform administrative tasks such as failover or manual
 switchover operations.

-This document covers `repmgr 3`, which supports PostgreSQL 9.4 and 9.3.
+This document covers `repmgr 3`, which supports PostgreSQL 9.3 and later.
 This version can use `pg_basebackup` to clone standby servers, supports
 replication slots and cascading replication, doesn't require a restart
 after promotion, and has many usability improvements.
@@ -53,7 +53,7 @@ on any UNIX-like system which PostgreSQL itself supports.

 All nodes must be running the same major version of PostgreSQL, and we
 recommend that they also run the same minor version. This version of
-`repmgr` (v3) supports PostgreSQL 9.3 and 9.4.
+`repmgr` (v3) supports PostgreSQL 9.3 and later.

 Earlier versions of `repmgr` needed password-less SSH access between
 nodes in order to clone standby servers using `rsync`. `repmgr 3` can
@@ -98,8 +98,8 @@ for details.

 ### PostgreSQL configuration

-The primary server needs to be configured for replication with the
-following settings in `postgresql.conf`:
+The primary server needs to be configured for replication with settings
+like the following in `postgresql.conf`:

    # Allow read-only queries on standby servers. The number of WAL
    # senders should be larger than the number of standby servers.
@@ -121,13 +121,18 @@ following settings in `postgresql.conf`:
    archive_mode = on
    archive_command = 'cd .'

-    # You can also set additional replication parameters here, such as
-    # hot_standby_feedback or synchronous_standby_names.
+    # If you plan to use repmgrd, ensure that shared_preload_libraries
+    # is configured to load 'repmgr_funcs'
+
+    shared_preload_libraries = 'repmgr_funcs'

 PostgreSQL 9.4 makes it possible to use replication slots, which means
-the value of wal_keep_segments need no longer be set. With 9.3, `repmgr`
-expects it to be set to at least 5000 (= 80GB of WAL) by default, though
-this can be overriden with the `-w N` argument.
+the value of `wal_keep_segments` need no longer be set. See section
+"Replication slots" below for more details.
+
+With PostgreSQL 9.3, `repmgr` expects `wal_keep_segments` to be set to
+at least 5000 (= 80GB of WAL) by default, though this can be overriden
+with the `-w N` argument.

 A dedicated PostgreSQL superuser account and a database in which to
 store monitoring and replication data are required. Create them by
@@ -223,7 +228,7 @@ The node can then be restarted.
 The node will then need to be re-registered with `repmgr`; again
 the `--force` option is required to update the existing record:

-     repmgr -f /etc/repmgr/repmgr.conf
+     repmgr -f /etc/repmgr/repmgr.conf \
       --force \
       standby register

@@ -345,6 +350,7 @@ Following event types currently exist:

    master_register
    standby_register
+    standby_unregister
    standby_clone
    standby_promote
    witness_create
@@ -398,6 +404,18 @@ stored in the `repl_nodes` table.
 Note that `repmgr` will fail with an error if this option is specified when
 working with PostgreSQL 9.3.

+Be aware that when initially cloning a standby, you will need to ensure
+that all required WAL files remain available while the cloning is taking
+place. If using the default `pg_basebackup` method, we recommend setting
+`pg_basebackup`'s `--xlog-method` parameter to `stream` like this:
+
+    pg_basebackup_options='--xlog-method=stream'
+
+See the `pg_basebackup` documentation [*] for details. Otherwise you'll need
+to set `wal_keep_segments` to an appropriately high value.
+
+[*] http://www.postgresql.org/docs/current/static/app-pgbasebackup.html
+
 Further reading:
 * http://www.postgresql.org/docs/current/interactive/warm-standby.html#STREAMING-REPLICATION-SLOTS
 * http://blog.2ndquadrant.com/postgresql-9-4-slots/
@@ -435,12 +453,19 @@ its port if is different from the default one.
    Registers a master in a cluster. This command needs to be executed before any
    standby nodes are registered.

+    `primary register` can be used as an alias for `master register`.
+
 * `standby register`

    Registers a standby with `repmgr`. This command needs to be executed to enable
    promote/follow operations and to allow `repmgrd` to work with the node.
    An existing standby can be registered using this command.

+* `standby unregister`
+
+    Unregisters a standby with `repmgr`. This command does not affect the actual
+    replication.
+
 * `standby clone [node to be cloned]`

    Clones a new standby node from the data directory of the master (or
--- a/RHEL/repmgr3-93.spec
+++ b/RHEL/repmgr3-93.spec
@@ -1,6 +1,6 @@
 Summary: repmgr
 Name: repmgr
-Version: 3.0rc4
+Version: 3.0
 Release: 1
 License: GPLv3
 Group: System Environment/Daemons
--- a/RHEL/repmgrd.init
+++ b/RHEL/repmgrd.init
@@ -1,89 +1,114 @@
-#!/bin/bash
+#!/bin/sh
 #
-# repmgrd	Start up the repmgrd daemon
-#		repmrgd (replication manager daemon)
-#
-# chkconfig: -  75 16
-# description: repmgrd is the repliation manager daemon \
-# The repmgrd replication management and monitoring daemon for PostgreSQL.
-
-### BEGIN INIT INFO
-# Provides: repmgrd
-# Required-Start:  $local_fs $remote_fs $network $syslog postgresql
-# Required-Stop:     $local_fs $remote_fs $network $syslog postgresql
-# Should-Start:	     $syslog postgresql-9.3
-# Should-Stop: $syslog postgresql-9.3
-# Short-Description: start and stop repmrgd
-# Description: Enable repmgrd replication management and monitoring daemon for PostgreSQL
-#	       this is used to monitor a postgresql cluster.
-### END INIT INFO
+# chkconfig: - 75 16
+# description: Enable repmgrd replication management and monitoring daemon for PostgreSQL
+# processname: repmgrd
+# pidfile="/var/run/${NAME}.pid"

 # Source function library.
-. /etc/init.d/functions
+INITD=/etc/rc.d/init.d
+. $INITD/functions

-# Source networking configuration.
+# Get function listing for cross-distribution logic.
+TYPESET=`typeset -f|grep "declare"`
+
+# Get network config.
 . /etc/sysconfig/network

-prog=repmgrd
-REPMGRD_ENABLED=yes
+DESC="PostgreSQL replication management and monitoring daemon"
+NAME=repmgrd
+
+REPMGRD_ENABLED=no
 REPMGRD_OPTS=
 REPMGRD_USER=postgres
-DAEMONIZE="-d"
+REPMGRD_BIN=/usr/pgsql-9.3/bin/repmgrd
+REPMGRD_PIDFILE=/var/run/repmgrd.pid
+REPMGRD_LOCK=/var/lock/subsys/${NAME}
+REPMGRD_LOG=/var/lib/pgsql/9.3/data/pg_log/repmgrd.log

-# pull in sysconfig settings
-[ -f /etc/sysconfig/repmgrd ] && . /etc/sysconfig/repmgrd
+# Read configuration variable file if it is present
+[ -r /etc/sysconfig/$NAME ] && . /etc/sysconfig/$NAME

-LOCKFILE=/var/lock/subsys/$prog
-RETVAL=0
+# For SELinux we need to use 'runuser' not 'su'
+if [ -x /sbin/runuser ]
+then
+    SU=runuser
+else
+    SU=su
+fi
+
+test -x $REPMGRD_BIN || exit 0

 case "$REPMGRD_ENABLED" in
    [Yy]*)
-	#nothing to do here	
+	break
 	;;
    *)
-	exit 2
+	exit 0
 	;;
 esac


-if [ -z "$REPMGRD_OPTS" ]
+if [ -z "${REPMGRD_OPTS}" ]
 then
-    echo "Not starting $prog, REPMGRD_OPTS not set in /etc/sysconfig/$prog"
-    exit 2
+    echo "Not starting ${NAME}, REPMGRD_OPTS not set in /etc/sysconfig/${NAME}"
+    exit 0
 fi

-start() {
-	[ "$EUID" != "0" ] && exit 4
-        [ "$NETWORKING" = "no" ] && exit 1
+start()
+{
+    REPMGRD_START=$"Starting ${NAME} service: "

-        # Start daemons.
-        echo -n $"Starting $prog: "
-        daemon --user $REPMGRD_USER $prog $DAEMONIZE $REPMGRD_OPTS
-        RETVAL=$?
+    # Make sure startup-time log file is valid
+    if [ ! -e "${REPMGRD_LOG}" -a ! -h "${REPMGRD_LOG}" ]
+    then
+        touch "${REPMGRD_LOG}" || exit 1
+        chown ${REPMGRD_USER}:postgres "${REPMGRD_LOG}"
+        chmod go-rwx "${REPMGRD_LOG}"
+        [ -x /sbin/restorecon ] && /sbin/restorecon "${REPMGRD_LOG}"
+    fi
+
+    echo -n "${REPMGRD_START}"
+    $SU -l $REPMGRD_USER -c "${REPMGRD_BIN} ${REPMGRD_OPTS} -p ${REPMGRD_PIDFILE} &" >> "${REPMGRD_LOG}" 2>&1 < /dev/null
+    sleep 2
+    pid=`head -n 1 "${REPMGRD_PIDFILE}" 2>/dev/null`
+    if [ "x${pid}" != "x" ]
+    then
+        success "${REPMGRD_START}"
+        touch "${REPMGRD_LOCK}"
+        echo $pid > "${REPMGRD_PIDFILE}"
        echo
-        [ $RETVAL -eq 0 ] && touch $LOCKFILE
-        return $RETVAL
+    else
+        failure "${REPMGRD_START}"
+        echo
+        script_result=1
+    fi
 }

-stop() {
-	[ "$EUID" != "0" ] && exit 4
-        echo -n $"Shutting down $prog: "
-        killproc $prog
-        RETVAL=$?
-        echo
-        [ $RETVAL -eq 0 ] && rm -f $LOCKFILE
-        return $RETVAL
-}
-status() {
-        if [ -f "$LOCKFILE" ]; then
-            echo "$prog is running"
+stop()
+{
+    echo -n $"Stopping ${NAME} service: "
+    if [ -e "${REPMGRD_LOCK}" ]
+    then
+        killproc ${NAME}
+        ret=$? 
+        if [ $ret -eq 0 ]
+        then
+            echo_success
+            rm -f "${REPMGRD_PIDFILE}"
+            rm -f "${REPMGRD_LOCK}"
        else
-	    RETVAL=3
-            echo "$prog is stopped"
+            echo_failure
+            script_result=1
        fi
-        return $RETVAL
+    else
+        # not running; per LSB standards this is "ok"   
+        echo_success
+    fi
+    echo
 }

+
 # See how we were called.
 case "$1" in
  start)
@@ -93,22 +118,16 @@ case "$1" in
        stop
        ;;
  status)
-        status $prog
+        status -p $REPMGRD_PIDFILE $NAME
+        script_result=$?
        ;;
-  restart|force-reload)
+  restart)
        stop
-        start
-        ;;
-  try-restart|condrestart)
-        if status $prog > /dev/null; then
-            stop
-            start
-        fi
-        ;;
-  reload)
-        exit 3
+	start
        ;;
  *)
-        echo $"Usage: $0 {start|stop|status|restart|try-restart|force-reload}"
+        echo $"Usage: $0 {start|stop|status|restart}"
        exit 2
 esac
+
+exit $script_result
--- a/RHEL/repmgrd.sysconfig
+++ b/RHEL/repmgrd.sysconfig
@@ -1,4 +1,21 @@
-#default sysconfig file for repmrgd
-#custom overrides can be placed here
+# default settings for repmgrd. This file is source by /bin/sh from
+# /etc/init.d/repmgrd

-REPMGRD_OPTS="-f /etc/repmgr/repmgr.conf"
+# disable repmgrd by default so it won't get started upon installation
+# valid values: yes/no
+REPMGRD_ENABLED=no
+
+# Options for repmgrd (required)
+#REPMGRD_OPTS="--verbose -d -f /var/lib/pgsql/repmgr/repmgr.conf"
+
+# User to run repmgrd as
+#REPMGRD_USER=postgres
+
+# repmgrd binary
+#REPMGRD_BIN=/usr/bin/repmgrd
+
+# pid file
+#REPMGRD_PIDFILE=/var/lib/pgsql/repmgr/repmgrd.pid
+
+# log file
+#REPMGRD_LOG=/var/lib/pgsql/repmgr/repmgrd.log
--- a/SSH-RSYNC.md
+++ b/SSH-RSYNC.md
@@ -1,35 +1,36 @@
 Set up trusted copy between postgres accounts
 ---------------------------------------------

-If you need to use rsync to clone standby servers, the postgres account
-on your master and standby servers must be each able to access the other
+If you need to use `rsync` to clone standby servers, the `postgres` account
+on your primary and standby servers must be each able to access the other
 using SSH without a password.

-First generate a ssh key, using an empty passphrase, and copy the resulting
-keys and a maching authorization file to a privledged user on the other system::
+First generate an ssh key, using an empty passphrase, and copy the resulting
+keys and a matching authorization file to a privileged user account on the other
+system:

-  [postgres@node1]$ ssh-keygen -t rsa
-  Generating public/private rsa key pair.
-  Enter file in which to save the key (/var/lib/pgsql/.ssh/id_rsa):
-  Enter passphrase (empty for no passphrase):
-  Enter same passphrase again:
-  Your identification has been saved in /var/lib/pgsql/.ssh/id_rsa.
-  Your public key has been saved in /var/lib/pgsql/.ssh/id_rsa.pub.
-  The key fingerprint is:
-  aa:bb:cc:dd:ee:ff:aa:11:22:33:44:55:66:77:88:99 postgres@db1.domain.com
-  [postgres@node1]$ cat ~/.ssh/id_rsa.pub >> ~/.ssh/authorized_keys
-  [postgres@node1]$ chmod go-rwx ~/.ssh/*
-  [postgres@node1]$ cd ~/.ssh
-  [postgres@node1]$ scp id_rsa.pub id_rsa authorized_keys user@node2:
+    [postgres@node1]$ ssh-keygen -t rsa
+    Generating public/private rsa key pair.
+    Enter file in which to save the key (/var/lib/pgsql/.ssh/id_rsa):
+    Enter passphrase (empty for no passphrase):
+    Enter same passphrase again:
+    Your identification has been saved in /var/lib/pgsql/.ssh/id_rsa.
+    Your public key has been saved in /var/lib/pgsql/.ssh/id_rsa.pub.
+    The key fingerprint is:
+    aa:bb:cc:dd:ee:ff:aa:11:22:33:44:55:66:77:88:99 postgres@db1.domain.com
+    [postgres@node1]$ cat ~/.ssh/id_rsa.pub >> ~/.ssh/authorized_keys
+    [postgres@node1]$ chmod go-rwx ~/.ssh/*
+    [postgres@node1]$ cd ~/.ssh
+    [postgres@node1]$ scp id_rsa.pub id_rsa authorized_keys user@node2:

-Login as a user on the other system, and install the files into the postgres
-user's account::
+Login as a user on the other system, and install the files into the `postgres`
+user's account:

-  [user@node2 ~]$ sudo chown postgres.postgres authorized_keys id_rsa.pub id_rsa
-  [user@node2 ~]$ sudo mkdir -p ~postgres/.ssh
-  [user@node2 ~]$ sudo chown postgres.postgres ~postgres/.ssh
-  [user@node2 ~]$ sudo mv authorized_keys id_rsa.pub id_rsa ~postgres/.ssh
-  [user@node2 ~]$ sudo chmod -R go-rwx ~postgres/.ssh
+    [user@node2 ~]$ sudo chown postgres.postgres authorized_keys id_rsa.pub id_rsa
+    [user@node2 ~]$ sudo mkdir -p ~postgres/.ssh
+    [user@node2 ~]$ sudo chown postgres.postgres ~postgres/.ssh
+    [user@node2 ~]$ sudo mv authorized_keys id_rsa.pub id_rsa ~postgres/.ssh
+    [user@node2 ~]$ sudo chmod -R go-rwx ~postgres/.ssh

 Now test that ssh in both directions works.  You may have to accept some new
 known hosts in the process.
--- a/27
+++ b/27
@@ -5,9 +5,15 @@ Known issues in repmgr
  the database server using the ``pg_ctl`` command may accidentally
  terminate after their associated ssh session ends.

+* PGPASSFILE may not be passed to pg_basebackup
+
 Planned feature improvements
 ============================

+* Use 'primary' instead of 'master' in documentation and log output
+  for consistency with PostgreSQL documentation. See also commit
+  870b0a53b627eeb9aca1fc14cbafe25b5beafe12.
+
 * A better check which standby did receive most of the data

 * Make the fact that a standby may be delayed a factor in the voting
@@ -18,8 +24,21 @@ Planned feature improvements
 * Create the repmgr user/database on "master register".

 * Use pg_basebackup for the data directory, and ALSO rsync for the
-configuration files.
+  configuration files.

-* Use pg_basebackup -X s
-  NOTE: this can be used by including `-X s` in the configuration parameter
-  `pg_basebackup_options`
+* If no configuration file supplied, search in sensible default locations
+  (currently: current directory and `pg_config --sysconfdir`); if
+  possible this should include the location provided by the package,
+  if installed.
+
+* repmgrd: if connection to the upstream node fails on startup, optionally
+  retry for a certain period before giving up; this will cover cases when
+  e.g. primary and standby are both starting up, and the standby comes up
+  before the primary. See github issue #80.
+
+* make old master node ID available for event notification commands
+  (See github issue #80).
+
+* Have pg_basebackup use replication slots, if and when support for
+  this is added; see:
+    http://www.postgresql.org/message-id/555DD2B2.7020000@gmx.net
--- a/check_dir.c
+++ b/check_dir.c
@@ -23,14 +23,19 @@
 #include <errno.h>
 #include <stdio.h>
 #include <string.h>
+#include <ftw.h>

 /* NB: postgres_fe must be included BEFORE check_dir */
-#include "postgres_fe.h"
-#include "check_dir.h"
+#include <libpq-fe.h>
+#include <postgres_fe.h>

+#include "check_dir.h"
 #include "strutil.h"
 #include "log.h"

+static bool _create_pg_dir(char *dir, bool force, bool for_witness);
+static int unlink_dir_callback(const char *fpath, const struct stat *sb, int typeflag, struct FTW *ftwbuf);
+
 /*
 * make sure the directory either doesn't exist or is empty
 * we use this function to check the new data directory and
@@ -243,6 +248,19 @@ is_pg_dir(char *dir)

 bool
 create_pg_dir(char *dir, bool force)
+{
+	return _create_pg_dir(dir, force, false);
+}
+
+bool
+create_witness_pg_dir(char *dir, bool force)
+{
+	return _create_pg_dir(dir, force, true);
+}
+
+
+static bool
+_create_pg_dir(char *dir, bool force, bool for_witness)
 {
 	bool		pg_dir = false;

@@ -279,12 +297,24 @@ create_pg_dir(char *dir, bool force)

 			pg_dir = is_pg_dir(dir);

-			/*
-			 * we use force to reduce the time needed to restore a node which
-			 * turn async after a failover or anything else
-			 */
+
 			if (pg_dir && force)
 			{
+
+				/*
+				 * The witness server does not store any data other than a copy of the
+				 * repmgr metadata, so in --force mode we can simply overwrite the
+				 * directory.
+				 *
+				 * For non-witness servers, we'll leave the data in place, both to reduce
+				 * the risk of unintentional data loss and to make it possible for the
+				 * data directory to be brought up-to-date with rsync.
+				 */
+				if (for_witness)
+				{
+					log_notice(_("deleting existing data directory \"%s\"\n"), dir);
+					nftw(dir, unlink_dir_callback, 64, FTW_DEPTH | FTW_PHYS);
+				}
 				/* Let it continue */
 				break;
 			}
@@ -306,3 +336,14 @@ create_pg_dir(char *dir, bool force)
 	}
 	return true;
 }
+
+static int
+unlink_dir_callback(const char *fpath, const struct stat *sb, int typeflag, struct FTW *ftwbuf)
+{
+    int rv = remove(fpath);
+
+    if (rv)
+        perror(fpath);
+
+    return rv;
+}
--- a/check_dir.h
+++ b/check_dir.h
@@ -26,5 +26,6 @@ bool		create_dir(char *dir);
 bool		set_dir_permissions(char *dir);
 bool		is_pg_dir(char *dir);
 bool		create_pg_dir(char *dir, bool force);
+bool		create_witness_pg_dir(char *dir, bool force);

 #endif
--- a/config.c
+++ b/config.c
@@ -27,9 +27,11 @@
 static void parse_event_notifications_list(t_configuration_options *options, const char *arg);
 static void tablespace_list_append(t_configuration_options *options, const char *arg);

+static char config_file_path[MAXPGPATH];
+static bool config_file_provided = false;

 /*
- * parse_config()
+ * load_config()
 *
 * Set default options and overwrite with values from provided configuration
 * file.
@@ -40,30 +42,21 @@ static void tablespace_list_append(t_configuration_options *options, const char
 * reload_config()
 */
 bool
-parse_config(const char *config_file, t_configuration_options *options)
+load_config(const char *config_file, t_configuration_options *options, char *argv0)
 {
-	char	   *s,
-				buff[MAXLINELENGTH];
-	char		config_file_buf[MAXLEN];
-	char		name[MAXLEN];
-	char		value[MAXLEN];
-	bool 		config_file_provided = false;
-	FILE	   *fp;
-
+	struct stat config;
 	/* Sanity checks */

 	/*
 	 * If a configuration file was provided, check it exists, otherwise
-	 * emit an error
+	 * emit an error and terminate
 	 */
 	if (config_file[0])
 	{
-		struct stat config;
+		strncpy(config_file_path, config_file, MAXPGPATH);
+		canonicalize_path(config_file_path);

-		strncpy(config_file_buf, config_file, MAXLEN);
-		canonicalize_path(config_file_buf);
-
-		if(stat(config_file_buf, &config) != 0)
+		if (stat(config_file_path, &config) != 0)
 		{
 			log_err(_("provided configuration file '%s' not found: %s\n"),
 					config_file,
@@ -76,16 +69,53 @@ parse_config(const char *config_file, t_configuration_options *options)
 	}

 	/*
-	 * If no configuration file was provided, set to a default file
-	 * which `parse_config()` will attempt to read if it exists
+	 * If no configuration file was provided, attempt to find a default file
 	 */
-	else
+	if (config_file_provided == false)
 	{
-		strncpy(config_file_buf, DEFAULT_CONFIG_FILE, MAXLEN);
+		char		my_exec_path[MAXPGPATH];
+		char		etc_path[MAXPGPATH];
+
+		/* First check if one is in the default sysconfdir */
+		if (find_my_exec(argv0, my_exec_path) < 0)
+		{
+			fprintf(stderr, _("%s: could not find own program executable\n"), argv0);
+			exit(EXIT_FAILURE);
+		}
+
+		get_etc_path(my_exec_path, etc_path);
+
+		snprintf(config_file_path, MAXPGPATH, "%s/repmgr.conf", etc_path);
+
+		log_debug(_("Looking for configuration file in %s\n"), etc_path);
+
+		if (stat(config_file_path, &config) != 0)
+		{
+			/* Not found - default to ./repmgr.conf */
+			strncpy(config_file_path, DEFAULT_CONFIG_FILE, MAXPGPATH);
+			canonicalize_path(config_file_path);
+			log_debug(_("Looking for configuration file in %s\n"), config_file_path);
+		}
 	}

+	return parse_config(options);
+}

-	fp = fopen(config_file_buf, "r");
+
+bool
+parse_config(t_configuration_options *options)
+{
+	FILE	   *fp;
+	char	   *s,
+				buff[MAXLINELENGTH];
+	char		name[MAXLEN];
+	char		value[MAXLEN];
+
+	/* For sanity-checking provided conninfo string */
+	PQconninfoOption *conninfo_options;
+	char       *conninfo_errmsg = NULL;
+
+	fp = fopen(config_file_path, "r");

 	/*
 	 * Since some commands don't require a config file at all, not having one
@@ -99,9 +129,9 @@ parse_config(const char *config_file, t_configuration_options *options)
 	 */
 	if (fp == NULL)
 	{
-		if(config_file_provided)
+		if (config_file_provided)
 		{
-			log_err(_("unable to open provided configuration file '%s'; terminating\n"), config_file_buf);
+			log_err(_("unable to open provided configuration file '%s'; terminating\n"), config_file_path);
 			exit(ERR_BAD_CONFIG);
 		}

@@ -149,13 +179,17 @@ parse_config(const char *config_file, t_configuration_options *options)
 	{
 		bool known_parameter = true;

-		/* Skip blank lines and comments */
-		if (buff[0] == '\n' || buff[0] == '#')
-			continue;
-
 		/* Parse name/value pair from line */
 		parse_line(buff, name, value);

+		/* Skip blank lines */
+		if (!strlen(name))
+			continue;
+
+		/* Skip comments */
+		if (name[0] == '#')
+			continue;
+
 		/* Copy into correct entry in parameters struct */
 		if (strcmp(name, "cluster") == 0)
 			strncpy(options->cluster_name, value, MAXLEN);
@@ -239,7 +273,7 @@ parse_config(const char *config_file, t_configuration_options *options)
 		 * we want to accept those, we'd need to add stricter default checking,
 		 * as currently e.g. an empty `node` value will be converted to '0'.
 		 */
-		if(known_parameter == true && !strlen(value)) {
+		if (known_parameter == true && !strlen(value)) {
 			log_err(_("no value provided for parameter '%s'\n"), name);
 			exit(ERR_BAD_CONFIG);
 		}
@@ -262,6 +296,12 @@ parse_config(const char *config_file, t_configuration_options *options)
 		exit(ERR_BAD_CONFIG);
 	}

+	if (options->node == 0)
+	{
+		log_err(_("'node' must be an integer greater than zero\n"));
+		exit(ERR_BAD_CONFIG);
+	}
+
 	if (*options->node_name == '\0')
 	{
 		log_err(_("required parameter 'node_name' was not found\n"));
@@ -274,6 +314,19 @@ parse_config(const char *config_file, t_configuration_options *options)
 		exit(ERR_BAD_CONFIG);
 	}

+	/* Sanity check the provided conninfo string
+	 *
+	 * NOTE: this verifies the string format and checks for valid options
+	 * but does not sanity check values
+	 */
+	conninfo_options = PQconninfoParse(options->conninfo, &conninfo_errmsg);
+	if (conninfo_options == NULL)
+	{
+		log_err(_("Parameter 'conninfo' is invalid: %s"), conninfo_errmsg);
+		exit(ERR_BAD_CONFIG);
+	}
+	PQconninfoFree(conninfo_options);
+
 	/* The following checks are for valid parameter values */
 	if (options->master_response_timeout <= 0)
 	{
@@ -305,7 +358,7 @@ trim(char *s)
 			   *s2 = &s[strlen(s) - 1];

 	/* If string is empty, no action needed */
-	if(s2 < s1)
+	if (s2 < s1)
 		return s;

 	/* Trim and delimit right side */
@@ -331,24 +384,50 @@ parse_line(char *buff, char *name, char *value)
 	int			j = 0;

 	/*
-	 * first we find the name of the parameter
+	 * Extract parameter name, if present
 	 */
 	for (; i < MAXLEN; ++i)
 	{
-		if (buff[i] != '=')
-			name[j++] = buff[i];
-		else
+
+		if (buff[i] == '=')
 			break;
+
+		switch(buff[i])
+		{
+			/* Ignore whitespace */
+			case ' ':
+			case '\n':
+			case '\r':
+			case '\t':
+				continue;
+			default:
+				name[j++] = buff[i];
+		}
 	}
 	name[j] = '\0';

 	/*
-	 * Now the value
+	 * Ignore any whitespace following the '=' sign
+	 */
+	for (; i < MAXLEN; ++i)
+	{
+		if (buff[i+1] == ' ')
+			continue;
+		if (buff[i+1] == '\t')
+			continue;
+
+		break;
+	}
+
+	/*
+	 * Extract parameter value
 	 */
 	j = 0;
 	for (++i; i < MAXLEN; ++i)
 		if (buff[i] == '\'')
 			continue;
+		else if (buff[i] == '#')
+			break;
 		else if (buff[i] != '\n')
 			value[j++] = buff[i];
 		else
@@ -358,7 +437,7 @@ parse_line(char *buff, char *name, char *value)
 }

 bool
-reload_config(char *config_file, t_configuration_options * orig_options)
+reload_config(t_configuration_options *orig_options)
 {
 	PGconn	   *conn;
 	t_configuration_options new_options;
@@ -369,7 +448,7 @@ reload_config(char *config_file, t_configuration_options * orig_options)
 	 */
 	log_info(_("reloading configuration file and updating repmgr tables\n"));

-	parse_config(config_file, &new_options);
+	parse_config(&new_options);
 	if (new_options.node == -1)
 	{
 		log_warning(_("unable to parse new configuration, retaining current configuration\n"));
@@ -418,7 +497,7 @@ reload_config(char *config_file, t_configuration_options * orig_options)
 		return false;
 	}

-	if(strcmp(orig_options->conninfo, new_options.conninfo) != 0)
+	if (strcmp(orig_options->conninfo, new_options.conninfo) != 0)
 	{
 		/* Test conninfo string */
 		conn = establish_db_connection(new_options.conninfo, false);
@@ -438,56 +517,56 @@ reload_config(char *config_file, t_configuration_options * orig_options)
 	 */

 	/* cluster_name */
-	if(strcmp(orig_options->cluster_name, new_options.cluster_name) != 0)
+	if (strcmp(orig_options->cluster_name, new_options.cluster_name) != 0)
 	{
 		strcpy(orig_options->cluster_name, new_options.cluster_name);
 		config_changed = true;
 	}

 	/* conninfo */
-	if(strcmp(orig_options->conninfo, new_options.conninfo) != 0)
+	if (strcmp(orig_options->conninfo, new_options.conninfo) != 0)
 	{
 		strcpy(orig_options->conninfo, new_options.conninfo);
 		config_changed = true;
 	}

 	/* node */
-	if(orig_options->node != new_options.node)
+	if (orig_options->node != new_options.node)
 	{
 		orig_options->node = new_options.node;
 		config_changed = true;
 	}

 	/* failover */
-	if(orig_options->failover != new_options.failover)
+	if (orig_options->failover != new_options.failover)
 	{
 		orig_options->failover = new_options.failover;
 		config_changed = true;
 	}

 	/* priority */
-	if(orig_options->priority != new_options.priority)
+	if (orig_options->priority != new_options.priority)
 	{
 		orig_options->priority = new_options.priority;
 		config_changed = true;
 	}

 	/* node_name */
-	if(strcmp(orig_options->node_name, new_options.node_name) != 0)
+	if (strcmp(orig_options->node_name, new_options.node_name) != 0)
 	{
 		strcpy(orig_options->node_name, new_options.node_name);
 		config_changed = true;
 	}

 	/* promote_command */
-	if(strcmp(orig_options->promote_command, new_options.promote_command) != 0)
+	if (strcmp(orig_options->promote_command, new_options.promote_command) != 0)
 	{
 		strcpy(orig_options->promote_command, new_options.promote_command);
 		config_changed = true;
 	}

 	/* follow_command */
-	if(strcmp(orig_options->follow_command, new_options.follow_command) != 0)
+	if (strcmp(orig_options->follow_command, new_options.follow_command) != 0)
 	{
 		strcpy(orig_options->follow_command, new_options.follow_command);
 		config_changed = true;
@@ -504,76 +583,76 @@ reload_config(char *config_file, t_configuration_options * orig_options)
 	 */

 	/* rsync_options */
-	if(strcmp(orig_options->rsync_options, new_options.rsync_options) != 0)
+	if (strcmp(orig_options->rsync_options, new_options.rsync_options) != 0)
 	{
 		strcpy(orig_options->rsync_options, new_options.rsync_options);
 		config_changed = true;
 	}

 	/* ssh_options */
-	if(strcmp(orig_options->ssh_options, new_options.ssh_options) != 0)
+	if (strcmp(orig_options->ssh_options, new_options.ssh_options) != 0)
 	{
 		strcpy(orig_options->ssh_options, new_options.ssh_options);
 		config_changed = true;
 	}

 	/* master_response_timeout */
-	if(orig_options->master_response_timeout != new_options.master_response_timeout)
+	if (orig_options->master_response_timeout != new_options.master_response_timeout)
 	{
 		orig_options->master_response_timeout = new_options.master_response_timeout;
 		config_changed = true;
 	}

 	/* reconnect_attempts */
-	if(orig_options->reconnect_attempts != new_options.reconnect_attempts)
+	if (orig_options->reconnect_attempts != new_options.reconnect_attempts)
 	{
 		orig_options->reconnect_attempts = new_options.reconnect_attempts;
 		config_changed = true;
 	}

 	/* reconnect_intvl */
-	if(orig_options->reconnect_intvl != new_options.reconnect_intvl)
+	if (orig_options->reconnect_intvl != new_options.reconnect_intvl)
 	{
 		orig_options->reconnect_intvl = new_options.reconnect_intvl;
 		config_changed = true;
 	}

 	/* pg_ctl_options */
-	if(strcmp(orig_options->pg_ctl_options, new_options.pg_ctl_options) != 0)
+	if (strcmp(orig_options->pg_ctl_options, new_options.pg_ctl_options) != 0)
 	{
 		strcpy(orig_options->pg_ctl_options, new_options.pg_ctl_options);
 		config_changed = true;
 	}

 	/* pg_basebackup_options */
-	if(strcmp(orig_options->pg_basebackup_options, new_options.pg_basebackup_options) != 0)
+	if (strcmp(orig_options->pg_basebackup_options, new_options.pg_basebackup_options) != 0)
 	{
 		strcpy(orig_options->pg_basebackup_options, new_options.pg_basebackup_options);
 		config_changed = true;
 	}

 	/* monitor_interval_secs */
-	if(orig_options->monitor_interval_secs != new_options.monitor_interval_secs)
+	if (orig_options->monitor_interval_secs != new_options.monitor_interval_secs)
 	{
 		orig_options->monitor_interval_secs = new_options.monitor_interval_secs;
 		config_changed = true;
 	}

 	/* retry_promote_interval_secs */
-	if(orig_options->retry_promote_interval_secs != new_options.retry_promote_interval_secs)
+	if (orig_options->retry_promote_interval_secs != new_options.retry_promote_interval_secs)
 	{
 		orig_options->retry_promote_interval_secs = new_options.retry_promote_interval_secs;
 		config_changed = true;
 	}

 	/* use_replication_slots */
-	if(orig_options->use_replication_slots != new_options.use_replication_slots)
+	if (orig_options->use_replication_slots != new_options.use_replication_slots)
 	{
 		orig_options->use_replication_slots = new_options.use_replication_slots;
 		config_changed = true;
 	}

-	if(config_changed == true)
+	if (config_changed == true)
 	{
 		log_debug(_("reload_config(): configuration has changed\n"));
 	}
@@ -602,7 +681,7 @@ tablespace_list_append(t_configuration_options *options, const char *arg)
 	const char *arg_ptr;

 	cell = (TablespaceListCell *) pg_malloc0(sizeof(TablespaceListCell));
-	if(cell == NULL)
+	if (cell == NULL)
 	{
 		log_err(_("unable to allocate memory; terminating\n"));
 		exit(ERR_BAD_CONFIG);
@@ -670,7 +749,7 @@ parse_event_notifications_list(t_configuration_options *options, const char *arg
 	for (arg_ptr = arg; arg_ptr <= (arg + strlen(arg)); arg_ptr++)
 	{
 		/* ignore whitespace */
-		if(*arg_ptr == ' ' || *arg_ptr == '\t')
+		if (*arg_ptr == ' ' || *arg_ptr == '\t')
 		{
 			continue;
 		}
@@ -679,13 +758,13 @@ parse_event_notifications_list(t_configuration_options *options, const char *arg
 		 * comma (or end-of-string) should mark the end of an event type -
 		 * just as long as there was something preceding it
 		 */
-		if((*arg_ptr == ',' || *arg_ptr == '\0') && event_type_buf[0] != '\0')
+		if ((*arg_ptr == ',' || *arg_ptr == '\0') && event_type_buf[0] != '\0')
 		{
 			EventNotificationListCell *cell;

 			cell = (EventNotificationListCell *) pg_malloc0(sizeof(EventNotificationListCell));

-			if(cell == NULL)
+			if (cell == NULL)
 			{
 				log_err(_("unable to allocate memory; terminating\n"));
 				exit(ERR_BAD_CONFIG);
@@ -708,7 +787,7 @@ parse_event_notifications_list(t_configuration_options *options, const char *arg
 			dst_ptr = event_type_buf;
 		}
 		/* ignore duplicated commas */
-		else if(*arg_ptr == ',')
+		else if (*arg_ptr == ',')
 		{
 			continue;
 		}
--- a/config.h
+++ b/config.h
@@ -83,9 +83,10 @@ typedef struct
 #define T_CONFIGURATION_OPTIONS_INITIALIZER { "", -1, NO_UPSTREAM_NODE, "", MANUAL_FAILOVER, -1, "", "", "", "", "", "", "", -1, -1, -1, "", "", "", "", 0, 0, 0, "", { NULL, NULL }, {NULL, NULL} }


-bool		parse_config(const char *config_file, t_configuration_options *options);
+bool		load_config(const char *config_file, t_configuration_options *options, char *argv0);
+bool		reload_config(t_configuration_options *orig_options);
+bool		parse_config(t_configuration_options *options);
 void		parse_line(char *buff, char *name, char *value);
 char	   *trim(char *s);
-bool		reload_config(char *config_file, t_configuration_options *orig_options);

 #endif
--- a/dbutils.c
+++ b/dbutils.c
@@ -82,6 +82,72 @@ establish_db_connection_by_params(const char *keywords[], const char *values[],
 }


+bool
+begin_transaction(PGconn *conn)
+{
+	PGresult   *res;
+
+	res = PQexec(conn, "BEGIN");
+
+	if (PQresultStatus(res) != PGRES_COMMAND_OK)
+	{
+		log_err(_("Unable to begin transaction: %s\n"),
+				PQerrorMessage(conn));
+
+		PQclear(res);
+		return false;
+	}
+
+	PQclear(res);
+
+	return true;
+}
+
+
+bool
+commit_transaction(PGconn *conn)
+{
+	PGresult   *res;
+
+	res = PQexec(conn, "COMMIT");
+
+	if (PQresultStatus(res) != PGRES_COMMAND_OK)
+	{
+		log_err(_("Unable to commit transaction: %s\n"),
+				PQerrorMessage(conn));
+		PQclear(res);
+
+		return false;
+	}
+
+	PQclear(res);
+
+	return true;
+}
+
+
+bool
+rollback_transaction(PGconn *conn)
+{
+	PGresult   *res;
+
+	res = PQexec(conn, "ROLLBACK");
+
+	if (PQresultStatus(res) != PGRES_COMMAND_OK)
+	{
+		log_err(_("Unable to rollback transaction: %s\n"),
+				PQerrorMessage(conn));
+		PQclear(res);
+
+		return false;
+	}
+
+	PQclear(res);
+
+	return true;
+}
+
+
 bool
 check_cluster_schema(PGconn *conn)
 {
@@ -197,7 +263,7 @@ is_pgup(PGconn *conn, int timeout)


 /*
- * Return the id of the active master node, or -1 if no
+ * Return the id of the active master node, or NODE_NOT_FOUND if no
 * record available.
 *
 * This reports the value stored in the database only and
@@ -224,12 +290,12 @@ get_master_node_id(PGconn *conn, char *cluster)
 	{
 		log_err(_("get_master_node_id(): query failed\n%s\n"),
 				PQerrorMessage(conn));
-		retval = -1;
+		retval = NODE_NOT_FOUND;
 	}
 	else if (PQntuples(res) == 0)
 	{
 		log_warning(_("get_master_node_id(): no active primary found\n"));
-		retval = -1;
+		retval = NODE_NOT_FOUND;
 	}
 	else
 	{
@@ -260,7 +326,7 @@ get_server_version(PGconn *conn, char *server_version)
 		return -1;
 	}

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

 	return atoi(PQgetvalue(res, 0, 0));
@@ -399,7 +465,7 @@ get_pg_setting(PGconn *conn, const char *setting, char *output)
 		}
 	}

-	if(success == true)
+	if (success == true)
 	{
 		log_debug(_("get_pg_setting(): returned value is '%s'\n"), output);
 	}
@@ -458,7 +524,7 @@ get_upstream_connection(PGconn *standby_conn, char *cluster, int node_id,
 		return NULL;
 	}

-	if(!PQntuples(res))
+	if (!PQntuples(res))
 	{
 		log_notice(_("no record found for upstream server"));
 		PQclear(res);
@@ -467,7 +533,7 @@ get_upstream_connection(PGconn *standby_conn, char *cluster, int node_id,

 	strncpy(upstream_conninfo, PQgetvalue(res, 0, 0), MAXCONNINFO);

-	if(upstream_node_id_ptr != NULL)
+	if (upstream_node_id_ptr != NULL)
 		*upstream_node_id_ptr = atoi(PQgetvalue(res, 0, 1));

 	PQclear(res);
@@ -509,9 +575,9 @@ get_master_connection(PGconn *standby_conn, char *cluster,
 	int			i,
 				node_id;

-	if(master_id != NULL)
+	if (master_id != NULL)
 	{
-		*master_id = -1;
+		*master_id = NODE_NOT_FOUND;
 	}

 	/* find all nodes belonging to this cluster */
@@ -570,7 +636,7 @@ get_master_connection(PGconn *standby_conn, char *cluster,
 			PQclear(res1);
 			log_debug(_("get_master_connection(): current master node is %i\n"), node_id);

-			if(master_id != NULL)
+			if (master_id != NULL)
 			{
 				*master_id = node_id;
 			}
@@ -709,7 +775,7 @@ get_repmgr_schema(void)
 char *
 get_repmgr_schema_quoted(PGconn *conn)
 {
-	if(strcmp(repmgr_schema_quoted, "") == 0)
+	if (strcmp(repmgr_schema_quoted, "") == 0)
 	{
 		char	   *identifier = PQescapeIdentifier(conn, repmgr_schema,
 													strlen(repmgr_schema));
@@ -728,6 +794,49 @@ create_replication_slot(PGconn *conn, char *slot_name)
 	char		sqlquery[QUERY_STR_LEN];
 	PGresult   *res;

+	/*
+	 * Check whether slot exists already; if it exists and is active, that
+	 * means another active standby is using it, which creates an error situation;
+	 * if not we can reuse it as-is
+	 */
+
+	sqlquery_snprintf(sqlquery,
+					  "SELECT active, slot_type "
+                      "  FROM pg_replication_slots "
+					  " WHERE slot_name = '%s' ",
+					  slot_name);
+
+	res = PQexec(conn, sqlquery);
+	if (!res || PQresultStatus(res) != PGRES_TUPLES_OK)
+	{
+		log_err(_("unable to query pg_replication_slots: %s\n"),
+				PQerrorMessage(conn));
+		PQclear(res);
+		return false;
+	}
+
+	if (PQntuples(res))
+	{
+		if (strcmp(PQgetvalue(res, 0, 1), "physical") != 0)
+		{
+			log_err(_("Slot '%s' exists and is not a physical slot\n"),
+					slot_name);
+			PQclear(res);
+		}
+		if (strcmp(PQgetvalue(res, 0, 0), "f") == 0)
+		{
+			PQclear(res);
+			log_debug(_("Replication slot '%s' exists but is inactive; reusing\n"),
+						slot_name);
+
+			return true;
+		}
+		PQclear(res);
+		log_err(_("Slot '%s' already exists as an active slot\n"),
+				slot_name);
+		return false;
+	}
+
 	sqlquery_snprintf(sqlquery,
 					  "SELECT * FROM pg_create_physical_replication_slot('%s')",
 					  slot_name);
@@ -930,13 +1039,13 @@ create_node_record(PGconn *conn, char *action, int node, char *type, int upstrea
 	char		slot_name_buf[MAXLEN];
 	PGresult   *res;

-	if(upstream_node == NO_UPSTREAM_NODE)
+	if (upstream_node == NO_UPSTREAM_NODE)
 	{
 		/*
 		 * No explicit upstream node id provided for standby - attempt to
 		 * get primary node id
 		 */
-		if(strcmp(type, "standby") == 0)
+		if (strcmp(type, "standby") == 0)
 		{
 			int primary_node_id = get_master_node_id(conn, cluster_name);
 			maxlen_snprintf(upstream_node_id, "%i", primary_node_id);
@@ -951,7 +1060,7 @@ create_node_record(PGconn *conn, char *action, int node, char *type, int upstrea
 		maxlen_snprintf(upstream_node_id, "%i", upstream_node);
 	}

-	if(slot_name != NULL && slot_name[0])
+	if (slot_name != NULL && slot_name[0])
 	{
 		maxlen_snprintf(slot_name_buf, "'%s'", slot_name);
 	}
@@ -975,7 +1084,7 @@ create_node_record(PGconn *conn, char *action, int node, char *type, int upstrea
 					  slot_name_buf,
 					  priority);

-	if(action != NULL)
+	if (action != NULL)
 	{
 		log_debug(_("%s: %s\n"), action, sqlquery);
 	}
@@ -1006,7 +1115,7 @@ delete_node_record(PGconn *conn, int node, char *action)
 					  " WHERE id = %d",
 					  get_repmgr_schema_quoted(conn),
 					  node);
-	if(action != NULL)
+	if (action != NULL)
 	{
 		log_debug(_("%s: %s\n"), action, sqlquery);
 	}
@@ -1037,8 +1146,8 @@ delete_node_record(PGconn *conn, int node, char *action)
 *
 * Note this function may be called with `conn` set to NULL in cases where
 * the master node is not available and it's therefore not possible to write
- * an event record. In this case, if `event_notification_command` is set a user-
- * defined notification to be generated; if not, this function will have
+ * an event record. In this case, if `event_notification_command` is set, a
+ * user-defined notification to be generated; if not, this function will have
 * no effect.
 */

@@ -1051,7 +1160,12 @@ create_event_record(PGconn *conn, t_configuration_options *options, int node_id,
 	bool		success = true;
 	struct tm	ts;

-	if(conn != NULL)
+	/* Only attempt to write a record if a connection handle was provided.
+	   Also check that the repmgr schema has been properly intialised - if
+	   not it means no configuration file was provided, which can happen with
+	   e.g. `repmgr standby clone`, and we won't know which schema to write to.
+	 */
+	if (conn != NULL && strcmp(repmgr_schema, DEFAULT_REPMGR_SCHEMA_PREFIX) != 0)
 	{
 		int n_node_id = htonl(node_id);
 		char *t_successful = successful ? "TRUE" : "FALSE";
@@ -1114,7 +1228,7 @@ create_event_record(PGconn *conn, t_configuration_options *options, int node_id,
 	 * current timestamp ourselves. This isn't quite the same
 	 * format as PostgreSQL, but is close enough for diagnostic use.
 	 */
-	if(!strlen(event_timestamp))
+	if (!strlen(event_timestamp))
 	{
 		time_t now;

@@ -1124,7 +1238,7 @@ create_event_record(PGconn *conn, t_configuration_options *options, int node_id,
 	}

 	/* an event notification command was provided - parse and execute it */
-	if(strlen(options->event_notification_command))
+	if (strlen(options->event_notification_command))
 	{
 		char		parsed_command[MAXPGPATH];
 		const char *src_ptr;
@@ -1140,14 +1254,14 @@ create_event_record(PGconn *conn, t_configuration_options *options, int node_id,
 		 * (If 'event_notifications' was not provided, we assume the script
 		 * should be executed for all events).
 		 */
-		if(options->event_notifications.head != NULL)
+		if (options->event_notifications.head != NULL)
 		{
 			EventNotificationListCell *cell;
 			bool notify_ok = false;

 			for (cell = options->event_notifications.head; cell; cell = cell->next)
 			{
-				if(strcmp(event, cell->event_type) == 0)
+				if (strcmp(event, cell->event_type) == 0)
 				{
 					notify_ok = true;
 					break;
@@ -1157,7 +1271,7 @@ create_event_record(PGconn *conn, t_configuration_options *options, int node_id,
 			/*
 			 * Event type not found in the 'event_notifications' list - return early
 			 */
-			if(notify_ok == false)
+			if (notify_ok == false)
 			{
 				log_debug(_("Not executing notification script for event type '%s'\n"), event);
 				return success;
@@ -1189,7 +1303,7 @@ create_event_record(PGconn *conn, t_configuration_options *options, int node_id,
 					case 'd':
 						/* %d: details */
 						src_ptr++;
-						if(details != NULL)
+						if (details != NULL)
 						{
 							strlcpy(dst_ptr, details, end_ptr - dst_ptr);
 							dst_ptr += strlen(dst_ptr);
@@ -1235,3 +1349,56 @@ create_event_record(PGconn *conn, t_configuration_options *options, int node_id,

 	return success;
 }
+
+bool
+update_node_record_set_upstream(PGconn *conn, char *cluster_name, int this_node_id, int new_upstream_node_id)
+{
+	PGresult   *res;
+	char		sqlquery[QUERY_STR_LEN];
+
+	log_debug(_("update_node_record_set_upstream(): Updating node %i's upstream node to %i\n"), this_node_id, new_upstream_node_id);
+
+	sqlquery_snprintf(sqlquery,
+					  "  UPDATE %s.repl_nodes "
+					  "     SET upstream_node_id = %i "
+					  "   WHERE cluster = '%s' "
+					  "     AND id = %i ",
+					  get_repmgr_schema_quoted(conn),
+					  new_upstream_node_id,
+					  cluster_name,
+					  this_node_id);
+	res = PQexec(conn, sqlquery);
+
+	if (PQresultStatus(res) != PGRES_COMMAND_OK)
+	{
+		log_err(_("Unable to set new upstream node id: %s\n"),
+				PQerrorMessage(conn));
+		PQclear(res);
+
+		return false;
+	}
+
+	PQclear(res);
+
+	return true;
+}
+
+
+PGresult *
+get_node_record(PGconn *conn, char *cluster, int node_id)
+{
+	char		sqlquery[QUERY_STR_LEN];
+
+	sprintf(sqlquery,
+			"SELECT id, upstream_node_id, conninfo, type, slot_name, active "
+			"  FROM %s.repl_nodes "
+			" WHERE cluster = '%s' "
+			"   AND id = %i",
+			get_repmgr_schema_quoted(conn),
+			cluster,
+			node_id);
+
+	log_debug("get_node_record(): %s\n", sqlquery);
+
+	return PQexec(conn, sqlquery);
+}
--- a/dbutils.h
+++ b/dbutils.h
@@ -30,6 +30,9 @@ PGconn *establish_db_connection(const char *conninfo,
 PGconn *establish_db_connection_by_params(const char *keywords[],
 								  const char *values[],
 								  const bool exit_on_error);
+bool		begin_transaction(PGconn *conn);
+bool		commit_transaction(PGconn *conn);
+bool		rollback_transaction(PGconn *conn);
 bool		check_cluster_schema(PGconn *conn);
 int			is_standby(PGconn *conn);
 bool		is_pgup(PGconn *conn, int timeout);
@@ -63,6 +66,7 @@ bool		copy_configuration(PGconn *masterconn, PGconn *witnessconn, char *cluster_
 bool		create_node_record(PGconn *conn, char *action, int node, char *type, int upstream_node, char *cluster_name, char *node_name, char *conninfo, int priority, char *slot_name);
 bool		delete_node_record(PGconn *conn, int node, char *action);
 bool        create_event_record(PGconn *conn, t_configuration_options *options, int node_id, char *event, bool successful, char *details);
-
+bool        update_node_record_set_upstream(PGconn *conn, char *cluster_name, int this_node_id, int new_upstream_node_id);
+PGresult *	get_node_record(PGconn *conn, char *cluster, int node_id);

 #endif
--- a/debian/repmgr.repmgrd.default
+++ b/debian/repmgr.repmgrd.default
@@ -12,7 +12,7 @@ REPMGRD_ENABLED=no
 #REPMGRD_USER=postgres

 # repmgrd binary
-#REPMGR_BIN=/usr/bin/repmgr
+#REPMGRD_BIN=/usr/bin/repmgrd

 # pid file
-#REPMGR_PIDFILE=/var/run/repmgrd.pid
+#REPMGRD_PIDFILE=/var/run/repmgrd.pid
--- a/errcode.h
+++ b/errcode.h
@@ -35,5 +35,6 @@
 #define ERR_BAD_SSH 12
 #define ERR_SYS_FAILURE 13
 #define ERR_BAD_BASEBACKUP 14
+#define ERR_INTERNAL 15

 #endif   /* _ERRCODE_H_ */
--- a/log.c
+++ b/log.c
@@ -144,12 +144,32 @@ logger_init(t_configuration_options * opts, const char *ident, const char *level
 	{
 		FILE	   *fd;

-		fd = freopen(opts->logfile, "a", stderr);
+		/* Check if we can write to the specified file before redirecting
+		 * stderr - if freopen() fails, stderr output will vanish into
+		 * the ether and the user won't know what's going on.
+		 */

+		fd = fopen(opts->logfile, "a");
 		if (fd == NULL)
 		{
-			fprintf(stderr, "error reopening stderr to '%s': %s",
-					opts->logfile, strerror(errno));
+			stderr_log_err(_("Unable to open specified logfile '%s' for writing: %s\n"), opts->logfile, strerror(errno));
+			stderr_log_err(_("Terminating\n"));
+			exit(ERR_BAD_CONFIG);
+		}
+		fclose(fd);
+
+		stderr_log_notice(_("Redirecting logging output to '%s'\n"), opts->logfile);
+		fd = freopen(opts->logfile, "a", stderr);
+
+		/* It's possible freopen() may still fail due to e.g. a race condition;
+		   as it's not feasible to restore stderr after a failed freopen(),
+		   we'll write to stdout as a last resort.
+		 */
+		if (fd == NULL)
+		{
+			printf(_("Unable to open specified logfile %s for writing: %s\n"), opts->logfile, strerror(errno));
+			printf(_("Terminating\n"));
+			exit(ERR_BAD_CONFIG);
 		}
 	}

--- a/repmgr.c
+++ b/repmgr.c
--- a/repmgr.conf.sample
+++ b/repmgr.conf.sample
@@ -7,8 +7,11 @@
 #
 # repmgr and repmgrd require these items to be configured:

-# Cluster name
-cluster=test
+# Cluster name - this will be used by repmgr to generate its internal
+# schema (pattern: "repmgr_{cluster}"); while this name will be quoted
+# to preserve case, we recommend using lower case and avoiding whitespace
+# to facilitate easier querying of the repmgr views and tables.
+cluster=example_cluster

 # Node ID and name
 # (Note: we recommend to avoid naming nodes after their initial
--- a/repmgr.h
+++ b/repmgr.h
@@ -20,11 +20,9 @@
 #ifndef _REPMGR_H_
 #define _REPMGR_H_

-#include "postgres_fe.h"
-#include "libpq-fe.h"
-
-
-#include "getopt_long.h"
+#include <libpq-fe.h>
+#include <postgres_fe.h>
+#include <getopt_long.h>

 #include "strutil.h"
 #include "dbutils.h"
@@ -49,6 +47,7 @@

 #define MANUAL_FAILOVER		0
 #define AUTOMATIC_FAILOVER	1
+#define NODE_NOT_FOUND      -1
 #define NO_UPSTREAM_NODE	-1


--- a/repmgrd.c
+++ b/repmgrd.c
@@ -88,12 +88,9 @@ static void check_node_configuration(void);

 static void standby_monitor(void);
 static void witness_monitor(void);
-static bool check_connection(PGconn *conn, const char *type);
+static bool check_connection(PGconn **conn, const char *type, const char *conninfo);
 static bool set_local_node_failed(void);

-static bool update_node_record_set_master(PGconn *conn, int this_node_id, int old_master_node_id);
-static bool update_node_record_set_upstream(PGconn *conn, int this_node_id, int new_upstream_node_id);
-
 static void update_shared_memory(char *last_wal_standby_applied);
 static void update_registration(void);
 static void do_master_failover(void);
@@ -148,6 +145,8 @@ main(int argc, char **argv)
 		{"monitoring-history", no_argument, NULL, 'm'},
 		{"daemonize", no_argument, NULL, 'd'},
 		{"pid-file", required_argument, NULL, 'p'},
+		{"help", no_argument, NULL, '?'},
+		{"version", no_argument, NULL, 'V'},
 		{NULL, 0, NULL, 0}
 	};

@@ -161,21 +160,7 @@ main(int argc, char **argv)
 	int			server_version_num = 0;
 	progname = get_progname(argv[0]);

-	if (argc > 1)
-	{
-		if (strcmp(argv[1], "--help") == 0 || strcmp(argv[1], "-?") == 0)
-		{
-			help(progname);
-			exit(SUCCESS);
-		}
-		if (strcmp(argv[1], "--version") == 0 || strcmp(argv[1], "-V") == 0)
-		{
-			printf("%s %s (PostgreSQL %s)\n", progname, REPMGR_VERSION, PG_VERSION);
-			exit(SUCCESS);
-		}
-	}
-
-	while ((c = getopt_long(argc, argv, "f:v:mdp:", long_options, &optindex)) != -1)
+	while ((c = getopt_long(argc, argv, "?Vf:v:mdp:", long_options, &optindex)) != -1)
 	{
 		switch (c)
 		{
@@ -194,6 +179,12 @@ main(int argc, char **argv)
 			case 'p':
 				pid_file = optarg;
 				break;
+			case '?':
+				help(progname);
+				exit(SUCCESS);
+			case 'V':
+				printf("%s %s (PostgreSQL %s)\n", progname, REPMGR_VERSION, PG_VERSION);
+				exit(SUCCESS);
 			default:
 				usage();
 				exit(ERR_BAD_CONFIG);
@@ -209,7 +200,7 @@ main(int argc, char **argv)
 	 * which case we'll need to refactor parse_config() not to abort,
 	 * and return the error message.
 	 */
-	parse_config(config_file, &local_options);
+	load_config(config_file, &local_options, argv[0]);

 	if (daemonize)
 	{
@@ -268,7 +259,7 @@ main(int argc, char **argv)

 	server_version_num = get_server_version(my_local_conn, NULL);

-	if(server_version_num < MIN_SUPPORTED_VERSION_NUM)
+	if (server_version_num < MIN_SUPPORTED_VERSION_NUM)
 	{
 		if (server_version_num > 0)
 		{
@@ -284,9 +275,17 @@ main(int argc, char **argv)
 		terminate(ERR_BAD_CONFIG);
 	}

-	/* Retrieve record for this node from the database */
+	/* Retrieve record for this node from the local database */
 	node_info = get_node_info(my_local_conn, local_options.cluster_name, local_options.node);

+	/* No node record found - exit gracefully */
+	if (node_info.node_id == NODE_NOT_FOUND)
+	{
+		log_err(_("No metadata record found for this node - terminating\n"));
+		log_notice(_("HINT: was this node registered with 'repmgr (master|standby) register'?\n"));
+		terminate(ERR_BAD_CONFIG);
+	}
+
 	log_debug("node id is %i, upstream is %i\n", node_info.node_id, node_info.upstream_node_id);

 	/*
@@ -312,7 +311,7 @@ main(int argc, char **argv)
 				check_cluster_configuration(my_local_conn);
 				check_node_configuration();

-				if (reload_config(config_file, &local_options))
+				if (reload_config(&local_options))
 				{
 					PQfinish(my_local_conn);
 					my_local_conn = establish_db_connection(local_options.conninfo, true);
@@ -321,7 +320,7 @@ main(int argc, char **argv)
 				}

 				/* Log startup event */
-				if(startup_event_logged == false)
+				if (startup_event_logged == false)
 				{
 					create_event_record(master_conn,
 										&local_options,
@@ -335,9 +334,9 @@ main(int argc, char **argv)
 				log_info(_("starting continuous master connection check\n"));

 				/*
-                                 * Check that master is still alive.
-                                 * XXX We should also check that the
-                                 * standby servers are sending info
+				 * Check that master is still alive.
+				 * XXX We should also check that the
+				 * standby servers are sending info
 				 */

 				/*
@@ -346,7 +345,7 @@ main(int argc, char **argv)
 				 */
 				do
 				{
-					if (check_connection(master_conn, "master"))
+					if (check_connection(&master_conn, "master", NULL))
 					{
 						sleep(local_options.monitor_interval_secs);
 					}
@@ -361,10 +360,10 @@ main(int argc, char **argv)
 					if (got_SIGHUP)
 					{
 						/*
-						 * if we can reload, then could need to change
+						 * if we can reload the configuration file, then could need to change
 						 * my_local_conn
 						 */
-						if (reload_config(config_file, &local_options))
+						if (reload_config(&local_options))
 						{
 							PQfinish(my_local_conn);
 							my_local_conn = establish_db_connection(local_options.conninfo, true);
@@ -425,14 +424,14 @@ main(int argc, char **argv)
 				check_cluster_configuration(my_local_conn);
 				check_node_configuration();

-				if (reload_config(config_file, &local_options))
+				if (reload_config(&local_options))
 				{
 					PQfinish(my_local_conn);
 					my_local_conn = establish_db_connection(local_options.conninfo, true);
 					update_registration();
 				}
 				/* Log startup event */
-				if(startup_event_logged == false)
+				if (startup_event_logged == false)
 				{
 					create_event_record(master_conn,
 										&local_options,
@@ -476,7 +475,7 @@ main(int argc, char **argv)
 						 * if we can reload, then could need to change
 						 * my_local_conn
 						 */
-						if (reload_config(config_file, &local_options))
+						if (reload_config(&local_options))
 						{
 							PQfinish(my_local_conn);
 							my_local_conn = establish_db_connection(local_options.conninfo, true);
@@ -484,7 +483,7 @@ main(int argc, char **argv)
 						}
 						got_SIGHUP = false;
 					}
-					if(failover_done)
+					if (failover_done)
 					{
 						log_debug(_("standby check loop will terminate\n"));
 					}
@@ -529,9 +528,9 @@ witness_monitor(void)
 	 * of a missing master and promotion of a standby by that standby's
 	 * repmgrd, so we'll loop for a while before giving up.
 	 */
-	connection_ok = check_connection(master_conn, "master");
+	connection_ok = check_connection(&master_conn, "master", NULL);

-	if(connection_ok == false)
+	if (connection_ok == false)
 	{
 		int			connection_retries;
 		log_debug(_("old master node ID: %i\n"), master_options.node);
@@ -582,7 +581,7 @@ witness_monitor(void)
 			}
 		}

-		if(connection_ok == false)
+		if (connection_ok == false)
 		{
 			PQExpBufferData errmsg;
 			initPQExpBuffer(&errmsg);
@@ -637,9 +636,9 @@ witness_monitor(void)
 	 */
 	sqlquery_snprintf(sqlquery,
 					  "INSERT INTO %s.repl_monitor "
-					  "           (master_node, standby_node, "
+					  "           (primary_node, standby_node, "
 					  "            last_monitor_time, last_apply_time, "
-					  "            last_wal_master_location, last_wal_standby_location, "
+					  "            last_wal_primary_location, last_wal_standby_location, "
 					  "            replication_lag, apply_lag )"
 					  "      VALUES(%d, %d, "
 					  "             '%s'::TIMESTAMP WITH TIME ZONE, NULL, "
@@ -686,6 +685,7 @@ standby_monitor(void)
 	bool		did_retry = false;

 	PGconn	   *upstream_conn;
+	char		upstream_conninfo[MAXCONNINFO];
 	int			upstream_node_id;
 	t_node_info upstream_node;

@@ -697,7 +697,7 @@ standby_monitor(void)
 	 * no point in doing much else anyway
 	 */

-	if (!check_connection(my_local_conn, "standby"))
+	if (!check_connection(&my_local_conn, "standby", NULL))
 	{
 		PQExpBufferData errmsg;

@@ -723,7 +723,7 @@ standby_monitor(void)
 	upstream_conn = get_upstream_connection(my_local_conn,
 											local_options.cluster_name,
 											local_options.node,
-											&upstream_node_id, NULL);
+											&upstream_node_id, upstream_conninfo);

 	type = upstream_node_id == master_options.node
 		? "master"
@@ -735,11 +735,11 @@ standby_monitor(void)
 	 * we cannot reconnect, try to get a new upstream node.
 	 */

-	check_connection(upstream_conn, type);	/* this takes up to
-											 * local_options.reconnect_attempts
-											 * local_options.reconnect_intvl seconds
-											 */
-
+	check_connection(&upstream_conn, type, upstream_conninfo);
+	/*
+	 * This takes up to local_options.reconnect_attempts *
+	 * local_options.reconnect_intvl seconds
+	 */

 	if (PQstatus(upstream_conn) != CONNECTION_OK)
 	{
@@ -809,7 +809,7 @@ standby_monitor(void)
 			 */
 			upstream_node = get_node_info(my_local_conn, local_options.cluster_name, node_info.upstream_node_id);

-            if(upstream_node.type == MASTER)
+            if (upstream_node.type == MASTER)
            {
                log_debug(_("failure detected on master node (%i); attempting to promote a standby\n"),
                          node_info.upstream_node_id);
@@ -820,7 +820,7 @@ standby_monitor(void)
                log_debug(_("failure detected on upstream node %i; attempting to reconnect to new upstream node\n"),
                          node_info.upstream_node_id);

-				if(!do_upstream_standby_failover(upstream_node))
+				if (!do_upstream_standby_failover(upstream_node))
 				{
 					PQExpBufferData errmsg;
 					initPQExpBuffer(&errmsg);
@@ -872,7 +872,7 @@ standby_monitor(void)
 				log_err(_("standby node has disappeared, trying to reconnect...\n"));
 				did_retry = true;

-				if (!check_connection(my_local_conn, "standby"))
+				if (!check_connection(&my_local_conn, "standby", NULL))
 				{
 					set_local_node_failed();
 					terminate(0);
@@ -917,7 +917,7 @@ standby_monitor(void)
 		return;
 	}

-	if(PQntuples(res) == 0)
+	if (PQntuples(res) == 0)
 	{
 		log_err(_("standby_monitor(): no active master found\n"));
 		PQclear(res);
@@ -927,18 +927,19 @@ standby_monitor(void)
 	active_master_id = atoi(PQgetvalue(res, 0, 0));
 	PQclear(res);

-	if(active_master_id != master_options.node)
+	if (active_master_id != master_options.node)
 	{
 		log_notice(_("connecting to active master (node %i)...\n"), active_master_id); \
-		if(master_conn != NULL)
+		if (master_conn != NULL)
 		{
 			PQfinish(master_conn);
 		}
 		master_conn = get_master_connection(my_local_conn,
 											 local_options.cluster_name,
 											 &master_options.node, NULL);
-
 	}
+	if (PQstatus(master_conn) != CONNECTION_OK)
+		PQreset(master_conn);

 	/*
 	 * Cancel any query that is still being executed, so i can insert the
@@ -993,9 +994,9 @@ standby_monitor(void)
 	 */
 	sqlquery_snprintf(sqlquery,
 					  "INSERT INTO %s.repl_monitor "
-					  "           (master_node, standby_node, "
+					  "           (primary_node, standby_node, "
 					  "            last_monitor_time, last_apply_time, "
-					  "            last_wal_master_location, last_wal_standby_location, "
+					  "            last_wal_primary_location, last_wal_standby_location, "
 					  "            replication_lag, apply_lag ) "
 					  "      VALUES(%d, %d, "
 					  "             '%s'::TIMESTAMP WITH TIME ZONE, '%s'::TIMESTAMP WITH TIME ZONE, "
@@ -1003,7 +1004,7 @@ standby_monitor(void)
 					  "             %llu, %llu) ",
 					  get_repmgr_schema_quoted(master_conn),
 					  master_options.node, local_options.node,
-					   monitor_standby_timestamp, last_wal_standby_applied_timestamp,
+					  monitor_standby_timestamp, last_wal_standby_applied_timestamp,
 					  last_wal_master_location, last_wal_standby_received,
 					  (long long unsigned int)(lsn_master - lsn_standby_received),
 					  (long long unsigned int)(lsn_standby_received - lsn_standby_applied));
@@ -1101,7 +1102,7 @@ do_master_failover(void)

 		/* Copy details of the failed node */
 		/* XXX only node_id is actually used later */
-		if(nodes[i].type == MASTER)
+		if (nodes[i].type == MASTER)
 		{
 			failed_master.node_id = nodes[i].node_id;
 			failed_master.xlog_location = nodes[i].xlog_location;
@@ -1145,8 +1146,8 @@ do_master_failover(void)
 			  total_nodes, visible_nodes);

 	/*
-	 * am i on the group that should keep alive? if i see less than half of
-	 * total_nodes then i should do nothing
+	 * Am I on the group that should keep alive? If I see less than half of
+	 * total_nodes then I should do nothing
 	 */
 	if (visible_nodes < (total_nodes / 2.0))
 	{
@@ -1207,7 +1208,7 @@ do_master_failover(void)

 		/* If position is 0/0, error */
 		/* XXX do we need to terminate ourselves if the queried node has a problem? */
-		if(xlog_recptr == InvalidXLogRecPtr)
+		if (xlog_recptr == InvalidXLogRecPtr)
 		{
 			log_err(_("InvalidXLogRecPtr detected on standby node %i\n"), nodes[i].node_id);
 			terminate(ERR_FAILOVER_FAIL);
@@ -1297,12 +1298,12 @@ do_master_failover(void)
 			 * empty string; otherwise position is 0/0 and we need to continue
 			 * looping until a valid LSN is reported
 			 */
-			if(xlog_recptr == InvalidXLogRecPtr)
+			if (xlog_recptr == InvalidXLogRecPtr)
 			{
-				if(lsn_format_ok == false)
+				if (lsn_format_ok == false)
 				{
 					/* Unable to parse value returned by `repmgr_get_last_standby_location()` */
-					if(*PQgetvalue(res, 0, 0) == '\0')
+					if (*PQgetvalue(res, 0, 0) == '\0')
 					{
 						log_crit(
 							_("unable to obtain LSN from node %i"), nodes[i].node_id
@@ -1434,25 +1435,6 @@ do_master_failover(void)
 		/* and reconnect to the local database */
 		my_local_conn = establish_db_connection(local_options.conninfo, true);

-		/* update node information to reflect new status */
-		if(update_node_record_set_master(my_local_conn, node_info.node_id, failed_master.node_id) == false)
-		{
-			appendPQExpBuffer(&event_details,
-							  _("unable to update node record for node %i (promoted to master following failure of node %i)"),
-							  node_info.node_id,
-							  failed_master.node_id);
-
-			log_err("%s\n", event_details.data);
-
-			create_event_record(NULL,
-								&local_options,
-								node_info.node_id,
-								"repmgrd_failover_promote",
-								false,
-								event_details.data);
-
-			terminate(ERR_DB_QUERY);
-		}

 		/* update internal record for this node */
 		node_info = get_node_info(my_local_conn, local_options.cluster_name, local_options.node);
@@ -1501,9 +1483,9 @@ do_master_failover(void)
 		 */
 		new_master_conn = establish_db_connection(best_candidate.conninfo_str, true);

-		if(local_options.use_replication_slots)
+		if (local_options.use_replication_slots)
 		{
-			if(create_replication_slot(new_master_conn, node_info.slot_name) == false)
+			if (create_replication_slot(new_master_conn, node_info.slot_name) == false)
 			{

 				appendPQExpBuffer(&event_details,
@@ -1536,7 +1518,7 @@ do_master_failover(void)
 		my_local_conn = establish_db_connection(local_options.conninfo, true);

 		/* update node information to reflect new status */
-		if(update_node_record_set_upstream(new_master_conn, node_info.node_id, best_candidate.node_id) == false)
+		if (update_node_record_set_upstream(new_master_conn, local_options.cluster_name, node_info.node_id, best_candidate.node_id) == false)
 		{
 			appendPQExpBuffer(&event_details,
 							  _("Unable to update node record for node %i (following new upstream node %i)"),
@@ -1604,7 +1586,7 @@ do_upstream_standby_failover(t_node_info upstream_node)
 	 * Verify that we can still talk to the cluster master even though
 	 * node upstream is not available
 	 */
-	if (!check_connection(master_conn, "master"))
+	if (!check_connection(&master_conn, "master", NULL))
 	{
 		log_err(_("do_upstream_standby_failover(): Unable to connect to last known master node\n"));
 		return false;
@@ -1628,7 +1610,7 @@ do_upstream_standby_failover(t_node_info upstream_node)
 			return false;
 		}

-		if(PQntuples(res) == 0)
+		if (PQntuples(res) == 0)
 		{
 			log_err(_("no node with id %i found"), upstream_node_id);
 			PQclear(res);
@@ -1636,7 +1618,7 @@ do_upstream_standby_failover(t_node_info upstream_node)
 		}

 		/* upstream node is inactive */
-		if(strcmp(PQgetvalue(res, 0, 1), "f") == 0)
+		if (strcmp(PQgetvalue(res, 0, 1), "f") == 0)
 		{
 			/*
 			 * Upstream node is an inactive master, meaning no there are no direct
@@ -1646,7 +1628,7 @@ do_upstream_standby_failover(t_node_info upstream_node)
 			 * provide an option to either try and find the current master and/or
 			 * a strategy to connect to a different upstream node
 			 */
-			if(strcmp(PQgetvalue(res, 0, 4), "master") == 0)
+			if (strcmp(PQgetvalue(res, 0, 4), "master") == 0)
 			{
 				log_err(_("unable to find active master node\n"));
 				PQclear(res);
@@ -1680,7 +1662,7 @@ do_upstream_standby_failover(t_node_info upstream_node)
 		terminate(ERR_BAD_CONFIG);
 	}

-	if(update_node_record_set_upstream(master_conn, node_info.node_id, upstream_node_id) == false)
+	if (update_node_record_set_upstream(master_conn, local_options.cluster_name, node_info.node_id, upstream_node_id) == false)
 	{
 		terminate(ERR_BAD_CONFIG);
 	}
@@ -1693,7 +1675,7 @@ do_upstream_standby_failover(t_node_info upstream_node)


 static bool
-check_connection(PGconn *conn, const char *type)
+check_connection(PGconn **conn, const char *type, const char *conninfo)
 {
 	int			connection_retries;

@@ -1704,7 +1686,16 @@ check_connection(PGconn *conn, const char *type)
 	 */
 	for (connection_retries = 0; connection_retries < local_options.reconnect_attempts; connection_retries++)
 	{
-		if (!is_pgup(conn, local_options.master_response_timeout))
+		if (*conn == NULL)
+		{
+			if (conninfo == NULL)
+			{
+				log_err("INTERNAL ERROR: *conn == NULL && conninfo == NULL");
+				terminate(ERR_INTERNAL);
+			}
+			*conn = establish_db_connection(conninfo, false);
+		}
+		if (!is_pgup(*conn, local_options.master_response_timeout))
 		{
 			log_warning(_("connection to %s has been lost, trying to recover... %i seconds before failover decision\n"),
 						type,
@@ -1722,9 +1713,9 @@ check_connection(PGconn *conn, const char *type)
 		}
 	}

-	if (!is_pgup(conn, local_options.master_response_timeout))
+	if (!is_pgup(*conn, local_options.master_response_timeout))
 	{
-		log_err(_("unable to reconnect to %s after %i seconds...\n"),
+		log_err(_("unable to reconnect to %s (timeout %i seconds)...\n"),
 				type,
 				local_options.master_response_timeout
 			);
@@ -1749,10 +1740,10 @@ set_local_node_failed(void)
 {
 	PGresult   *res;
 	char		sqlquery[QUERY_STR_LEN];
-	int			active_master_node_id = -1;
+	int			active_master_node_id = NODE_NOT_FOUND;
 	char		master_conninfo[MAXLEN];

-	if (!check_connection(master_conn, "master"))
+	if (!check_connection(&master_conn, "master", NULL))
 	{
 		log_err(_("set_local_node_failed(): Unable to connect to last known master node\n"));
 		return false;
@@ -1780,7 +1771,7 @@ set_local_node_failed(void)
 		return false;
 	}

-	if(!PQntuples(res))
+	if (!PQntuples(res))
 	{
 		log_err(_("no active master record found\n"));
 		return false;
@@ -1790,14 +1781,14 @@ set_local_node_failed(void)
 	strncpy(master_conninfo, PQgetvalue(res, 0, 1), MAXLEN);
 	PQclear(res);

-	if(active_master_node_id != master_options.node)
+	if (active_master_node_id != master_options.node)
 	{
 		log_notice(_("current active master is %i; attempting to connect\n"),
 			active_master_node_id);
 		PQfinish(master_conn);
 		master_conn = establish_db_connection(master_conninfo, false);

-		if(PQstatus(master_conn) != CONNECTION_OK)
+		if (PQstatus(master_conn) != CONNECTION_OK)
 		{
 			log_err(_("unable to connect to active master\n"));
 			return false;
@@ -1955,13 +1946,13 @@ lsn_to_xlogrecptr(char *lsn, bool *format_ok)

 	if (sscanf(lsn, "%X/%X", &xlogid, &xrecoff) != 2)
 	{
-		if(format_ok != NULL)
+		if (format_ok != NULL)
 			*format_ok = false;
 		log_err(_("incorrect log location format: %s\n"), lsn);
 		return 0;
 	}

-	if(format_ok != NULL)
+	if (format_ok != NULL)
 		*format_ok = true;

 	return (((XLogRecPtr) xlogid * 16 * 1024 * 1024 * 255) + xrecoff);
@@ -1978,17 +1969,21 @@ usage(void)
 void
 help(const char *progname)
 {
-	printf(_("Usage: %s [OPTIONS]\n"), progname);
-	printf(_("Replicator manager daemon for PostgreSQL.\n"));
-	printf(_("\nOptions:\n"));
-	printf(_("  --help                    show this help, then exit\n"));
-	printf(_("  --version                 output version information, then exit\n"));
+	printf(_("%s: replication management daemon for PostgreSQL\n"), progname);
+	printf(_("\n"));
+	printf(_("Usage:\n"));
+	printf(_("  %s [OPTIONS]\n"), progname);
+	printf(_("\n"));
+	printf(_("Options:\n"));
+	printf(_("  -?, --help                show this help, then exit\n"));
+	printf(_("  -V, --version             output version information, then exit\n"));
 	printf(_("  -v, --verbose             output verbose activity information\n"));
 	printf(_("  -m, --monitoring-history  track advance or lag of the replication in every standby in repl_monitor\n"));
 	printf(_("  -f, --config-file=PATH    path to the configuration file\n"));
 	printf(_("  -d, --daemonize           detach process from foreground\n"));
 	printf(_("  -p, --pid-file=PATH       write a PID file\n"));
-	printf(_("\n%s monitors a cluster of servers.\n"), progname);
+	printf(_("\n"));
+	printf(_("%s monitors a cluster of servers and optionally performs failover.\n"), progname);
 }


@@ -2089,7 +2084,7 @@ update_registration(void)

 		log_err("%s\n", errmsg.data);

-		create_event_record(my_local_conn,
+		create_event_record(master_conn,
 							&local_options,
 							local_options.node,
 							"repmgrd_shutdown",
@@ -2231,23 +2226,12 @@ check_and_create_pid_file(const char *pid_file)
 t_node_info
 get_node_info(PGconn *conn, char *cluster, int node_id)
 {
-	char		sqlquery[QUERY_STR_LEN];
 	PGresult   *res;

-	t_node_info node_info = {-1, NO_UPSTREAM_NODE, "", InvalidXLogRecPtr, UNKNOWN, false, false};
+	t_node_info node_info = { NODE_NOT_FOUND, NO_UPSTREAM_NODE, "", InvalidXLogRecPtr, UNKNOWN, false, false};

-	sprintf(sqlquery,
-			"SELECT id, upstream_node_id, conninfo, type, slot_name, active "
-			"  FROM %s.repl_nodes "
-			" WHERE cluster = '%s' "
-			"   AND id = %i",
-			get_repmgr_schema_quoted(conn),
-			local_options.cluster_name,
-			node_id);
+	res = get_node_record(conn, cluster, node_id);

-	log_debug("get_node_info(): %s\n", sqlquery);
-
-	res = PQexec(my_local_conn, sqlquery);
 	if (PQresultStatus(res) != PGRES_TUPLES_OK)
 	{
 		PQExpBufferData errmsg;
@@ -2260,7 +2244,7 @@ get_node_info(PGconn *conn, char *cluster, int node_id)

 		log_err("%s\n", errmsg.data);

-		create_event_record(my_local_conn,
+		create_event_record(NULL,
 							&local_options,
 							local_options.node,
 							"repmgrd_shutdown",
@@ -2274,7 +2258,7 @@ get_node_info(PGconn *conn, char *cluster, int node_id)
 	if (!PQntuples(res)) {
 		log_warning(_("No record found record for node %i\n"), node_id);
 		PQclear(res);
-		node_info.node_id = -1;
+		node_info.node_id = NODE_NOT_FOUND;
 		return node_info;
 	}

@@ -2296,139 +2280,18 @@ get_node_info(PGconn *conn, char *cluster, int node_id)
 static t_server_type
 parse_node_type(const char *type)
 {
-	if(strcmp(type, "master") == 0)
+	if (strcmp(type, "master") == 0)
 	{
 		return MASTER;
 	}
-	else if(strcmp(type, "standby") == 0)
+	else if (strcmp(type, "standby") == 0)
 	{
 		return STANDBY;
 	}
-	else if(strcmp(type, "witness") == 0)
+	else if (strcmp(type, "witness") == 0)
 	{
 		return WITNESS;
 	}

 	return UNKNOWN;
 }
-
-
-static bool
-update_node_record_set_master(PGconn *conn, int this_node_id, int old_master_node_id)
-{
-	PGresult   *res;
-	char		sqlquery[QUERY_STR_LEN];
-
-	log_debug(_("Setting failed node %i inactive; marking node %i as master\n"), old_master_node_id, this_node_id);
-
-	res = PQexec(conn, "BEGIN");
-
-	if (PQresultStatus(res) != PGRES_COMMAND_OK)
-	{
-		log_err(_("Unable to begin transaction: %s\n"),
-				PQerrorMessage(conn));
-
-		PQclear(res);
-		return false;
-	}
-
-	PQclear(res);
-
-	sqlquery_snprintf(sqlquery,
-					  "  UPDATE %s.repl_nodes "
-					  "     SET active = FALSE "
-					  "   WHERE cluster = '%s' "
-					  "     AND id = %i ",
-					  get_repmgr_schema_quoted(conn),
-					  local_options.cluster_name,
-					  old_master_node_id);
-
-	res = PQexec(conn, sqlquery);
-
-	if (PQresultStatus(res) != PGRES_COMMAND_OK)
-	{
-		log_err(_("Unable to set old master node %i as inactive: %s\n"),
-				old_master_node_id,
-				PQerrorMessage(conn));
-		PQclear(res);
-
-		PQexec(conn, "ROLLBACK");
-		return false;
-	}
-
-	PQclear(res);
-
-	sqlquery_snprintf(sqlquery,
-					  "  UPDATE %s.repl_nodes "
-					  "     SET type = 'master', "
-					  "         upstream_node_id = NULL "
-					  "   WHERE cluster = '%s' "
-					  "     AND id = %i ",
-					  get_repmgr_schema_quoted(conn),
-					  local_options.cluster_name,
-					  this_node_id);
-
-	res = PQexec(conn, sqlquery);
-
-	if (PQresultStatus(res) != PGRES_COMMAND_OK)
-	{
-		log_err(_("Unable to set current node %i as active master: %s\n"),
-				this_node_id,
-				PQerrorMessage(conn));
-		PQclear(res);
-
-		PQexec(conn, "ROLLBACK");
-		return false;
-	}
-
-	PQclear(res);
-
-	res = PQexec(conn, "COMMIT");
-
-	if (PQresultStatus(res) != PGRES_COMMAND_OK)
-	{
-		log_err(_("Unable to set commit transaction: %s\n"),
-				PQerrorMessage(conn));
-		PQclear(res);
-
-		return false;
-	}
-
-	PQclear(res);
-
-	return true;
-}
-
-
-static bool
-update_node_record_set_upstream(PGconn *conn, int this_node_id, int new_upstream_node_id)
-{
-	PGresult   *res;
-	char		sqlquery[QUERY_STR_LEN];
-
-	log_debug(_("update_node_record_set_upstream(): Updating node %i's upstream node to %i\n"), this_node_id, new_upstream_node_id);
-
-	sqlquery_snprintf(sqlquery,
-					  "  UPDATE %s.repl_nodes "
-					  "     SET upstream_node_id = %i "
-					  "   WHERE cluster = '%s' "
-					  "     AND id = %i ",
-					  get_repmgr_schema_quoted(conn),
-					  new_upstream_node_id,
-					  local_options.cluster_name,
-					  this_node_id);
-	res = PQexec(conn, sqlquery);
-
-	if (PQresultStatus(res) != PGRES_COMMAND_OK)
-	{
-		log_err(_("Unable to set new upstream node id: %s\n"),
-				PQerrorMessage(conn));
-		PQclear(res);
-
-		return false;
-	}
-
-	PQclear(res);
-
-	return true;
-}
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
 #ifndef _VERSION_H_
 #define _VERSION_H_

-#define REPMGR_VERSION "3.0dev"
+#define REPMGR_VERSION "3.0.2"

 #endif
Author	SHA1	Message	Date
Ian Barwick	2615cffecc	v3.0.2 Not yet tagged, pending a couple of tests	2015-10-02 11:46:13 +09:00
Ian Barwick	1f838f99c2	Update TODO	2015-10-02 11:46:13 +09:00
Ian Barwick	d3f119005b	Update version string to 3.0.1	2015-10-02 11:45:57 +09:00
Ian Barwick	db6d4d8820	Update version string	2015-10-02 11:45:57 +09:00
Ian Barwick	7a8a50e229	Add CONTRIBUTING.md	2015-10-02 10:18:06 +09:00
Ian Barwick	e188044593	Clean up markup	2015-10-02 10:07:36 +09:00
Ian Barwick	636f4b03c6	Spelling and markup fixes	2015-10-02 09:55:34 +09:00
Ian Barwick	bf96b383a3	Merge branch 'eternaltyro-master'	2015-10-02 09:49:55 +09:00
Ian Barwick	3a2e40f381	Merge branch 'master' of https://github.com/eternaltyro/repmgr into eternaltyro-master	2015-10-02 09:49:39 +09:00
Minh Danh	c608bb28ee	Fix some typos	2015-10-02 08:03:55 +09:00
Ian Barwick	ca9c2e1143	Fix -D/--data-dir's long option This was erroneously rendered as --dest-dir. This bugfeature seems to have been around for a long time; however as the only way anyone could know of the existence of --dest-dir is by reading the source code, we can safely remove it. Pointed out by Github user Jehan-Guillaume (ioguix) de Rorthais.	2015-10-02 07:50:19 +09:00
Ian Barwick	3a6d6b8899	Fix typo in README.md Reported by Github user knopwob.	2015-10-02 07:17:39 +09:00
Ian Barwick	4091cb7f18	Update TODO	2015-10-01 16:09:37 +09:00
Ian Barwick	870b0a53b6	Allow 'primary' as synonym for 'master'. "Primary" is the term preferred in the PostgreSQL documentation, so we should at least support it. Practically this means it's possible to write "rempgr primary register" in place of "repmgr master register". The next feature-release should replace "master" with "primary" in the documentation and log messages. Per gripe in Github #112.	2015-10-01 16:01:12 +09:00
Ian Barwick	6184cc57be	Bump version in HEAD	2015-10-01 13:37:23 +09:00
Ian Barwick	e1254b6773	Update HISTORY	2015-10-01 13:24:02 +09:00
Ian Barwick	1c9121c2d8	Witness server - extract explicit port setting from conninfo setting This makes the '-l/--local-port' option redundant, which is now marked as deprecated.	2015-10-01 09:42:44 +09:00
Ian Barwick	6da03a6157	Free connection options array after use.	2015-10-01 09:16:36 +09:00
Ian Barwick	9bb6befa25	Sanity check 'conninfo' parameter Catch errors early, it makes everyone's life easier.	2015-10-01 09:06:27 +09:00
Ian Barwick	a8e5c68d03	Better document '-l/--local-port' option. Per Github #59.	2015-10-01 08:40:27 +09:00
Ian Barwick	b83e18c503	Fix '-l, --local-port' help output. Is for witness server only. Use constants for default port definitions while we're at it. Github #123.	2015-10-01 08:24:14 +09:00
Ian Barwick	d4b845d213	'repmgr witness create --force': overwrite any existing node record Consistent with 'repmgr standby register --force'. Fixes Github #122.	2015-10-01 08:02:06 +09:00
Ian Barwick	75aad9a85e	repmgr witness create --force: overwrite existing data directory Per Github #82 (dimitri).	2015-09-30 17:05:54 +09:00
Ian Barwick	e115825cd6	Fix comment capitalization	2015-09-30 14:58:43 +09:00
Ian Barwick	6cf5ab2e53	Update HISTORY	2015-09-30 12:48:10 +09:00
Ian Barwick	f8119d20ea	Handle tablespace mapping in 9.5 and later in --rsync-only mode 9.5 introduces the tablespace_map file, which is created on the upstream node while a backup is running. We need to overwrite this with the provided values. Note that we only write explicitly-provided values to the tablespace_map file, however the existing symlinks for non-specified tablespaces will have been copied anyway. Fixes Github #119.	2015-09-30 11:48:09 +09:00
Ian Barwick	0caddf2d2c	Fix check when tablespace mapping option used with 9.3 As pointed out by EvilElk (Github issue #91).	2015-09-29 14:30:37 +09:00
Ian Barwick	a4abbc6f0c	Minor formatting fixes	2015-09-29 14:18:48 +09:00
Ian Barwick	d7e489ea0a	Update `repmgr --help` output (per Github report #113 from renard)	2015-09-25 11:26:12 +09:00
Ian Barwick	2bcacff3b3	Update TODO	2015-09-25 11:19:21 +09:00
Ian Barwick	45eb0ea5d3	Miscelleanous comment fixes	2015-09-25 11:17:26 +09:00
Ian Barwick	c3bd02b83d	Standardize if-statement formatting "if(" -> "if ("	2015-09-24 17:45:08 +09:00
Ian Barwick	8e7d110a22	Check for existing master record before deleting it Otherwise repmgr implies it's deleting a record which isn't actually there.	2015-09-24 17:39:39 +09:00
Ian Barwick	43874d5576	Close database connection as soon as it is no longer required	2015-09-24 16:55:59 +09:00
Ian Barwick	87ff9d09ba	Ensure --force option works with "master register" This was failing previously if repmgr was able to connect to the master database	2015-09-24 16:55:59 +09:00
Ian Barwick	c429b0b186	Don't fail with error when registering master if schema already defined Registering a master creates the schema, but it may be desirable to forcibly reregister a master without deleting the schema, so uncouple the dependency. Also ensure schema creation is atomic by wrapping it in a transaction. Per GitHub issue #49.	2015-09-24 16:55:43 +09:00
Martín Marqués	03b88178c1	Minor change in an error log message	2015-09-23 10:44:07 -03:00
Martín Marqués	5f33f4286f	Merge pull request #115 from xocolatl/unregister Add a STANDBY UNREGISTER command.	2015-09-23 10:17:22 -03:00
Vik Fearing	932f84910b	Add a STANDBY UNREGISTER command. In some cases it is desirable to remove repmgr's handling of a standby, perhaps because that standby is to be removed altogether. With no UNREGISTER command, one had to manually delete the corresponding row from repl_nodes.	2015-09-23 12:37:42 +02:00
Ian Barwick	1ef7f1368d	Update TODO	2015-09-23 14:05:09 +09:00
Ian Barwick	640abed18f	Don't close connection to master until upstream node updated	2015-09-23 13:11:51 +09:00
Tomas Vondra	ef6b24551a	call update_node_record_set_upstream() for STANDBY FOLLOW repmgrd correctly updates ID of the upstream node after automatic failover, but repmgr was not doing that for manual failvers. This moves the existing function to dbutils and modifies it so that it does not rely on global variables with configuration (available just in repmgrd). This should fix issue #67 (hopefully, haven't done much testing).	2015-09-23 12:32:47 +09:00
Ian Barwick	42847e44d2	Update HISTORY file	2015-09-23 10:29:40 +09:00
Ian Barwick	dd7cfce3d3	Add TODO note about default configuration file. Per suggestion in #108.	2015-09-22 19:26:19 +09:00
Ian Barwick	30fd111cba	Rework config file handling If no configuration file provided, also check default Postgres sysconfig dir. It would also be useful to check the configuration directory provided by the RPM/DEB packages, not sure if that's programmatically feasible.	2015-09-21 15:55:29 +09:00
Ian Barwick	65e63b062e	Generally tidy up help output	2015-09-21 11:49:06 +09:00
Ian Barwick	053f672caa	Treat -?/--help and -V/--version as normal options Currently repmgr/repmgrd will only accept these as valid when provided as the first command line option, however it's possible a user will want to get the output of those options by adding them to the end of a previously inputted command. Note that after the first of these options is encountered, the program will terminate and not process any other options. This is consistent with psql's behaviour Per GitHub issue #107 from Sébastien Gross.	2015-09-21 09:53:51 +09:00
Ian Barwick	f6d02b85d8	Better handling of situation where logfile can't be opened If freopen() fails, stderr is diverted to an undisclosed location and it's not clear what is going on. Also add an explicit notice announcing our intention to divert logging output to a file. Per #105. Note that it might make sense to disable logfile output when running the repmgr command line client as normally you'd expect immediate feedback.	2015-09-15 13:37:40 +09:00
Ian Barwick	6ebf3a7319	Make example output host match input configuration	2015-09-14 14:32:34 +09:00
Ian Barwick	7345ddcf00	Whitespace tweak	2015-09-10 14:27:21 +09:00
Ian Barwick	eb0af7ca23	Always pass -D/--pgdata option to pg_basebackup repmgr does not require explicit provision of the target data directory when cloning a standby (it defaults to the same directory as on the master). However this is a required option for pg_basebackup which was only being provided if repmgr's -D/--data-dir option was set, so ensure we always provide whatever repmgr is using. Per report from Martín.	2015-08-25 14:36:51 +09:00
Ian Barwick	ae47e5f413	Fix example command syntax	2015-08-12 12:32:41 +09:00
Ian Barwick	46100a9549	"Supports 9.3 and 9.4" -> "Supports 9.3 and later" In case anyone thinks it might not run on 9.5.	2015-08-12 12:26:27 +09:00
Gianni Ciolli	9bd95cabdf	Merge pull request #98 from gciolli/master Bug #97 fix (standby clone --force does not empty pg_xlog).	2015-08-11 15:10:37 +02:00
Gianni Ciolli	f1584469bf	Bug #97 fix (standby clone --force does not empty pg_xlog).	2015-08-11 14:59:23 +02:00
Abhijit Menon-Sen	a7f46d24de	Merge pull request #96 from gciolli/master Bug #90 fix (autofailover with reconnect_attemps > 1).	2015-08-11 06:35:31 +05:30
Gianni Ciolli	462d446477	Bug #90 fix (autofailover with reconnect_attemps > 1). The main change is that now check_connection requires a conninfo parameter, and the connection object has type (PGconn *) so it can be replaced by check_connection if needed. The bug was caused by the fact that the first failure resulted in conn == NULL, so that subsequent checks of the upstream connection were failing irrespectively of the actual state of the upstream node. Now, when conn == NULL, check_connection will use conninfo to establish a new connection and place it into conn. We introduce a new INTERNAL_ERROR code for the case when they are both NULL. In passing, we also reworded a confusing error message, distinguishing a timeout from the actual elapsed time.	2015-08-10 20:58:43 +02:00
Ian Barwick	23a72f489c	Add note about configuring 'shared_preload_libraries' for repmgr Useful to put all the possible postgresql.conf changes in one place.	2015-08-07 14:37:57 +09:00
Christoph Monech-Tegeder	f3f56b0cd6	fix repmgrd spelling in default config files make sure the daemon has it's trailing _d_ everywhere	2015-08-06 17:20:56 +02:00
Abhijit Menon-Sen	00146b7fbd	Merge pull request #88 from soxwellfb/fix-config-reader Ignore comments after values	2015-08-04 13:28:04 +05:30
Simon Oxwell	faf72a2514	Ignore comments after values	2015-07-15 14:53:35 +10:00
Ian Barwick	7010b636e0	Reword error message for consistency Github issue #87	2015-07-10 10:11:23 +09:00
Gregory Duchatelet	00deff9069	[Fix] if 'node' config parameter is set as a string, nothing complain and all nodes are set to id '0'.	2015-07-06 11:20:31 +02:00
Ian Barwick	5240a5723a	Clarify WAL file retention issue during standby cloning. Per GitHub issue #86.	2015-07-02 09:32:30 +09:00
Martín Marqués	45e29c5b28	Typo in a comment	2015-06-04 18:12:35 +09:00
Ian Barwick	5def293ed6	Configuration file: ignore whitespace following the '=' sign	2015-06-04 11:58:34 +09:00
Ian Barwick	ff7b4d3f02	Improve whitespace handling Ignore blank lines which consist of whitespace. Per issue #71 in GitHub. This fix also improves comment handling and will treat lines with whitespace before the '#' character as whitespace.	2015-06-04 11:44:38 +09:00
Ian Barwick	a54478a045	Documentation tweaks	2015-05-12 10:16:52 +09:00
Marco Nenciarini	7ad9a2c28a	Allow repmgr to be compiled with a libpq newer than PostgreSQL Fixes #44	2015-04-29 18:00:54 +02:00
John Galt	3deb6784e7	Fixed typo	2015-04-16 13:30:40 +09:00
Ian Barwick	ba275bb0c2	Update HISTORY file	2015-04-16 11:02:40 +09:00
Ian Barwick	9735bb63a1	Add short option '-c' for '--fast-checkpoint' This is similar to pg_basebackup's '-c/--checkpoint=fast\|spread' option.	2015-04-16 08:15:44 +09:00
Ian Barwick	1e5792f8df	Remove unused function	2015-04-14 14:29:47 +09:00
Ian Barwick	a01fefa7d0	After standby promotion, ensure metadata is updated by repmgr Previously this was handled by repmgrd but if a standby is promoted directly this will leave the metadata in an incorrect state.	2015-04-14 13:39:48 +09:00
Ian Barwick	34eaf94b2b	Fix variable name spelling	2015-04-14 13:15:44 +09:00
Ian Barwick	68e3a9d7ab	Improve promotion failure handling Exit with error; don't attempt to write event log as master connection will not be valid at this point.	2015-04-14 13:09:02 +09:00
Ian Barwick	2ad4f68700	Add notes about cluster name and quoting Supported, but better to avoid.	2015-04-13 15:40:29 +09:00
Ian Barwick	00aa0c8c87	Fix typos	2015-04-13 15:22:09 +09:00
Ian Barwick	e8025c7c9f	Re-use replication slot if it already exists Per issue #65 in GitHub	2015-04-13 13:17:38 +09:00
Ian Barwick	6a17360b4c	Add FAQ item about `shared_preload_libraries = 'repmgr_funcs'`	2015-04-10 16:45:04 +09:00
Ian Barwick	9e5e843a4f	Prevent a test SSH connection being made when not needed When using the default pg_basebackup method to clone a standby together with the `--ignore-external-config-files` option, there's no need to test for a working SSH connection - which may not be desirable in many use-cases anyway. Per issue #64 in GitHub.	2015-04-10 15:05:19 +09:00
Martín Marqués	734ae1825e	Don't run ssh connection test when --ignore-external-config-files was used	2015-04-10 11:02:19 +09:00
Ian Barwick	41fe58764e	Add note about PGPASSFILE	2015-04-10 10:29:52 +09:00
Ian Barwick	58a5249b7e	HISTORY update	2015-04-09 16:12:11 +09:00
Ian Barwick	90c0bd4638	Add FAQ item about witness server port	2015-04-09 16:05:44 +09:00
Martín Marqués	359e81a6d6	Updated RHEL files.	2015-04-02 05:54:08 -03:00
Yogesh Girikumar	0037e66034	fix messy formatting	2015-03-31 22:58:50 +05:30
Ian Barwick	07d220cb00	Correct monitoring table column names It would be more consistent to change the "primary" to "master" but that would make the table incompatible with the v2.0 table.	2015-03-31 18:14:32 +09:00
Ian Barwick	4dfeffe087	Add constant NODE_NOT_FOUND Which is what the magic number means in those contexts.	2015-03-31 14:35:16 +09:00
Ian Barwick	18544c82ca	Prevent rempgrd from looping infinitely if node was not registered	2015-03-31 14:25:08 +09:00
Ian Barwick	0f86bdcd05	Fixes for event logging We can't always assume a valid connection to the master	2015-03-31 14:15:29 +09:00
Ian Barwick	7d33c1e411	Only attempt to log an event if the rempgr schema has been set In some circumstances (primarily when executing `repmgr standby clone`) the `repmgr.conf` file is not mandated. However this means the repmgr schema is not known, and any attempt to create an event record will result in a log warning, which may cause confusion as to the success of the operation. It might be better to mandate providing `repmgr.conf` in all circumstances. Per report in https://github.com/2ndQuadrant/repmgr/issues/53 .	2015-03-31 10:28:34 +09:00
Ian Barwick	fec65bde3d	Fix typo in -?/--help output	2015-03-27 18:09:41 +09:00
Ian Barwick	4863ea98bc	Bump specfile version number	2015-03-27 17:42:55 +09:00