v3.0.2

Not yet tagged, pending a couple of tests

CONTRIBUTING.md

@@ -2,7 +2,7 @@ License and Contributions
 =========================
 
 `repmgr` is licensed under the GPL v3.  All of its code and documentation is
-Copyright 2010-2016, 2ndQuadrant Limited.  See the files COPYRIGHT and LICENSE for
+Copyright 2010-2015, 2ndQuadrant Limited.  See the files COPYRIGHT and LICENSE for
 details.
 
 The development of repmgr has primarily been sponsored by 2ndQuadrant customers.

COPYRIGHT

@@ -1,4 +1,4 @@
-Copyright (c) 2010-2016, 2ndQuadrant Limited
+Copyright (c) 2010-2015, 2ndQuadrant Limited
 All rights reserved.
 
 This program is free software: you can redistribute it and/or modify

FAILOVER.rst

@@ -1 +1,237 @@
-The contents of this file have been incorporated into the main README.md document.
+====================================================
+ PostgreSQL Automatic Failover - User Documentation
+====================================================
+
+Automatic Failover
+==================
+
+repmgr allows for automatic failover when it detects the failure of the master node.
+Following is a quick setup for this.
+
+Installation
+============
+
+For convenience, we define:
+
+**node1**
+    is the fully qualified domain name of the Master server, IP 192.168.1.10
+**node2**
+    is the fully qualified domain name of the Standby server, IP 192.168.1.11
+**witness**
+    is the fully qualified domain name of the server used as a witness, IP 192.168.1.12
+
+**Note:** We don't recommend using names with the status of a server like «masterserver»,
+because it would be confusing once a failover takes place and the Master is
+now on the «standbyserver».
+
+Summary
+-------
+
+2 PostgreSQL servers are involved in the replication.  Automatic failover needs
+a vote to decide what server it should promote, so an odd number is required.
+A witness-repmgrd is installed in a third server where it uses a PostgreSQL
+cluster to communicate with other repmgrd daemons.
+
+1. Install PostgreSQL in all the servers involved (including the witness server)
+
+2. Install repmgr in all the servers involved (including the witness server)
+
+3. Configure the Master PostreSQL
+
+4. Clone the Master to the Standby using "repmgr standby clone" command
+
+5. Configure repmgr in all the servers involved (including the witness server)
+
+6. Register Master and Standby nodes
+
+7. Initiate witness server
+
+8. Start the repmgrd daemons in all nodes
+
+**Note** A complete High-Availability design needs at least 3 servers to still have
+a backup node after a first failure.
+
+Install PostgreSQL
+------------------
+
+You can install PostgreSQL using any of the recommended methods. You should ensure
+it's 9.0 or later.
+
+Install repmgr
+--------------
+
+Install repmgr following the steps in the README file.
+
+Configure PostreSQL
+-------------------
+
+Log in to node1.
+
+Edit the file postgresql.conf and modify the parameters::
+
+  listen_addresses='*'
+  wal_level = 'hot_standby'
+  archive_mode = on
+  archive_command = 'cd .'   # we can also use exit 0, anything that
+                             # just does nothing
+  max_wal_senders = 10
+  wal_keep_segments = 5000   # 80 GB required on pg_xlog
+  hot_standby = on
+  shared_preload_libraries = 'repmgr_funcs'
+
+Edit the file pg_hba.conf and add lines for the replication::
+
+  host     repmgr           repmgr      127.0.0.1/32            trust
+  host     repmgr           repmgr      192.168.1.10/30         trust
+  host     replication      all         192.168.1.10/30         trust
+
+**Note:** It is also possible to use a password authentication (md5), .pgpass file
+should be edited to allow connection between each node.
+
+Create the user and database to manage replication::
+
+  su - postgres
+  createuser -s repmgr
+  createdb -O repmgr repmgr
+  psql -f /usr/share/postgresql/9.0/contrib/repmgr_funcs.sql repmgr
+
+Restart the PostgreSQL server::
+
+  pg_ctl -D $PGDATA restart
+
+And check everything is fine in the server log.
+
+Create the ssh-key for the postgres user and copy it to other servers::
+
+  su - postgres
+  ssh-keygen             # /!\ do not use a passphrase /!\
+  cat ~/.ssh/id_rsa.pub > ~/.ssh/authorized_keys
+  chmod 600 ~/.ssh/authorized_keys
+  exit
+  rsync -avz ~postgres/.ssh/authorized_keys node2:~postgres/.ssh/
+  rsync -avz ~postgres/.ssh/authorized_keys witness:~postgres/.ssh/
+  rsync -avz ~postgres/.ssh/id_rsa* node2:~postgres/.ssh/
+  rsync -avz ~postgres/.ssh/id_rsa* witness:~postgres/.ssh/
+
+Clone Master
+------------
+
+Log in to node2.
+
+Clone node1 (the current Master)::
+
+  su - postgres
+  repmgr -d repmgr -U repmgr -h node1 standby clone 
+
+Start the PostgreSQL server::
+
+  pg_ctl -D $PGDATA start
+
+And check everything is fine in the server log.
+
+Configure repmgr
+----------------
+
+Log in to each server and configure repmgr by editing the file
+/etc/repmgr/repmgr.conf::
+
+  cluster=my_cluster
+  node=1
+  node_name=earth
+  conninfo='host=192.168.1.10 dbname=repmgr user=repmgr'
+  master_response_timeout=60
+  reconnect_attempts=6
+  reconnect_interval=10
+  failover=automatic
+  promote_command='promote_command.sh'
+  follow_command='repmgr standby follow -f /etc/repmgr/repmgr.conf'
+
+**cluster**
+    is the name of the current replication.
+**node**
+    is the number of the current node (1, 2 or 3 in the current example).
+**node_name**
+    is an identifier for every node.
+**conninfo**
+    is used to connect to the local PostgreSQL server (where the configuration file is) from any node. In the witness server configuration you need to add a 'port=5499' to the conninfo.
+**master_response_timeout**
+    is the maximum amount of time we are going to wait before deciding the master has died and start the failover procedure.
+**reconnect_attempts**
+    is the number of times we will try to reconnect to master after a failure has been detected and before start the failover procedure.
+**reconnect_interval**
+    is the amount of time between retries to reconnect to master after a failure has been detected and before start the failover procedure.
+**failover**
+    configure behavior: *manual* or *automatic*.
+**promote_command**
+    the command executed to do the failover (including the PostgreSQL failover itself). The command must return 0 on success.
+**follow_command**
+    the command executed to address the current standby to another Master. The command must return 0 on success.
+
+Register Master and Standby
+---------------------------
+
+Log in to node1.
+
+Register the node as Master::
+
+  su - postgres
+  repmgr -f /etc/repmgr/repmgr.conf master register
+
+Log in to node2. Register it as a standby::
+
+  su - postgres
+  repmgr -f /etc/repmgr/repmgr.conf standby register
+
+Initialize witness server
+-------------------------
+
+Log in to witness.
+
+Initialize the witness server::
+
+  su - postgres
+  repmgr -d repmgr -U repmgr -h 192.168.1.10 -D $WITNESS_PGDATA -f /etc/repmgr/repmgr.conf witness create
+
+The witness server needs the following information from the command
+line:
+
+* Connection details for the current master, to copy the cluster
+  configuration.
+* A location for initializing its own $PGDATA.
+
+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
+-------------------------
+
+Log in to node2 and witness::
+
+  su - postgres
+  repmgrd -f /etc/repmgr/repmgr.conf --daemonize -> /var/log/postgresql/repmgr.log 2>&1
+
+**Note:** The Master does not need a repmgrd daemon.
+
+Suspend Automatic behavior
+==========================
+
+Edit the repmgr.conf of the node to remove from automatic processing and change::
+
+  failover=manual
+
+Then, signal repmgrd daemon::
+
+  su - postgres
+  kill -HUP $(pidof repmgrd)
+
+Usage
+=====
+
+The repmgr documentation is in the README file (how to build, options, etc.)

FAQ.md

@@ -34,11 +34,6 @@ General
   replication slots, setting a higher figure will make adding new nodes
   easier.
 
-- Does `repmgr` support hash indexes?
-
-  No. Hash indexes and replication do not mix well and their use is
-  explicitly discouraged; see:
-    http://www.postgresql.org/docs/current/interactive/sql-createindex.html#AEN74175
 
 `repmgr`
 --------
@@ -101,9 +96,8 @@ General
   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 different port for the witness server, supply the port number
+  To specify a port for the witness server, supply the port number to
-  in the `conninfo` string in `repmgr.conf`
+  repmgr with the `-l/--local-port` command line option.
-  (repmgr 3.0.1 and earlier: use the `-l/--local-port` option)
 
 - Do I need to include `shared_preload_libraries = 'repmgr_funcs'`
   in `postgresql.conf` if I'm not using `repmgrd`?
@@ -112,30 +106,6 @@ General
   If you later decide to run `repmgrd`, you just need to add
   `shared_preload_libraries = 'repmgr_funcs'` and restart PostgreSQL.
 
-- I've provided replication permission for the `repmgr` user in `pg_hba.conf`
-  but `repmgr`/`repmgrd` complains it can't connect to the server... Why?
-
-  `repmgr`/`repmgrd` need to be able to connect to the repmgr database
-  with a normal connection to query metadata. The `replication` connection
-  permission is for PostgreSQL's streaming replication and doesn't
-  necessarily need to be the `repmgr` user.
-
-- When cloning a standby, why do I need to provide the connection parameters
-  for the primary server on the command line, not in the configuration file?
-
-  Cloning a standby is a one-time action; the role of the server being cloned
-  from could change, so fixing it in the configuration file would create
-  confusion. If `repmgr` needs to establish a connection to the primary
-  server, it can retrieve this from the `repl_nodes` table or if necessary
-  scan the replication cluster until it locates the active primary.
-
-- Why is there no foreign key on the `node_id` column in the `repl_events`
-  table?
-
-  Under some circumstances event notifications can be generated for servers
-  which have not yet been registered; it's also useful to retain a record
-  of events which includes servers removed from the replication cluster
-  which no longer have an entry in the `repl_nodes` table.
 
 `repmgrd`
 ---------
@@ -164,8 +134,3 @@ General
 
   Note that after registering a delayed standby, `repmgrd` will only start
   once the metadata added in the master node has been replicated.
-
-- How can I get `repmgrd` to rotate its logfile?
-
-  Configure your system's `logrotate` service to do this; see example
-  in README.md

HISTORY

@@ -1,28 +1,4 @@
-3.1.0   2016-01-
+3.0.2   2015-09-
-        Add "repmgr standby switchover" command (Ian)
-        Revised README file (Ian)
-        Remove requirement for 'archive_mode' to be enabled (Ian)
-        Improve -?/--help output, showing default values if relevant (Ian)
-        Various bugfixes to command line/configuration parameter handling (Ian)
-
-3.0.3   2016-01-04
-        Create replication slot if required before base backup is run (Abhijit)
-        standy clone: when using rsync, clean up "pg_replslot" directory (Ian)
-        Improve --help output (Ian)
-        Improve config file parsing (Ian)
-        Various logging output improvements, including explicit HINTS (Ian)
-        Add --log-level to explicitly set log level on command line (Ian)
-        Repurpose --verbose to display extra log output (Ian)
-        Add --terse to hide hints and other non-critical output (Ian)
-        Reference internal functions with explicit catalog path (Ian)
-        When following a new primary, have repmgr (not repmgrd) create the new slot (Ian)
-        Add /etc/repmgr.conf as a default configuration file location (Ian)
-        Prevent repmgrd's -v/--verbose option expecting a parameter (Ian)
-        Prevent invalid replication_lag values being written to the monitoring table (Ian)
-        Improve repmgrd behaviour when monitored standby node is temporarily
-          unavailable (Martín)
-
-3.0.2   2015-10-02
         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)
@@ -36,9 +12,7 @@
         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 UNREGISTER (Vik Fearing)
+        Add STANDBY UNREGISTE (Vik Fearing)
-        Don't fail with error when registering master if schema already defined (Ian)
-        Fixes to whitespace handling when parsing config file (Ian)
 
 3.0.1   2015-04-16
         Prevent repmgrd from looping infinitely if node was not registered (Ian)

Makefile

@@ -1,6 +1,6 @@
 #
 # Makefile
-# Copyright (c) 2ndQuadrant, 2010-2016
+# Copyright (c) 2ndQuadrant, 2010-2015
 
 repmgrd_OBJS = dbutils.o config.o repmgrd.o log.o strutil.o
 repmgr_OBJS = dbutils.o check_dir.o config.o repmgr.o log.o strutil.o
@@ -67,21 +67,16 @@ clean:
 	rm -f repmgr
 	$(MAKE) -C sql clean
 
-# Get correct version numbers and install paths, depending on your postgres version
-PG_VERSION = $(shell pg_config --version | cut -d ' ' -f 2 | cut -d '.' -f 1,2)
-REPMGR_VERSION = $(shell grep REPMGR_VERSION version.h | cut -d ' ' -f 3 | cut -d '"' -f 2)
-PKGLIBDIR = $(shell pg_config --pkglibdir)
-SHAREDIR = $(shell pg_config --sharedir)
-
 deb: repmgrd repmgr
 	mkdir -p ./debian/usr/bin
 	cp repmgrd repmgr ./debian/usr/bin/
-	mkdir -p ./debian$(SHAREDIR)/contrib/
+	mkdir -p ./debian/usr/share/postgresql/9.0/contrib/
-	cp sql/repmgr_funcs.sql ./debian$(SHAREDIR)/contrib/
+	cp sql/repmgr_funcs.sql ./debian/usr/share/postgresql/9.0/contrib/
-	cp sql/uninstall_repmgr_funcs.sql ./debian$(SHAREDIR)/contrib/
+	cp sql/uninstall_repmgr_funcs.sql ./debian/usr/share/postgresql/9.0/contrib/
-	mkdir -p ./debian$(PKGLIBDIR)/
+	mkdir -p ./debian/usr/lib/postgresql/9.0/lib/
-	cp sql/repmgr_funcs.so ./debian$(PKGLIBDIR)/
+	cp sql/repmgr_funcs.so ./debian/usr/lib/postgresql/9.0/lib/
 	dpkg-deb --build debian
-	mv debian.deb ../postgresql-repmgr-$(PG_VERSION)_$(REPMGR_VERSION).deb
+	mv debian.deb ../postgresql-repmgr-9.0_1.0.0.deb
 	rm -rf ./debian/usr
 
+

QUICKSTART.md

@@ -1 +1,118 @@
-The contents of this file have been incorporated into the main README.md document.
+repmgr quickstart guide
+=======================
+
+This quickstart guide provides some annotated examples on basic
+`repmgr` setup. It assumes you are familiar with PostgreSQL replication
+concepts setup and Linux/UNIX system administration.
+
+For the purposes of this guide, we'll assume the database user will be
+`repmgr_usr` and the database will be `repmgr_db`.
+
+
+Master setup
+------------
+
+1. Configure PostgreSQL
+
+  - create user and database:
+
+	```
+	CREATE ROLE repmgr_usr LOGIN SUPERUSER;
+	CREATE DATABASE repmgr_db OWNER repmgr_usr;
+	```
+
+  - configure `postgresql.conf` for replication (see README.md for sample
+    settings)
+
+  - update `pg_hba.conf`, e.g.:
+
+	```
+	host    repmgr_db       repmgr_usr  192.168.1.0/24         trust
+	host    replication     repmgr_usr  192.168.1.0/24         trust
+	```
+
+  Restart the PostgreSQL server after making these changes.
+
+2. Create the `repmgr` configuration file:
+
+        $ cat /path/to/repmgr/node1/repmgr.conf
+        cluster=test
+        node=1
+        node_name=node1
+        conninfo='host=repmgr_node1 user=repmgr_usr dbname=repmgr_db'
+        pg_bindir=/path/to/postgres/bin
+
+   (For an annotated `repmgr.conf` file, see `repmgr.conf.sample` in the
+   repository's root directory).
+
+3. Register the master node with `repmgr`:
+
+        $ repmgr -f /path/to/repmgr/node1/repmgr.conf --verbose master register
+        [2015-03-03 17:45:53] [INFO] repmgr connecting to master database
+        [2015-03-03 17:45:53] [INFO] repmgr connected to master, checking its state
+        [2015-03-03 17:45:53] [INFO] master register: creating database objects inside the repmgr_test schema
+        [2015-03-03 17:45:53] [NOTICE] Master node correctly registered for cluster test with id 1 (conninfo: host=localhost user=repmgr_usr dbname=repmgr_db)
+
+Standby setup
+-------------
+
+1. Use `repmgr standby clone` to clone a standby from the master:
+
+        repmgr -D /path/to/standby/data -d repmgr_db -U repmgr_usr --verbose standby clone 192.168.1.2
+        [2015-03-03 18:18:21] [NOTICE] No configuration file provided and default file './repmgr.conf' not found - continuing with default values
+        [2015-03-03 18:18:21] [NOTICE] repmgr Destination directory ' /path/to/standby/data' provided
+        [2015-03-03 18:18:21] [INFO] repmgr connecting to upstream node
+        [2015-03-03 18:18:21] [INFO] repmgr connected to upstream node, checking its state
+        [2015-03-03 18:18:21] [INFO] Successfully connected to upstream node. Current installation size is 27 MB
+        [2015-03-03 18:18:21] [NOTICE] Starting backup...
+        [2015-03-03 18:18:21] [INFO] creating directory " /path/to/standby/data"...
+        [2015-03-03 18:18:21] [INFO] Executing: 'pg_basebackup -l "repmgr base backup"  -h localhost -p 9595 -U repmgr_usr -D  /path/to/standby/data '
+        NOTICE:  pg_stop_backup complete, all required WAL segments have been archived
+        [2015-03-03 18:18:23] [NOTICE] repmgr standby clone (using pg_basebackup) complete
+        [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 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
+  the `recovery.conf` file containing the correct parameters to start streaming
+  from the primary node.
+
+2. Start the PostgreSQL server
+
+3. Create the `repmgr` configuration file:
+
+        $ cat /path/node2/repmgr/repmgr.conf
+        cluster=test
+        node=2
+        node_name=node2
+        conninfo='host=repmgr_node2 user=repmgr_usr dbname=repmgr_db'
+        pg_bindir=/path/to/postgres/bin
+
+4. Register the standby node with `repmgr`:
+
+        $ repmgr -f /path/to/repmgr/node2/repmgr.conf --verbose standby register
+        [2015-03-03 18:24:34] [NOTICE] Opening configuration file: /path/to/repmgr/node2/repmgr.conf
+        [2015-03-03 18:24:34] [INFO] repmgr connecting to standby database
+        [2015-03-03 18:24:34] [INFO] repmgr connecting to master database
+        [2015-03-03 18:24:34] [INFO] finding node list for cluster 'test'
+        [2015-03-03 18:24:34] [INFO] checking role of cluster node '1'
+        [2015-03-03 18:24:34] [INFO] repmgr connected to master, checking its state
+        [2015-03-03 18:24:34] [INFO] repmgr registering the standby
+        [2015-03-03 18:24:34] [INFO] repmgr registering the standby complete
+        [2015-03-03 18:24:34] [NOTICE] Standby node correctly registered for cluster test with id 2 (conninfo: host=localhost user=repmgr_usr dbname=repmgr_db)
+
+
+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=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)

TODO

@@ -7,7 +7,6 @@ Known issues in repmgr
 
 * PGPASSFILE may not be passed to pg_basebackup
 
-
 Planned feature improvements
 ============================
 
@@ -40,34 +39,6 @@ Planned feature improvements
 * make old master node ID available for event notification commands
   (See github issue #80).
 
-* repmgr standby clone: possibility to use barman instead of performing a new base backup
+* Have pg_basebackup use replication slots, if and when support for
-
+  this is added; see:
-* possibility to transform a failed master into a new standby with pg_rewind
+    http://www.postgresql.org/message-id/555DD2B2.7020000@gmx.net
-
-* "repmgr standby switchover" to promote a standby in a controlled manner
-   and convert the existing primary into a standby
-
-* make repmgrd more robust
-
-* repmgr: when cloning a standby using pg_basebackup and replication slots are
-  requested, activate the replication slot using pg_receivexlog to negate the
-  need to set `wal_keep_segments` just for the initial clone (9.4 and 9.5).
-
-* Take into account the fact that a standby can obtain WAL from an archive,
-  so even if direct streaming replication is interrupted, it may be up-to-date
-
-Usability improvements
-======================
-
-* repmgr: add interrupt handler, so that if the program is interrupted
-  while running a backup, an attempt can be made to execute pg_stop_backup()
-  on the primary, to prevent an orphaned backup state existing.
-
-* repmgr: when unregistering a node, delete any entries in the repl_monitoring
-  table.
-
-* repmgr: for "standby unregister", accept connection parameters for the
-  primary and perform metadata updates (and slot removal) directly on
-  the primary, to allow a shutdown standby to be unregistered
-  (currently the standby must still be running, which means the replication
-  slot can't be dropped).

check_dir.c

@@ -1,6 +1,6 @@
 /*
  * check_dir.c - Directories management functions
- * Copyright (C) 2ndQuadrant, 2010-2016
+ * Copyright (C) 2ndQuadrant, 2010-2015
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -320,10 +320,10 @@ _create_pg_dir(char *dir, bool force, bool for_witness)
 			}
 			else if (pg_dir && !force)
 			{
-				log_hint(_("This looks like a PostgreSQL directory.\n"
+				log_warning(_("\nThis looks like a PostgreSQL directory.\n"
 							  "If you are sure you want to clone here, "
 							  "please check there is no PostgreSQL server "
-							"running and use the -F/--force option\n"));
+							  "running and use the --force option\n"));
 				return false;
 			}
 

check_dir.h

@@ -1,6 +1,6 @@
 /*
  * check_dir.h
- * Copyright (c) 2ndQuadrant, 2010-2016
+ * Copyright (c) 2ndQuadrant, 2010-2015
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

config.c

@@ -1,6 +1,6 @@
 /*
  * config.c - Functions to parse the config file
- * Copyright (C) 2ndQuadrant, 2010-2016
+ * Copyright (C) 2ndQuadrant, 2010-2015
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -26,25 +26,9 @@
 
 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 void exit_with_errors(ErrorList *config_errors);
 
-const static char *_progname = '\0';
 static char config_file_path[MAXPGPATH];
 static bool config_file_provided = false;
-bool config_file_found = false;
-
-
-void
-set_progname(const char *argv0)
-{
-	_progname = get_progname(argv0);
-}
-
-const char *
-progname(void)
-{
-	return _progname;
-}
 
 /*
  * load_config()
@@ -56,123 +40,61 @@ progname(void)
  *
  * Any configuration options changed in this function must also be changed in
  * reload_config()
- *
- * NOTE: this function is called before the logger is set up, so we need
- * to handle the verbose option ourselves; also the default log level is NOTICE,
- * so we can't use DEBUG.
  */
 bool
-load_config(const char *config_file, bool verbose, t_configuration_options *options, char *argv0)
+load_config(const char *config_file, t_configuration_options *options, char *argv0)
 {
-	struct stat stat_config;
+	struct stat config;
+	/* Sanity checks */
 
 	/*
 	 * If a configuration file was provided, check it exists, otherwise
-	 * emit an error and terminate. We assume that if a user explicitly
+	 * emit an error and terminate
-	 * provides a configuration file, they'll want to make sure it's
-	 * used and not fall back to any of the defaults.
 	 */
 	if (config_file[0])
 	{
 		strncpy(config_file_path, config_file, MAXPGPATH);
 		canonicalize_path(config_file_path);
 
-		if (stat(config_file_path, &stat_config) != 0)
+		if (stat(config_file_path, &config) != 0)
 		{
-			log_err(_("provided configuration file \"%s\" not found: %s\n"),
+			log_err(_("provided configuration file '%s' not found: %s\n"),
 					config_file,
 					strerror(errno)
 				);
 			exit(ERR_BAD_CONFIG);
 		}
 
-		if (verbose == true)
-		{
-			log_notice(_("using configuration file \"%s\"\n"), config_file);
-		}
-
 		config_file_provided = true;
-		config_file_found = true;
 	}
 
 	/*
 	 * If no configuration file was provided, attempt to find a default file
-	 * in this order:
-	 *  - current directory
-	 *  - /etc/repmgr.conf
-	 *  - default sysconfdir
-	 *
-	 * here we just check for the existence of the file; parse_config()
-	 * will handle read errors etc.
 	 */
 	if (config_file_provided == false)
 	{
 		char		my_exec_path[MAXPGPATH];
-		char		sysconf_etc_path[MAXPGPATH];
+		char		etc_path[MAXPGPATH];
 
-		/* 1. "./repmgr.conf" */
+		/* First check if one is in the default sysconfdir */
-		if (verbose == true)
-		{
-			log_notice(_("looking for configuration file in current directory\n"));
-		}
-
-		snprintf(config_file_path, MAXPGPATH, "./%s", CONFIG_FILE_NAME);
-		canonicalize_path(config_file_path);
-
-		if (stat(config_file_path, &stat_config) == 0)
-		{
-			config_file_found = true;
-			goto end_search;
-		}
-
-		/* 2. "/etc/repmgr.conf" */
-		if (verbose == true)
-		{
-			log_notice(_("looking for configuration file in /etc\n"));
-		}
-
-		snprintf(config_file_path, MAXPGPATH, "/etc/%s", CONFIG_FILE_NAME);
-		if (stat(config_file_path, &stat_config) == 0)
-		{
-			config_file_found = true;
-			goto end_search;
-		}
-
-		/* 3. 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, sysconf_etc_path);
+		get_etc_path(my_exec_path, etc_path);
 
-		if (verbose == true)
+		snprintf(config_file_path, MAXPGPATH, "%s/repmgr.conf", etc_path);
-		{
-			log_notice(_("looking for configuration file in %s\n"), sysconf_etc_path);
-		}
 
-		snprintf(config_file_path, MAXPGPATH, "%s/%s", sysconf_etc_path, CONFIG_FILE_NAME);
+		log_debug(_("Looking for configuration file in %s\n"), etc_path);
-		if (stat(config_file_path, &stat_config) == 0)
-		{
-			config_file_found = true;
-			goto end_search;
-		}
 
-	end_search:
+		if (stat(config_file_path, &config) != 0)
-		if (config_file_found == true)
 		{
-			if (verbose == true)
+			/* Not found - default to ./repmgr.conf */
-			{
+			strncpy(config_file_path, DEFAULT_CONFIG_FILE, MAXPGPATH);
-				log_notice(_("configuration file found at: %s\n"), config_file_path);
+			canonicalize_path(config_file_path);
-			}
+			log_debug(_("Looking for configuration file in %s\n"), config_file_path);
-		}
-		else
-		{
-			if (verbose == true)
-			{
-				log_notice(_("no configuration file provided or found\n"));
-			}
 		}
 	}
 
@@ -180,19 +102,12 @@ load_config(const char *config_file, bool verbose, t_configuration_options *opti
 }
 
 
-/*
- * Parse configuration file; if any errors are encountered,
- * list them and exit.
- *
- * Ensure any default values set here are synced with repmgr.conf.sample
- * and any other documentation.
- */
 bool
 parse_config(t_configuration_options *options)
 {
 	FILE	   *fp;
 	char	   *s,
-				buf[MAXLINELENGTH];
+				buff[MAXLINELENGTH];
 	char		name[MAXLEN];
 	char		value[MAXLEN];
 
@@ -200,19 +115,36 @@ parse_config(t_configuration_options *options)
 	PQconninfoOption *conninfo_options;
 	char       *conninfo_errmsg = NULL;
 
-	/* Collate configuration file errors here for friendlier reporting */
+	fp = fopen(config_file_path, "r");
-	static ErrorList config_errors = { NULL, NULL };
 
-	bool		node_found = false;
+	/*
-
+	 * Since some commands don't require a config file at all, not having one
-	/* Initialize configuration options with sensible defaults
+	 * isn't necessarily a problem.
-	 * note: the default log level is set in log.c and does not need
+	 *
-	 * to be initialised here
+	 * If the user explictly provided a configuration file and we can't
+	 * read it we'll raise an error.
+	 *
+	 * If no configuration file was provided, we'll try and read the default\
+	 * file if it exists and is readable, but won't worry if it's not.
 	 */
+	if (fp == NULL)
+	{
+		if (config_file_provided)
+		{
+			log_err(_("unable to open provided configuration file '%s'; terminating\n"), config_file_path);
+			exit(ERR_BAD_CONFIG);
+		}
+
+		log_notice(_("no configuration file provided and default file '%s' not found - "
+					 "continuing with default values\n"),
+				   DEFAULT_CONFIG_FILE);
+		return false;
+	}
+
+	/* Initialize configuration options with sensible defaults */
 	memset(options->cluster_name, 0, sizeof(options->cluster_name));
 	options->node = -1;
 	options->upstream_node = NO_UPSTREAM_NODE;
-	options->use_replication_slots = 0;
 	memset(options->conninfo, 0, sizeof(options->conninfo));
 	options->failover = MANUAL_FAILOVER;
 	options->priority = DEFAULT_PRIORITY;
@@ -230,7 +162,7 @@ parse_config(t_configuration_options *options)
 
 	/* default to 6 reconnection attempts at intervals of 10 seconds */
 	options->reconnect_attempts = 6;
-	options->reconnect_interval = 10;
+	options->reconnect_intvl = 10;
 
 	options->monitor_interval_secs = 2;
 	options->retry_promote_interval_secs = 300;
@@ -240,45 +172,15 @@ parse_config(t_configuration_options *options)
 	options->tablespace_mapping.head = NULL;
 	options->tablespace_mapping.tail = NULL;
 
-	/*
-	 * If no configuration file available (user didn't specify and none found
-	 * in the default locations), return with default values
-	 */
-	if (config_file_found == false)
-	{
-		log_verbose(LOG_NOTICE, _("no configuration file provided and no default file found - "
-					 "continuing with default values\n"));
-		return true;
-	}
 
-	fp = fopen(config_file_path, "r");
 
-	/*
+	/* Read next line */
-	 * A configuration file has been found, either provided by the user
+	while ((s = fgets(buff, sizeof buff, fp)) != NULL)
-	 * or found in one of the default locations. If we can't open it,
-	 * fail with an error.
-	 */
-	if (fp == NULL)
-	{
-		if (config_file_provided)
-		{
-			log_err(_("unable to open provided configuration file \"%s\"; terminating\n"), config_file_path);
-		}
-		else
-		{
-			log_err(_("unable to open default configuration file  \"%s\"; terminating\n"), config_file_path);
-		}
-
-		exit(ERR_BAD_CONFIG);
-	}
-
-	/* Read file */
-	while ((s = fgets(buf, sizeof buf, fp)) != NULL)
 	{
 		bool known_parameter = true;
 
 		/* Parse name/value pair from line */
-		parse_line(buf, name, value);
+		parse_line(buff, name, value);
 
 		/* Skip blank lines */
 		if (!strlen(name))
@@ -292,12 +194,9 @@ parse_config(t_configuration_options *options)
 		if (strcmp(name, "cluster") == 0)
 			strncpy(options->cluster_name, value, MAXLEN);
 		else if (strcmp(name, "node") == 0)
-		{
+			options->node = atoi(value);
-			options->node = repmgr_atoi(value, "node", &config_errors, false);
-			node_found = true;
-		}
 		else if (strcmp(name, "upstream_node") == 0)
-			options->upstream_node = repmgr_atoi(value, "upstream_node", &config_errors, false);
+			options->upstream_node = atoi(value);
 		else if (strcmp(name, "conninfo") == 0)
 			strncpy(options->conninfo, value, MAXLEN);
 		else if (strcmp(name, "rsync_options") == 0)
@@ -324,11 +223,12 @@ parse_config(t_configuration_options *options)
 			}
 			else
 			{
-				error_list_append(&config_errors,_("value for 'failover' must be 'automatic' or 'manual'\n"));
+				log_err(_("value for 'failover' must be 'automatic' or 'manual'\n"));
+				exit(ERR_BAD_CONFIG);
 			}
 		}
 		else if (strcmp(name, "priority") == 0)
-			options->priority = repmgr_atoi(value, "priority", &config_errors, true);
+			options->priority = atoi(value);
 		else if (strcmp(name, "node_name") == 0)
 			strncpy(options->node_name, value, MAXLEN);
 		else if (strcmp(name, "promote_command") == 0)
@@ -336,16 +236,11 @@ parse_config(t_configuration_options *options)
 		else if (strcmp(name, "follow_command") == 0)
 			strncpy(options->follow_command, value, MAXLEN);
 		else if (strcmp(name, "master_response_timeout") == 0)
-			options->master_response_timeout = repmgr_atoi(value, "master_response_timeout", &config_errors, false);
+			options->master_response_timeout = atoi(value);
-		/* 'primary_response_timeout' as synonym for 'master_response_timeout' -
-		 * we'll switch terminology in a future release (3.1?)
-		 */
-		else if (strcmp(name, "primary_response_timeout") == 0)
-			options->master_response_timeout = repmgr_atoi(value, "primary_response_timeout", &config_errors, false);
 		else if (strcmp(name, "reconnect_attempts") == 0)
-			options->reconnect_attempts = repmgr_atoi(value, "reconnect_attempts", &config_errors, false);
+			options->reconnect_attempts = atoi(value);
 		else if (strcmp(name, "reconnect_interval") == 0)
-			options->reconnect_interval = repmgr_atoi(value, "reconnect_interval", &config_errors, false);
+			options->reconnect_intvl = atoi(value);
 		else if (strcmp(name, "pg_bindir") == 0)
 			strncpy(options->pg_bindir, value, MAXLEN);
 		else if (strcmp(name, "pg_ctl_options") == 0)
@@ -355,12 +250,11 @@ parse_config(t_configuration_options *options)
 		else if (strcmp(name, "logfile") == 0)
 			strncpy(options->logfile, value, MAXLEN);
 		else if (strcmp(name, "monitor_interval_secs") == 0)
-			options->monitor_interval_secs = repmgr_atoi(value, "monitor_interval_secs", &config_errors, false);
+			options->monitor_interval_secs = atoi(value);
 		else if (strcmp(name, "retry_promote_interval_secs") == 0)
-			options->retry_promote_interval_secs = repmgr_atoi(value, "retry_promote_interval_secs", &config_errors, false);
+			options->retry_promote_interval_secs = atoi(value);
 		else if (strcmp(name, "use_replication_slots") == 0)
-			/* XXX we should have a dedicated boolean argument format */
+			options->use_replication_slots = atoi(value);
-			options->use_replication_slots = repmgr_atoi(value, "use_replication_slots", &config_errors, false);
 		else if (strcmp(name, "event_notification_command") == 0)
 			strncpy(options->event_notification_command, value, MAXLEN);
 		else if (strcmp(name, "event_notifications") == 0)
@@ -380,54 +274,76 @@ parse_config(t_configuration_options *options)
 		 * as currently e.g. an empty `node` value will be converted to '0'.
 		 */
 		if (known_parameter == true && !strlen(value)) {
-			char	   error_message_buf[MAXLEN] = "";
+			log_err(_("no value provided for parameter '%s'\n"), name);
-			snprintf(error_message_buf,
+			exit(ERR_BAD_CONFIG);
-					 MAXLEN,
-					 _("no value provided for parameter \"%s\""),
-					 name);
-
-			error_list_append(&config_errors, error_message_buf);
 		}
 	}
 
 	fclose(fp);
 
+	/* Check config settings */
 
-	if (node_found == false)
+	/* The following checks are for the presence of the parameter */
+	if (*options->cluster_name == '\0')
 	{
-		error_list_append(&config_errors, _("\"node\": parameter was not found"));
+		log_err(_("required parameter 'cluster' was not found\n"));
-	}
+		exit(ERR_BAD_CONFIG);
-	else if (options->node == 0)
-	{
-		error_list_append(&config_errors, _("\"node\": must be greater than zero"));
 	}
 
-	if (strlen(options->conninfo))
+	if (options->node == -1)
 	{
+		log_err(_("required parameter 'node' was not found\n"));
+		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"));
+		exit(ERR_BAD_CONFIG);
+	}
+
+	if (*options->conninfo == '\0')
+	{
+		log_err(_("required parameter 'conninfo' was not found\n"));
+		exit(ERR_BAD_CONFIG);
+	}
 
 	/* Sanity check the provided conninfo string
 	 *
-		 * NOTE: PQconninfoParse() verifies the string format and checks for valid options
+	 * 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)
 	{
-			char	   error_message_buf[MAXLEN] = "";
+		log_err(_("Parameter 'conninfo' is invalid: %s"), conninfo_errmsg);
-			snprintf(error_message_buf,
+		exit(ERR_BAD_CONFIG);
-					 MAXLEN,
-					 _("\"conninfo\": %s"),
-					 conninfo_errmsg);
-
-			error_list_append(&config_errors, error_message_buf);
 	}
-
 	PQconninfoFree(conninfo_options);
+
+	/* The following checks are for valid parameter values */
+	if (options->master_response_timeout <= 0)
+	{
+		log_err(_("'master_response_timeout' must be greater than zero\n"));
+		exit(ERR_BAD_CONFIG);
 	}
 
-	if (config_errors.head != NULL)
+	if (options->reconnect_attempts < 0)
 	{
-		exit_with_errors(&config_errors);
+		log_err(_("'reconnect_attempts' must be zero or greater\n"));
+		exit(ERR_BAD_CONFIG);
+	}
+
+	if (options->reconnect_intvl < 0)
+	{
+		log_err(_("'reconnect_interval' must be zero or greater\n"));
+		exit(ERR_BAD_CONFIG);
 	}
 
 	return true;
@@ -462,7 +378,7 @@ trim(char *s)
 }
 
 void
-parse_line(char *buf, char *name, char *value)
+parse_line(char *buff, char *name, char *value)
 {
 	int			i = 0;
 	int			j = 0;
@@ -473,10 +389,10 @@ parse_line(char *buf, char *name, char *value)
 	for (; i < MAXLEN; ++i)
 	{
 
-		if (buf[i] == '=')
+		if (buff[i] == '=')
 			break;
 
-		switch(buf[i])
+		switch(buff[i])
 		{
 			/* Ignore whitespace */
 			case ' ':
@@ -485,7 +401,7 @@ parse_line(char *buf, char *name, char *value)
 			case '\t':
 				continue;
 			default:
-				name[j++] = buf[i];
+				name[j++] = buff[i];
 		}
 	}
 	name[j] = '\0';
@@ -495,9 +411,9 @@ parse_line(char *buf, char *name, char *value)
 	 */
 	for (; i < MAXLEN; ++i)
 	{
-		if (buf[i+1] == ' ')
+		if (buff[i+1] == ' ')
 			continue;
-		if (buf[i+1] == '\t')
+		if (buff[i+1] == '\t')
 			continue;
 
 		break;
@@ -508,12 +424,12 @@ parse_line(char *buf, char *name, char *value)
 	 */
 	j = 0;
 	for (++i; i < MAXLEN; ++i)
-		if (buf[i] == '\'')
+		if (buff[i] == '\'')
 			continue;
-		else if (buf[i] == '#')
+		else if (buff[i] == '#')
 			break;
-		else if (buf[i] != '\n')
+		else if (buff[i] != '\n')
-			value[j++] = buf[i];
+			value[j++] = buff[i];
 		else
 			break;
 	value[j] = '\0';
@@ -575,7 +491,7 @@ reload_config(t_configuration_options *orig_options)
 		return false;
 	}
 
-	if (new_options.reconnect_interval < 0)
+	if (new_options.reconnect_intvl < 0)
 	{
 		log_warning(_("new value for 'reconnect_interval' must be zero or greater\n"));
 		return false;
@@ -694,10 +610,10 @@ reload_config(t_configuration_options *orig_options)
 		config_changed = true;
 	}
 
-	/* reconnect_interval */
+	/* reconnect_intvl */
-	if (orig_options->reconnect_interval != new_options.reconnect_interval)
+	if (orig_options->reconnect_intvl != new_options.reconnect_intvl)
 	{
-		orig_options->reconnect_interval = new_options.reconnect_interval;
+		orig_options->reconnect_intvl = new_options.reconnect_intvl;
 		config_changed = true;
 	}
 
@@ -749,96 +665,6 @@ reload_config(t_configuration_options *orig_options)
 }
 
 
-void
-error_list_append(ErrorList *error_list, char *error_message)
-{
-	ErrorListCell *cell;
-
-	cell = (ErrorListCell *) pg_malloc0(sizeof(ErrorListCell));
-
-	if (cell == NULL)
-	{
-		log_err(_("unable to allocate memory; terminating.\n"));
-		exit(ERR_BAD_CONFIG);
-	}
-
-	cell->error_message = pg_malloc0(MAXLEN);
-	strncpy(cell->error_message, error_message, MAXLEN);
-
-	if (error_list->tail)
-	{
-		error_list->tail->next = cell;
-	}
-	else
-	{
-		error_list->head = cell;
-	}
-
-	error_list->tail = cell;
-}
-
-
-/*
- * Convert provided string to an integer using strtol;
- * on error, if a callback is provided, pass the error message to that,
- * otherwise exit
- */
-int
-repmgr_atoi(const char *value, const char *config_item, ErrorList *error_list, bool allow_negative)
-{
-	char	  *endptr;
-	long	   longval = 0;
-	char	   error_message_buf[MAXLEN] = "";
-
-	/* It's possible that some versions of strtol() don't treat an empty
-	 * string as an error.
-	 */
-
-	if (*value == '\0')
-	{
-		snprintf(error_message_buf,
-				 MAXLEN,
-				 _("no value provided for \"%s\""),
-				 config_item);
-	}
-	else
-	{
-		errno = 0;
-		longval = strtol(value, &endptr, 10);
-
-		if (value == endptr || errno)
-		{
-			snprintf(error_message_buf,
-					 MAXLEN,
-					 _("\"%s\": invalid value (provided: \"%s\")"),
-					 config_item, value);
-		}
-	}
-
-	/* Disallow negative values for most parameters */
-	if (allow_negative == false && longval < 0)
-	{
-		snprintf(error_message_buf,
-				 MAXLEN,
-				 _("\"%s\" must be zero or greater (provided: %s)"),
-				 config_item, value);
-	}
-
-	/* Error message buffer is set */
-	if (error_message_buf[0] != '\0')
-	{
-		if (error_list == NULL)
-		{
-			log_err("%s\n", error_message_buf);
-			exit(ERR_BAD_CONFIG);
-		}
-
-		error_list_append(error_list, error_message_buf);
-	}
-
-	return (int32) longval;
-}
-
 
 /*
  * Split argument into old_dir and new_dir and append to tablespace mapping
@@ -971,21 +797,3 @@ parse_event_notifications_list(t_configuration_options *options, const char *arg
 		}
 	}
 }
-
-
-
-static void
-exit_with_errors(ErrorList *config_errors)
-{
-	ErrorListCell *cell;
-
-	log_err(_("%s: following errors were found in the configuration file.\n"), progname());
-
-	for (cell = config_errors->head; cell; cell = cell->next)
-	{
-		log_err("%s\n", cell->error_message);
-	}
-
-	exit(ERR_BAD_CONFIG);
-}
-

config.h

@@ -1,6 +1,6 @@
 /*
  * config.h
- * Copyright (c) 2ndQuadrant, 2010-2016
+ * Copyright (c) 2ndQuadrant, 2010-2015
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -24,7 +24,6 @@
 
 #include "strutil.h"
 
-#define CONFIG_FILE_NAME	"repmgr.conf"
 
 typedef struct EventNotificationListCell
 {
@@ -68,7 +67,7 @@ typedef struct
 	char		ssh_options[QUERY_STR_LEN];
 	int			master_response_timeout;
 	int			reconnect_attempts;
-	int			reconnect_interval;
+	int			reconnect_intvl;
 	char		pg_bindir[MAXLEN];
 	char		pg_ctl_options[MAXLEN];
 	char		pg_basebackup_options[MAXLEN];
@@ -83,30 +82,11 @@ typedef struct
 
 #define T_CONFIGURATION_OPTIONS_INITIALIZER { "", -1, NO_UPSTREAM_NODE, "", MANUAL_FAILOVER, -1, "", "", "", "", "", "", "", -1, -1, -1, "", "", "", "", 0, 0, 0, "", { NULL, NULL }, {NULL, NULL} }
 
-typedef struct ErrorListCell
-{
-	struct ErrorListCell *next;
-	char			     *error_message;
-} ErrorListCell;
 
-typedef struct ErrorList
+bool		load_config(const char *config_file, t_configuration_options *options, char *argv0);
-{
-	ErrorListCell *head;
-	ErrorListCell *tail;
-} ErrorList;
-
-void set_progname(const char *argv0);
-const char * progname(void);
-
-bool		load_config(const char *config_file, bool verbose, 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);
-void		error_list_append(ErrorList *error_list, char *error_message);
-int			repmgr_atoi(const char *s,
-						const char *config_item,
-						ErrorList *error_list,
-						bool allow_negative);
 
 #endif

dbutils.c

@@ -1,6 +1,6 @@
 /*
  * dbutils.c - Database connection/management functions
- * Copyright (C) 2ndQuadrant, 2010-2016
+ * Copyright (C) 2ndQuadrant, 2010-2015
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -26,14 +26,11 @@
 #include "strutil.h"
 #include "log.h"
 
-#include "catalog/pg_control.h"
-
 char repmgr_schema[MAXLEN] = "";
 char repmgr_schema_quoted[MAXLEN] = "";
 
-
 PGconn *
-_establish_db_connection(const char *conninfo, const bool exit_on_error, const bool log_notice)
+establish_db_connection(const char *conninfo, const bool exit_on_error)
 {
 	/* Make a connection to the database */
 	PGconn	   *conn = NULL;
@@ -48,17 +45,9 @@ _establish_db_connection(const char *conninfo, const bool exit_on_error, const b
 
 	/* Check to see that the backend connection was successfully made */
 	if ((PQstatus(conn) != CONNECTION_OK))
-	{
-		if (log_notice)
-		{
-			log_notice(_("connection to database failed: %s\n"),
-					PQerrorMessage(conn));
-		}
-		else
 	{
 		log_err(_("connection to database failed: %s\n"),
 				PQerrorMessage(conn));
-		}
 
 		if (exit_on_error)
 		{
@@ -70,19 +59,6 @@ _establish_db_connection(const char *conninfo, const bool exit_on_error, const b
 	return conn;
 }
 
-PGconn *
-establish_db_connection(const char *conninfo, const bool exit_on_error)
-{
-	return _establish_db_connection(conninfo, exit_on_error, false);
-}
-
-PGconn *
-test_db_connection(const char *conninfo, const bool exit_on_error)
-{
-	return _establish_db_connection(conninfo, exit_on_error, true);
-}
-
-
 PGconn *
 establish_db_connection_by_params(const char *keywords[], const char *values[],
 								  const bool exit_on_error)
@@ -111,8 +87,6 @@ begin_transaction(PGconn *conn)
 {
 	PGresult   *res;
 
-	log_verbose(LOG_DEBUG, "begin_transaction()\n");
-
 	res = PQexec(conn, "BEGIN");
 
 	if (PQresultStatus(res) != PGRES_COMMAND_OK)
@@ -135,8 +109,6 @@ commit_transaction(PGconn *conn)
 {
 	PGresult   *res;
 
-	log_verbose(LOG_DEBUG, "commit_transaction()\n");
-
 	res = PQexec(conn, "COMMIT");
 
 	if (PQresultStatus(res) != PGRES_COMMAND_OK)
@@ -159,8 +131,6 @@ rollback_transaction(PGconn *conn)
 {
 	PGresult   *res;
 
-	log_verbose(LOG_DEBUG, "rollback_transaction()\n");
-
 	res = PQexec(conn, "ROLLBACK");
 
 	if (PQresultStatus(res) != PGRES_COMMAND_OK)
@@ -188,8 +158,7 @@ check_cluster_schema(PGconn *conn)
 					  "SELECT 1 FROM pg_namespace WHERE nspname = '%s'",
 					  get_repmgr_schema());
 
-	log_verbose(LOG_DEBUG, "check_cluster_schema(): %s\n", sqlquery);
+	log_debug(_("check_cluster_schema(): %s\n"), sqlquery);
-
 	res = PQexec(conn, sqlquery);
 	if (PQresultStatus(res) != PGRES_TUPLES_OK)
 	{
@@ -219,22 +188,17 @@ is_standby(PGconn *conn)
 {
 	PGresult   *res;
 	int			result = 0;
-	char	   *sqlquery = "SELECT pg_catalog.pg_is_in_recovery()";
 
-	log_verbose(LOG_DEBUG, "is_standby(): %s\n", sqlquery);
+	res = PQexec(conn, "SELECT pg_is_in_recovery()");
-
-	res = PQexec(conn, sqlquery);
 
 	if (res == NULL || PQresultStatus(res) != PGRES_TUPLES_OK)
 	{
-		log_err(_("Unable to query server mode: %s\n"),
+		log_err(_("Can't query server mode: %s"),
 				PQerrorMessage(conn));
 		result = -1;
 	}
 	else if (PQntuples(res) == 1 && strcmp(PQgetvalue(res, 0, 0), "t") == 0)
-	{
 		result = 1;
-	}
 
 	PQclear(res);
 	return result;
@@ -321,8 +285,6 @@ get_master_node_id(PGconn *conn, char *cluster)
 					  get_repmgr_schema_quoted(conn),
 					  cluster);
 
-	log_verbose(LOG_DEBUG, "get_master_node_id():\n%s\n", sqlquery);
-
 	res = PQexec(conn, sqlquery);
 	if (PQresultStatus(res) != PGRES_TUPLES_OK)
 	{
@@ -332,7 +294,7 @@ get_master_node_id(PGconn *conn, char *cluster)
 	}
 	else if (PQntuples(res) == 0)
 	{
-		log_verbose(LOG_WARNING, _("get_master_node_id(): no active primary found\n"));
+		log_warning(_("get_master_node_id(): no active primary found\n"));
 		retval = NODE_NOT_FOUND;
 	}
 	else
@@ -379,17 +341,14 @@ guc_set(PGconn *conn, const char *parameter, const char *op,
 	char		sqlquery[QUERY_STR_LEN];
 	int			retval = 1;
 
-	sqlquery_snprintf(sqlquery,
+	sqlquery_snprintf(sqlquery, "SELECT true FROM pg_settings "
-					  "SELECT true FROM pg_settings "
 					  " WHERE name = '%s' AND setting %s '%s'",
 					  parameter, op, value);
 
-	log_verbose(LOG_DEBUG, "guc_set():\n%s\n", sqlquery);
-
 	res = PQexec(conn, sqlquery);
 	if (PQresultStatus(res) != PGRES_TUPLES_OK)
 	{
-		log_err(_("guc_set(): unable to execute query\n%s\n"),
+		log_err(_("GUC setting check PQexec failed: %s"),
 				PQerrorMessage(conn));
 		retval = -1;
 	}
@@ -420,12 +379,10 @@ guc_set_typed(PGconn *conn, const char *parameter, const char *op,
 					  " WHERE name = '%s' AND setting::%s %s '%s'::%s",
 					  parameter, datatype, op, value, datatype);
 
-	log_verbose(LOG_DEBUG, "guc_set_typed():n%s\n", sqlquery);
-
 	res = PQexec(conn, sqlquery);
 	if (PQresultStatus(res) != PGRES_TUPLES_OK)
 	{
-		log_err(_("guc_set_typed(): unable to execute query\n%s\n"),
+		log_err(_("GUC setting check PQexec failed: %s"),
 				PQerrorMessage(conn));
 		retval = -1;
 	}
@@ -446,16 +403,15 @@ get_cluster_size(PGconn *conn, char *size)
 	PGresult   *res;
 	char		sqlquery[QUERY_STR_LEN];
 
-	sqlquery_snprintf(sqlquery,
+	sqlquery_snprintf(
-					  "SELECT pg_catalog.pg_size_pretty(SUM(pg_catalog.pg_database_size(oid))::bigint) "
+					  sqlquery,
+				 "SELECT pg_size_pretty(SUM(pg_database_size(oid))::bigint) "
 					  "	 FROM pg_database ");
 
-	log_verbose(LOG_DEBUG, "get_cluster_size():\n%s\n", sqlquery);
-
 	res = PQexec(conn, sqlquery);
 	if (res == NULL || PQresultStatus(res) != PGRES_TUPLES_OK)
 	{
-		log_err(_("get_cluster_size(): unable to execute query\n%s\n"),
+		log_err(_("get_cluster_size(): PQexec failed: %s"),
 				PQerrorMessage(conn));
 
 		PQclear(res);
@@ -469,6 +425,7 @@ get_cluster_size(PGconn *conn, char *size)
 }
 
 
+
 bool
 get_pg_setting(PGconn *conn, const char *setting, char *output)
 {
@@ -482,7 +439,7 @@ get_pg_setting(PGconn *conn, const char *setting, char *output)
 					  " FROM pg_settings WHERE name = '%s'",
 					  setting);
 
-	log_verbose(LOG_DEBUG, "get_pg_setting(): %s\n", sqlquery);
+	log_debug(_("get_pg_setting(): %s\n"), sqlquery);
 
 	res = PQexec(conn, sqlquery);
 
@@ -504,14 +461,13 @@ get_pg_setting(PGconn *conn, const char *setting, char *output)
 		}
 		else
 		{
-			/* XXX highly unlikely this would ever happen */
+			log_err(_("unknown parameter: %s"), PQgetvalue(res, i, 0));
-			log_err(_("get_pg_setting(): unknown parameter \"%s\""), PQgetvalue(res, i, 0));
 		}
 	}
 
 	if (success == true)
 	{
-		log_verbose(LOG_DEBUG, _("get_pg_setting(): returned value is \"%s\"\n"), output);
+		log_debug(_("get_pg_setting(): returned value is '%s'\n"), output);
 	}
 
 	PQclear(res);
@@ -520,48 +476,6 @@ get_pg_setting(PGconn *conn, const char *setting, char *output)
 }
 
 
-/*
- * get_conninfo_value()
- *
- * Extract the value represented by 'keyword' in 'conninfo' and copy
- * it to the 'output' buffer.
- *
- * Returns true on success, or false on failure (conninfo string could
- * not be parsed, or provided keyword not found).
- */
-
-bool
-get_conninfo_value(const char *conninfo, const char *keyword, char *output)
-{
-	PQconninfoOption *conninfo_options;
-	PQconninfoOption *conninfo_option;
-
-	conninfo_options = PQconninfoParse(conninfo, NULL);
-
-	if (conninfo_options == false)
-	{
-		log_err(_("Unable to parse provided conninfo string \"%s\""), conninfo);
-		return false;
-	}
-
-	for (conninfo_option = conninfo_options; conninfo_option->keyword != NULL; conninfo_option++)
-	{
-		if (strcmp(conninfo_option->keyword, keyword) == 0)
-		{
-			if (conninfo_option->val != NULL && conninfo_option->val[0] != '\0')
-			{
-				strncpy(output, conninfo_option->val, MAXLEN);
-				break;
-			}
-		}
-	}
-
-	PQconninfoFree(conninfo_options);
-
-	return true;
-}
-
-
 /*
  * get_upstream_connection()
  *
@@ -598,13 +512,13 @@ get_upstream_connection(PGconn *standby_conn, char *cluster, int node_id,
 					  cluster,
 					  node_id);
 
-	log_verbose(LOG_DEBUG, "get_upstream_connection():\n%s\n", sqlquery);
+	log_debug("get_upstream_connection(): %s\n", sqlquery);
 
 	res = PQexec(standby_conn, sqlquery);
 
 	if (PQresultStatus(res) != PGRES_TUPLES_OK)
 	{
-		log_err(_("unable to get conninfo for upstream server\n%s\n"),
+		log_err(_("unable to get conninfo for upstream server: %s\n"),
 				PQerrorMessage(standby_conn));
 		PQclear(res);
 		return NULL;
@@ -624,7 +538,7 @@ get_upstream_connection(PGconn *standby_conn, char *cluster, int node_id,
 
 	PQclear(res);
 
-	log_verbose(LOG_DEBUG, "get_upstream_connection(): conninfo is \"%s\"\n", upstream_conninfo);
+	log_debug("conninfo is: '%s'\n", upstream_conninfo);
 	upstream_conn = establish_db_connection(upstream_conninfo, false);
 
 	if (PQstatus(upstream_conn) != CONNECTION_OK)
@@ -639,97 +553,87 @@ get_upstream_connection(PGconn *standby_conn, char *cluster, int node_id,
 
 
 /*
- * Read the node list from the local node and attempt to connect to each node
+ * get a connection to master by reading repl_nodes, creating a connection
- * in turn to definitely establish if it's the cluster primary.
+ * to each node (one at a time) and finding if it is a master or a standby
  *
- * The node list is returned in the order which makes it likely that the
+ * NB: If master_conninfo_out may be NULL.	If it is non-null, it is assumed to
- * current primary will be returned first, reducing the number of speculative
+ * point to allocated memory of MAXCONNINFO in length, and the master server
- * connections which need to be made to other nodes.
+ * connection string is placed there.
- *
- * If master_conninfo_out points to allocated memory of MAXCONNINFO in length,
- * the primary server's conninfo string will be copied there.
  */
 
 PGconn *
 get_master_connection(PGconn *standby_conn, char *cluster,
 					  int *master_id, char *master_conninfo_out)
 {
-	PGconn	   *remote_conn = NULL;
+	PGconn	   *master_conn = NULL;
-	PGresult   *res;
+	PGresult   *res1;
+	PGresult   *res2;
 	char		sqlquery[QUERY_STR_LEN];
-	char		remote_conninfo_stack[MAXCONNINFO];
+	char		master_conninfo_stack[MAXCONNINFO];
-	char	   *remote_conninfo = &*remote_conninfo_stack;
+	char	   *master_conninfo = &*master_conninfo_stack;
 
 	int			i,
 				node_id;
 
-	/*
-	 * If the caller wanted to get a copy of the connection info string, sub
-	 * out the local stack pointer for the pointer passed by the caller.
-	 */
-	if (master_conninfo_out != NULL)
-		remote_conninfo = master_conninfo_out;
-
 	if (master_id != NULL)
 	{
 		*master_id = NODE_NOT_FOUND;
 	}
 
 	/* find all nodes belonging to this cluster */
-	log_info(_("retrieving node list for cluster '%s'\n"),
+	log_info(_("finding node list for cluster '%s'\n"),
 			 cluster);
 
 	sqlquery_snprintf(sqlquery,
-					  "  SELECT id, conninfo, "
+					  "SELECT id, conninfo "
-                      "         CASE WHEN type = 'master' THEN 1 ELSE 2 END AS type_priority"
 					  "  FROM %s.repl_nodes "
 					  " WHERE cluster = '%s' "
-					  "     AND type != 'witness' "
+					  "   AND type != 'witness' ",
-					  "ORDER BY active DESC, type_priority, priority, id",
 					  get_repmgr_schema_quoted(standby_conn),
 					  cluster);
 
-	log_verbose(LOG_DEBUG, "get_master_connection():\n%s\n", sqlquery);
+	res1 = PQexec(standby_conn, sqlquery);
-
+	if (PQresultStatus(res1) != PGRES_TUPLES_OK)
-	res = PQexec(standby_conn, sqlquery);
-	if (PQresultStatus(res) != PGRES_TUPLES_OK)
 	{
 		log_err(_("unable to retrieve node records: %s\n"),
 				PQerrorMessage(standby_conn));
-		PQclear(res);
+		PQclear(res1);
 		return NULL;
 	}
 
-	for (i = 0; i < PQntuples(res); i++)
+	for (i = 0; i < PQntuples(res1); i++)
 	{
-		int is_node_standby;
-
 		/* initialize with the values of the current node being processed */
-		node_id = atoi(PQgetvalue(res, i, 0));
+		node_id = atoi(PQgetvalue(res1, i, 0));
-		strncpy(remote_conninfo, PQgetvalue(res, i, 1), MAXCONNINFO);
+		strncpy(master_conninfo, PQgetvalue(res1, i, 1), MAXCONNINFO);
-		log_verbose(LOG_INFO,
+		log_info(_("checking role of cluster node '%i'\n"),
-					_("checking role of cluster node '%i'\n"),
 				 node_id);
-		remote_conn = establish_db_connection(remote_conninfo, false);
+		master_conn = establish_db_connection(master_conninfo, false);
 
-		if (PQstatus(remote_conn) != CONNECTION_OK)
+		if (PQstatus(master_conn) != CONNECTION_OK)
 			continue;
 
-		is_node_standby = is_standby(remote_conn);
+		/*
+		 * Can't use the is_standby() function here because on error that
+		 * function closes the connection passed and exits.  This still needs
+		 * to close master_conn first.
+		 */
+		res2 = PQexec(master_conn, "SELECT pg_is_in_recovery()");
 
-		if (is_node_standby == -1)
+		if (PQresultStatus(res2) != PGRES_TUPLES_OK)
 		{
-			log_err(_("unable to retrieve recovery state from node %i:\n%s\n"),
+			log_err(_("unable to retrieve recovery state from this node: %s\n"),
-					node_id,
+					PQerrorMessage(master_conn));
-					PQerrorMessage(remote_conn));
+			PQclear(res2);
-			PQfinish(remote_conn);
+			PQfinish(master_conn);
 			continue;
 		}
 
-		/* if is_standby() returns 0, queried node is the master */
+		/* if false, this is the master */
-		if (is_node_standby == 0)
+		if (strcmp(PQgetvalue(res2, 0, 0), "f") == 0)
 		{
-			PQclear(res);
+			PQclear(res2);
+			PQclear(res1);
 			log_debug(_("get_master_connection(): current master node is %i\n"), node_id);
 
 			if (master_id != NULL)
@@ -737,12 +641,14 @@ get_master_connection(PGconn *standby_conn, char *cluster,
 				*master_id = node_id;
 			}
 
-			return remote_conn;
+			return master_conn;
+		}
+		else
+		{
+			/* if it is a standby, clear info */
+			PQclear(res2);
+			PQfinish(master_conn);
 		}
-
-
-		/* if it is a standby, clear connection info and continue*/
-		PQfinish(remote_conn);
 	}
 
 	/*
@@ -753,7 +659,7 @@ get_master_connection(PGconn *standby_conn, char *cluster,
 	 * Probably we will need to check the error to know if we need to start
 	 * failover procedure or just fix some situation on the standby.
 	 */
-	PQclear(res);
+	PQclear(res1);
 	return NULL;
 }
 
@@ -781,7 +687,7 @@ wait_connection_availability(PGconn *conn, long long timeout)
 	{
 		if (PQconsumeInput(conn) == 0)
 		{
-			log_warning(_("wait_connection_availability(): could not receive data from connection. %s\n"),
+			log_warning(_("wait_connection_availability: could not receive data from connection. %s\n"),
 						PQerrorMessage(conn));
 			return 0;
 		}
@@ -808,7 +714,7 @@ wait_connection_availability(PGconn *conn, long long timeout)
 		if (select(sock, &read_set, NULL, NULL, &tmout) == -1)
 		{
 			log_warning(
-						_("wait_connection_availability(): select() returned with error\n%s\n"),
+						_("wait_connection_availability: select() returned with error: %s"),
 						strerror(errno));
 			return -1;
 		}
@@ -824,7 +730,7 @@ wait_connection_availability(PGconn *conn, long long timeout)
 		return 1;
 	}
 
-	log_warning(_("wait_connection_availability(): timeout reached"));
+	log_warning(_("wait_connection_availability: timeout reached"));
 	return -1;
 }
 
@@ -859,12 +765,6 @@ cancel_query(PGconn *conn, int timeout)
 	return true;
 }
 
-
-/* Return the repmgr schema as an unmodified string
- * This is useful for displaying the schema name in log messages,
- * however inclusion in SQL statements, get_repmgr_schema_quoted() should
- * always be used.
- */
 char *
 get_repmgr_schema(void)
 {
@@ -892,9 +792,7 @@ bool
 create_replication_slot(PGconn *conn, char *slot_name)
 {
 	char		sqlquery[QUERY_STR_LEN];
-	int					query_res;
 	PGresult   *res;
-	t_replication_slot  slot_info;
 
 	/*
 	 * Check whether slot exists already; if it exists and is active, that
@@ -902,25 +800,38 @@ create_replication_slot(PGconn *conn, char *slot_name)
 	 * if not we can reuse it as-is
 	 */
 
-	query_res = get_slot_record(conn, slot_name, &slot_info);
+	sqlquery_snprintf(sqlquery,
-
+					  "SELECT active, slot_type "
-	if (query_res)
+                      "  FROM pg_replication_slots "
-	{
+					  " WHERE slot_name = '%s' ",
-		if (strcmp(slot_info.slot_type, "physical") != 0)
-		{
-			log_err(_("Slot '%s' exists and is not a physical slot\n"),
 					  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 (slot_info.active == false)
+	if (PQntuples(res))
 	{
-			log_debug("Replication slot '%s' exists but is inactive; reusing\n",
+		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;
@@ -931,7 +842,6 @@ create_replication_slot(PGconn *conn, char *slot_name)
 					  slot_name);
 
 	log_debug(_("create_replication_slot(): Creating slot '%s' on primary\n"), slot_name);
-	log_verbose(LOG_DEBUG, "create_replication_slot():\n%s\n", sqlquery);
 
 	res = PQexec(conn, sqlquery);
 	if (!res || PQresultStatus(res) != PGRES_TUPLES_OK)
@@ -948,73 +858,6 @@ create_replication_slot(PGconn *conn, char *slot_name)
 }
 
 
-int
-get_slot_record(PGconn *conn, char *slot_name, t_replication_slot *record)
-{
-	char		sqlquery[QUERY_STR_LEN];
-	PGresult   *res;
-
-	sqlquery_snprintf(sqlquery,
-					  "SELECT slot_name, slot_type, active "
-                      "  FROM pg_replication_slots "
-					  " WHERE slot_name = '%s' ",
-					  slot_name);
-
-	log_verbose(LOG_DEBUG, "get_slot_record():\n%s\n", sqlquery);
-
-	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 -1;
-	}
-
-	if (!PQntuples(res))
-	{
-		return 0;
-	}
-
-	strncpy(record->slot_name, PQgetvalue(res, 0, 0), MAXLEN);
-	strncpy(record->slot_type, PQgetvalue(res, 0, 1), MAXLEN);
-	record->active = (strcmp(PQgetvalue(res, 0, 2), "t") == 0)
-		? true
-		: false;
-
-	PQclear(res);
-
-	return 1;
-}
-
-bool
-drop_replication_slot(PGconn *conn, char *slot_name)
-{
-	char		sqlquery[QUERY_STR_LEN];
-	PGresult   *res;
-	sqlquery_snprintf(sqlquery,
-					  "SELECT pg_drop_replication_slot('%s')",
-					  slot_name);
-
-	log_verbose(LOG_DEBUG, "drop_replication_slot():\n%s\n", sqlquery);
-
-	res = PQexec(conn, sqlquery);
-	if (!res || PQresultStatus(res) != PGRES_TUPLES_OK)
-	{
-		log_err(_("unable to drop replication slot \"%s\":\n %s\n"),
-				slot_name,
-				PQerrorMessage(conn));
-		PQclear(res);
-		return false;
-	}
-
-	log_verbose(LOG_DEBUG, "replication slot \"%s\" successfully dropped\n",
-				slot_name);
-
-	return true;
-}
-
-
 bool
 start_backup(PGconn *conn, char *first_wal_segment, bool fast_checkpoint)
 {
@@ -1022,11 +865,11 @@ start_backup(PGconn *conn, char *first_wal_segment, bool fast_checkpoint)
 	PGresult   *res;
 
 	sqlquery_snprintf(sqlquery,
-					  "SELECT pg_catalog.pg_xlogfile_name(pg_catalog.pg_start_backup('repmgr_standby_clone_%ld', %s))",
+					  "SELECT pg_xlogfile_name(pg_start_backup('repmgr_standby_clone_%ld', %s))",
 					  time(NULL),
 					  fast_checkpoint ? "TRUE" : "FALSE");
 
-	log_verbose(LOG_DEBUG, "start_backup():\n%s\n", sqlquery);
+	log_debug(_("standby clone: %s\n"), sqlquery);
 
 	res = PQexec(conn, sqlquery);
 	if (PQresultStatus(res) != PGRES_TUPLES_OK)
@@ -1041,7 +884,7 @@ start_backup(PGconn *conn, char *first_wal_segment, bool fast_checkpoint)
 		char	   *first_wal_seg_pq = PQgetvalue(res, 0, 0);
 		size_t		buf_sz = strlen(first_wal_seg_pq);
 
-		first_wal_segment = pg_malloc0(buf_sz + 1);
+		first_wal_segment = malloc(buf_sz + 1);
 		xsnprintf(first_wal_segment, buf_sz + 1, "%s", first_wal_seg_pq);
 	}
 
@@ -1057,7 +900,7 @@ stop_backup(PGconn *conn, char *last_wal_segment)
 	char		sqlquery[QUERY_STR_LEN];
 	PGresult   *res;
 
-	sqlquery_snprintf(sqlquery, "SELECT pg_catalog.pg_xlogfile_name(pg_catalog.pg_stop_backup())");
+	sqlquery_snprintf(sqlquery, "SELECT pg_xlogfile_name(pg_stop_backup())");
 
 	res = PQexec(conn, sqlquery);
 	if (PQresultStatus(res) != PGRES_TUPLES_OK)
@@ -1072,7 +915,7 @@ stop_backup(PGconn *conn, char *last_wal_segment)
 		char	   *last_wal_seg_pq = PQgetvalue(res, 0, 0);
 		size_t		buf_sz = strlen(last_wal_seg_pq);
 
-		last_wal_segment = pg_malloc0(buf_sz + 1);
+		last_wal_segment =  malloc(buf_sz + 1);
 		xsnprintf(last_wal_segment, buf_sz + 1, "%s", last_wal_seg_pq);
 	}
 
@@ -1093,8 +936,6 @@ set_config_bool(PGconn *conn, const char *config_param, bool state)
 					  config_param,
 					  state ? "TRUE" : "FALSE");
 
-	log_verbose(LOG_DEBUG, "set_config_bool():\n%s\n", sqlquery);
-
 	res = PQexec(conn, sqlquery);
 
 	if (PQresultStatus(res) != PGRES_COMMAND_OK)
@@ -1126,13 +967,11 @@ copy_configuration(PGconn *masterconn, PGconn *witnessconn, char *cluster_name)
 	int			i;
 
 	sqlquery_snprintf(sqlquery, "TRUNCATE TABLE %s.repl_nodes", get_repmgr_schema_quoted(witnessconn));
-
+	log_debug("copy_configuration: %s\n", sqlquery);
-	log_verbose(LOG_DEBUG, "copy_configuration():\n%s\n", sqlquery);
-
 	res = PQexec(witnessconn, sqlquery);
 	if (!res || PQresultStatus(res) != PGRES_COMMAND_OK)
 	{
-		log_err(_("Unable to truncate witness servers's repl_nodes table:\n%s\n"),
+		fprintf(stderr, "Cannot clean node details in the witness, %s\n",
 				PQerrorMessage(witnessconn));
 		return false;
 	}
@@ -1140,13 +979,10 @@ copy_configuration(PGconn *masterconn, PGconn *witnessconn, char *cluster_name)
 	sqlquery_snprintf(sqlquery,
 					  "SELECT id, type, upstream_node_id, name, conninfo, priority, slot_name FROM %s.repl_nodes",
 					  get_repmgr_schema_quoted(masterconn));
-
-	log_verbose(LOG_DEBUG, "copy_configuration():\n%s\n", sqlquery);
-
 	res = PQexec(masterconn, sqlquery);
 	if (PQresultStatus(res) != PGRES_TUPLES_OK)
 	{
-		log_err("Unable to retrieve node records from master:\n%s\n",
+		fprintf(stderr, "Can't get configuration from master: %s\n",
 				PQerrorMessage(masterconn));
 		PQclear(res);
 		return false;
@@ -1155,11 +991,9 @@ copy_configuration(PGconn *masterconn, PGconn *witnessconn, char *cluster_name)
 	for (i = 0; i < PQntuples(res); i++)
 	{
 		bool node_record_created;
+		char *witness = PQgetvalue(res, i, 4);
 
-		log_verbose(LOG_DEBUG,
+		log_debug(_("copy_configuration(): %s\n"), witness);
-					"copy_configuration(): writing node record for node %s (id: %s)\n",
-					PQgetvalue(res, i, 4),
-					PQgetvalue(res, i, 0));
 
 		node_record_created = create_node_record(witnessconn,
 												 "copy_configuration",
@@ -1179,9 +1013,7 @@ copy_configuration(PGconn *masterconn, PGconn *witnessconn, char *cluster_name)
 
 		if (node_record_created == false)
 		{
-			PQclear(res);
+			fprintf(stderr, "Unable to copy node record to witness database: %s\n",
-
-			log_err("Unable to copy node record to witness database\n%s\n",
 					PQerrorMessage(witnessconn));
 			return false;
 		}
@@ -1237,7 +1069,6 @@ create_node_record(PGconn *conn, char *action, int node, char *type, int upstrea
 		maxlen_snprintf(slot_name_buf, "%s", "NULL");
 	}
 
-	/* XXX convert to placeholder query */
 	sqlquery_snprintf(sqlquery,
 					  "INSERT INTO %s.repl_nodes "
 					  "       (id, type, upstream_node_id, cluster, "
@@ -1253,17 +1084,15 @@ create_node_record(PGconn *conn, char *action, int node, char *type, int upstrea
 					  slot_name_buf,
 					  priority);
 
-	log_verbose(LOG_DEBUG, "create_node_record(): %s\n", sqlquery);
-
 	if (action != NULL)
 	{
-		log_verbose(LOG_DEBUG, "create_node_record(): action is \"%s\"\n", action);
+		log_debug(_("%s: %s\n"), action, sqlquery);
 	}
 
 	res = PQexec(conn, sqlquery);
 	if (!res || PQresultStatus(res) != PGRES_COMMAND_OK)
 	{
-		log_err(_("Unable to create node record\n%s\n"),
+		log_warning(_("Unable to create node record: %s\n"),
 					PQerrorMessage(conn));
 		PQclear(res);
 		return false;
@@ -1286,18 +1115,15 @@ delete_node_record(PGconn *conn, int node, char *action)
 					  " WHERE id = %d",
 					  get_repmgr_schema_quoted(conn),
 					  node);
-
-	log_verbose(LOG_DEBUG, "delete_node_record(): %s\n", sqlquery);
-
 	if (action != NULL)
 	{
-		log_verbose(LOG_DEBUG, "create_node_record(): action is \"%s\"\n", action);
+		log_debug(_("%s: %s\n"), action, sqlquery);
 	}
 
 	res = PQexec(conn, sqlquery);
 	if (!res || PQresultStatus(res) != PGRES_COMMAND_OK)
 	{
-		log_err(_("Unable to delete node record: %s\n"),
+		log_warning(_("Unable to delete node record: %s\n"),
 					PQerrorMessage(conn));
 		PQclear(res);
 		return false;
@@ -1369,8 +1195,6 @@ create_event_record(PGconn *conn, t_configuration_options *options, int node_id,
 						  "   RETURNING event_timestamp ",
 						  get_repmgr_schema_quoted(conn));
 
-		log_verbose(LOG_DEBUG, "create_event_record():\n%s\n", sqlquery);
-
 		res = PQexecParams(conn,
 						   sqlquery,
 						   4,
@@ -1382,6 +1206,7 @@ create_event_record(PGconn *conn, t_configuration_options *options, int node_id,
 
 		if (!res || PQresultStatus(res) != PGRES_TUPLES_OK)
 		{
+
 			log_warning(_("Unable to create event record: %s\n"),
 						PQerrorMessage(conn));
 
@@ -1392,7 +1217,7 @@ create_event_record(PGconn *conn, t_configuration_options *options, int node_id,
 		{
 			/* Store timestamp to send to the notification command */
 			strncpy(event_timestamp, PQgetvalue(res, 0, 0), MAXLEN);
-			log_verbose(LOG_DEBUG, "create_event_record(): Event timestamp is \"%s\"\n", event_timestamp);
+			log_debug(_("Event timestamp is: %s\n"), event_timestamp);
 		}
 
 		PQclear(res);
@@ -1512,13 +1337,12 @@ create_event_record(PGconn *conn, t_configuration_options *options, int node_id,
 
 		*dst_ptr = '\0';
 
-		log_debug("create_event_record(): executing\n%s\n", parsed_command);
+		log_debug(_("Executing: %s\n"), parsed_command);
 
 		r = system(parsed_command);
 		if (r != 0)
 		{
 			log_warning(_("Unable to execute event notification command\n"));
-			log_info(_("Parsed event notification command was:\n%s\n"), parsed_command);
 			success = false;
 		}
 	}
@@ -1526,51 +1350,6 @@ create_event_record(PGconn *conn, t_configuration_options *options, int node_id,
 	return success;
 }
 
-
-/*
- * Update node record following change of status
- * (e.g. inactive primary converted to standby)
- */
-bool
-update_node_record_status(PGconn *conn, char *cluster_name, int this_node_id, char *type, int upstream_node_id, bool active)
-{
-	PGresult   *res;
-	char		sqlquery[QUERY_STR_LEN];
-
-	sqlquery_snprintf(sqlquery,
-					  "  UPDATE %s.repl_nodes "
-					  "     SET type = '%s', "
-					  "         upstream_node_id = %i, "
-					  "         active = %s "
-					  "   WHERE cluster = '%s' "
-					  "     AND id = %i ",
-					  get_repmgr_schema_quoted(conn),
-					  type,
-					  upstream_node_id,
-					  active ? "TRUE" : "FALSE",
-					  cluster_name,
-					  this_node_id);
-
-	log_verbose(LOG_DEBUG, "update_node_record_status():\n%s\n", sqlquery);
-
-	res = PQexec(conn, sqlquery);
-
-	if (PQresultStatus(res) != PGRES_COMMAND_OK)
-	{
-		log_err(_("Unable to update node record: %s\n"),
-				PQerrorMessage(conn));
-		PQclear(res);
-
-		return false;
-	}
-
-	PQclear(res);
-
-	return true;
-
-}
-
-
 bool
 update_node_record_set_upstream(PGconn *conn, char *cluster_name, int this_node_id, int new_upstream_node_id)
 {
@@ -1588,9 +1367,6 @@ update_node_record_set_upstream(PGconn *conn, char *cluster_name, int this_node_
 					  new_upstream_node_id,
 					  cluster_name,
 					  this_node_id);
-
-	log_verbose(LOG_DEBUG, "update_node_record_set_upstream():\n%s\n", sqlquery);
-
 	res = PQexec(conn, sqlquery);
 
 	if (PQresultStatus(res) != PGRES_COMMAND_OK)
@@ -1608,16 +1384,13 @@ update_node_record_set_upstream(PGconn *conn, char *cluster_name, int this_node_
 }
 
 
-int
+PGresult *
-get_node_record(PGconn *conn, char *cluster, int node_id, t_node_info *node_info)
+get_node_record(PGconn *conn, char *cluster, int node_id)
 {
 	char		sqlquery[QUERY_STR_LEN];
-	PGresult   *res;
-	int         ntuples;
 
-	sqlquery_snprintf(
+	sprintf(sqlquery,
-		sqlquery,
+			"SELECT id, upstream_node_id, conninfo, type, slot_name, active "
-		"SELECT id, type, upstream_node_id, name, conninfo, slot_name, priority, active"
 			"  FROM %s.repl_nodes "
 			" WHERE cluster = '%s' "
 			"   AND id = %i",
@@ -1625,118 +1398,7 @@ get_node_record(PGconn *conn, char *cluster, int node_id, t_node_info *node_info
 			cluster,
 			node_id);
 
-	log_verbose(LOG_DEBUG, "get_node_record():\n%s\n", sqlquery);
+	log_debug("get_node_record(): %s\n", sqlquery);
 
-	res = PQexec(conn, sqlquery);
+	return PQexec(conn, sqlquery);
-	if (PQresultStatus(res) != PGRES_TUPLES_OK)
-	{
-		return -1;
-	}
-
-	ntuples = PQntuples(res);
-
-	if (ntuples == 0)
-	{
-		log_verbose(LOG_DEBUG, "get_node_record(): no record found for node %i\n", node_id);
-		return 0;
-	}
-
-	node_info->node_id = atoi(PQgetvalue(res, 0, 0));
-	node_info->type = parse_node_type(PQgetvalue(res, 0, 1));
-	node_info->upstream_node_id = atoi(PQgetvalue(res, 0, 2));
-	strncpy(node_info->name, PQgetvalue(res, 0, 3), MAXLEN);
-	strncpy(node_info->conninfo_str, PQgetvalue(res, 0, 4), MAXLEN);
-	strncpy(node_info->slot_name, PQgetvalue(res, 0, 5), MAXLEN);
-	node_info->priority = atoi(PQgetvalue(res, 0, 6));
-	node_info->active = (strcmp(PQgetvalue(res, 0, 7), "t") == 0)
-		? true
-		: false;
-
-	PQclear(res);
-
-	return ntuples;
-}
-
-
-int
-get_node_replication_state(PGconn *conn, char *node_name, char *output)
-{
-	char		sqlquery[QUERY_STR_LEN];
-	PGresult *	res;
-
-	sqlquery_snprintf(
-		sqlquery,
-		" SELECT state "
-		"   FROM pg_catalog.pg_stat_replication"
-        "  WHERE application_name = '%s'",
-		node_name
-		);
-
-	res = PQexec(conn, sqlquery);
-
-	if (PQresultStatus(res) != PGRES_TUPLES_OK)
-	{
-		PQclear(res);
-		return -1;
-	}
-
-	if (PQntuples(res) == 0)
-	{
-		PQclear(res);
-		return 0;
-	}
-
-	strncpy(output, PQgetvalue(res, 0, 0), MAXLEN);
-	PQclear(res);
-
-	return true;
-
-}
-
-t_server_type
-parse_node_type(const char *type)
-{
-	if (strcmp(type, "master") == 0)
-	{
-		return MASTER;
-	}
-	else if (strcmp(type, "standby") == 0)
-	{
-		return STANDBY;
-	}
-	else if (strcmp(type, "witness") == 0)
-	{
-		return WITNESS;
-	}
-
-	return UNKNOWN;
-}
-
-
-int
-get_data_checksum_version(const char *data_directory)
-{
-	ControlFileData control_file;
-	int				fd;
-	char			control_file_path[MAXPGPATH];
-
-	snprintf(control_file_path, MAXPGPATH, "%s/global/pg_control", data_directory);
-	if ((fd = open(control_file_path, O_RDONLY | PG_BINARY, 0)) == -1)
-	{
-		log_err(_("Unable to open control file \"%s\" for reading: %s\n"),
-				control_file_path, strerror(errno));
-		return -1;
-	}
-
-	if (read(fd, &control_file, sizeof(ControlFileData)) != sizeof(ControlFileData))
-	{
-		log_err(_("could not read file \"%s\": %s\n"),
-				control_file_path, strerror(errno));
-		close(fd);
-		return -1;
-	}
-
-	close(fd);
-
-	return (int)control_file.data_checksum_version;
 }

dbutils.h

@@ -1,6 +1,6 @@
 /*
  * dbutils.h
- * Copyright (c) 2ndQuadrant, 2010-2016
+ * Copyright (c) 2ndQuadrant, 2010-2015
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -20,71 +20,13 @@
 #ifndef _REPMGR_DBUTILS_H_
 #define _REPMGR_DBUTILS_H_
 
-#include "access/xlogdefs.h"
-
 #include "config.h"
 #include "strutil.h"
 
 
-typedef enum {
-	UNKNOWN = 0,
-	MASTER,
-	STANDBY,
-	WITNESS
-} t_server_type;
 
-/*
- * Struct to store node information
- */
-typedef struct s_node_info
-{
-	int			  node_id;
-	int			  upstream_node_id;
-	t_server_type type;
-	char		  name[MAXLEN];
-	char		  conninfo_str[MAXLEN];
-	char		  slot_name[MAXLEN];
-	int			  priority;
-	bool		  active;
-	bool		  is_ready;
-	bool		  is_visible;
-	XLogRecPtr	  xlog_location;
-}	t_node_info;
-
-
-/*
- * Struct to store replication slot information
- */
-
-typedef struct s_replication_slot
-{
-	char slot_name[MAXLEN];
-    char slot_type[MAXLEN];
-	bool active;
-}   t_replication_slot;
-
-
-#define T_NODE_INFO_INITIALIZER { \
-  NODE_NOT_FOUND, \
-  NO_UPSTREAM_NODE, \
-  UNKNOWN, \
-  "", \
-  "", \
-  "", \
-  DEFAULT_PRIORITY, \
-  true, \
-  false, \
-  false, \
-  InvalidXLogRecPtr \
-}
-
-PGconn *_establish_db_connection(const char *conninfo,
-								 const bool exit_on_error,
-								 const bool log_notice);
 PGconn *establish_db_connection(const char *conninfo,
 						const bool exit_on_error);
-PGconn *test_db_connection(const char *conninfo,
-						   const bool exit_on_error);
 PGconn *establish_db_connection_by_params(const char *keywords[],
 								  const char *values[],
 								  const bool exit_on_error);
@@ -103,7 +45,7 @@ int			guc_set(PGconn *conn, const char *parameter, const char *op,
 			const char *value);
 int			guc_set_typed(PGconn *conn, const char *parameter, const char *op,
 			  const char *value, const char *datatype);
-bool		get_conninfo_value(const char *conninfo, const char *keyword, char *output);
+
 PGconn     *get_upstream_connection(PGconn *standby_conn, char *cluster,
 									int node_id,
 									int *upstream_node_id_ptr,
@@ -116,20 +58,15 @@ bool		cancel_query(PGconn *conn, int timeout);
 char       *get_repmgr_schema(void);
 char       *get_repmgr_schema_quoted(PGconn *conn);
 bool		create_replication_slot(PGconn *conn, char *slot_name);
-int			get_slot_record(PGconn *conn, char *slot_name, t_replication_slot *record);
+
-bool		drop_replication_slot(PGconn *conn, char *slot_name);
 bool		start_backup(PGconn *conn, char *first_wal_segment, bool fast_checkpoint);
 bool		stop_backup(PGconn *conn, char *last_wal_segment);
 bool		set_config_bool(PGconn *conn, const char *config_param, bool state);
 bool		copy_configuration(PGconn *masterconn, PGconn *witnessconn, char *cluster_name);
 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);
-int			get_node_record(PGconn *conn, char *cluster, int node_id, t_node_info *node_info);
-bool        update_node_record_status(PGconn *conn, char *cluster_name, int this_node_id, char *type, int upstream_node_id, bool active);
-bool        update_node_record_set_upstream(PGconn *conn, char *cluster_name, int this_node_id, int new_upstream_node_id);
 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);
 
-int		    get_node_replication_state(PGconn *conn, char *node_name, char *output);
-t_server_type parse_node_type(const char *type);
-int			get_data_checksum_version(const char *data_directory);
 #endif

debian/DEBIAN/control

@@ -1,9 +1,9 @@
 Package: repmgr-auto
-Version: 3.0.1
+Version: 2.0beta2
 Section: database
 Priority: optional
 Architecture: all
-Depends: rsync, postgresql-9.3 | postgresql-9.4
+Depends: rsync, postgresql-9.0 | postgresql-9.1 | postgresql-9.2 | postgresql-9.3 | postgresql-9.4
-Maintainer: Self built package <user@localhost>
+Maintainer: Jaime Casanova <jaime@2ndQuadrant.com>
 Description: PostgreSQL replication setup, magament and monitoring
  has two main executables

debian/repmgr.repmgrd.init

@@ -59,7 +59,7 @@ do_stop()
 	#   0 if daemon has been stopped
 	#   1 if daemon was already stopped
 	#   other if daemon could not be stopped or a failure occurred
-	start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $REPMGRD_PIDFILE --name "$(basename $REPMGRD_BIN)"
+	start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $REPMGRD_PIDFILE --exec $REPMGRD_BIN
 }
 
 case "$1" in

errcode.h

@@ -1,6 +1,6 @@
 /*
  * errcode.h
- * Copyright (C) 2ndQuadrant, 2010-2016
+ * Copyright (C) 2ndQuadrant, 2010-2015
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -36,6 +36,5 @@
 #define ERR_SYS_FAILURE 13
 #define ERR_BAD_BASEBACKUP 14
 #define ERR_INTERNAL 15
-#define ERR_MONITORING_FAIL 16
 
 #endif   /* _ERRCODE_H_ */

log.c

@@ -1,6 +1,6 @@
 /*
  * log.c - Logging methods
- * Copyright (C) 2ndQuadrant, 2010-2016
+ * Copyright (C) 2ndQuadrant, 2010-2015
  *
  * This module is a set of methods for logging (currently only syslog)
  *
@@ -39,37 +39,13 @@
 
 /* #define REPMGR_DEBUG */
 
-static int	detect_log_facility(const char *facility);
-static void _stderr_log_with_level(const char *level_name, int level, const char *fmt, va_list ap);
-
-int			log_type = REPMGR_STDERR;
-int			log_level = LOG_NOTICE;
-int			last_log_level = LOG_NOTICE;
-int			verbose_logging = false;
-int			terse_logging = false;
-
 void
 stderr_log_with_level(const char *level_name, int level, const char *fmt, ...)
-{
-	va_list		arglist;
-
-	va_start(arglist, fmt);
-	_stderr_log_with_level(level_name, level, fmt, arglist);
-	va_end(arglist);
-}
-
-static void
-_stderr_log_with_level(const char *level_name, int level, const char *fmt, va_list ap)
 {
 	time_t		t;
 	struct tm  *tm;
 	char		buff[100];
-
+	va_list		ap;
-	/*
-	 * Store the requested level so that if there's a subsequent
-	 * log_hint(), we can suppress that if appropriate.
-	 */
-	last_log_level = level;
 
 	if (log_level >= level)
 	{
@@ -78,74 +54,24 @@ _stderr_log_with_level(const char *level_name, int level, const char *fmt, va_li
 		strftime(buff, 100, "[%Y-%m-%d %H:%M:%S]", tm);
 		fprintf(stderr, "%s [%s] ", buff, level_name);
 
+		va_start(ap, fmt);
 		vfprintf(stderr, fmt, ap);
+		va_end(ap);
 
 		fflush(stderr);
 	}
 }
 
-void
-log_hint(const char *fmt, ...)
-{
-	va_list		ap;
 
-	if (terse_logging == false)
+static int	detect_log_level(const char *level);
-	{
+static int	detect_log_facility(const char *facility);
-		va_start(ap, fmt);
-		_stderr_log_with_level("HINT", last_log_level, fmt, ap);
-		va_end(ap);
-	}
-}
-
-
-void
-log_verbose(int level, const char *fmt, ...)
-{
-	va_list		ap;
-
-	va_start(ap, fmt);
-
-	if (verbose_logging == true)
-	{
-		switch(level)
-		{
-			case LOG_EMERG:
-				_stderr_log_with_level("EMERG", level, fmt, ap);
-				break;
-			case LOG_ALERT:
-				_stderr_log_with_level("ALERT", level, fmt, ap);
-				break;
-			case LOG_CRIT:
-				_stderr_log_with_level("CRIT", level, fmt, ap);
-				break;
-			case LOG_ERR:
-				_stderr_log_with_level("ERR", level, fmt, ap);
-				break;
-			case LOG_WARNING:
-				_stderr_log_with_level("WARNING", level, fmt, ap);
-				break;
-			case LOG_NOTICE:
-				_stderr_log_with_level("NOTICE", level, fmt, ap);
-				break;
-			case LOG_INFO:
-				_stderr_log_with_level("INFO", level, fmt, ap);
-				break;
-			case LOG_DEBUG:
-				_stderr_log_with_level("DEBUG", level, fmt, ap);
-				break;
-		}
-	}
-
-	va_end(ap);
-}
 
+int			log_type = REPMGR_STDERR;
+int			log_level = LOG_NOTICE;
 
 bool
-logger_init(t_configuration_options * opts, const char *ident)
+logger_init(t_configuration_options * opts, const char *ident, const char *level, const char *facility)
 {
-	char	   *level = opts->loglevel;
-	char	   *facility = opts->logfacility;
-
 	int			l;
 	int			f;
 
@@ -169,10 +95,10 @@ logger_init(t_configuration_options * opts, const char *ident)
 		printf("Assigned level for logger: %d\n", l);
 #endif
 
-		if (l >= 0)
+		if (l > 0)
 			log_level = l;
 		else
-			stderr_log_warning(_("Invalid log level \"%s\" (available values: DEBUG, INFO, NOTICE, WARNING, ERR, ALERT, CRIT or EMERG)\n"), level);
+			stderr_log_warning(_("Cannot detect log level %s (use any of DEBUG, INFO, NOTICE, WARNING, ERR, ALERT, CRIT or EMERG)\n"), level);
 	}
 
 	if (facility && *facility)
@@ -248,8 +174,8 @@ logger_init(t_configuration_options * opts, const char *ident)
 	}
 
 	return true;
-}
 
+}
 
 bool
 logger_shutdown(void)
@@ -263,32 +189,17 @@ logger_shutdown(void)
 }
 
 /*
- * Indicate whether extra-verbose logging is required. This will
+ * Set a minimum logging level.  Intended for command line verbosity
- * generate a lot of output, particularly debug logging, and should
+ * options, which might increase requested logging over what's specified
- * not be permanently enabled in production.
+ * in the regular configuration file.
- *
- * NOTE: in previous repmgr versions, this option forced the log
- * level to INFO.
  */
 void
-logger_set_verbose(void)
+logger_min_verbose(int minimum)
 {
-	verbose_logging = true;
+	if (log_level < minimum)
+		log_level = minimum;
 }
 
-
-/*
- * Indicate whether some non-critical log messages can be omitted.
- * Currently this includes warnings about irrelevant command line
- * options and hints.
- */
-
-void logger_set_terse(void)
-{
-	terse_logging = true;
-}
-
-
 int
 detect_log_level(const char *level)
 {
@@ -309,16 +220,17 @@ detect_log_level(const char *level)
 	if (!strcmp(level, "EMERG"))
 		return LOG_EMERG;
 
-	return -1;
+	return 0;
 }
 
-static int
+int
 detect_log_facility(const char *facility)
 {
 	int			local = 0;
 
 	if (!strncmp(facility, "LOCAL", 5) && strlen(facility) == 6)
 	{
+
 		local = atoi(&facility[5]);
 
 		switch (local)

log.h

@@ -1,6 +1,6 @@
 /*
  * log.h
- * Copyright (c) 2ndQuadrant, 2010-2016
+ * Copyright (c) 2ndQuadrant, 2010-2015
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -112,19 +112,13 @@ __attribute__((format(PG_PRINTF_ATTRIBUTE, 3, 4)));
 #endif
 
 
-int			detect_log_level(const char *level);
-
 /* Logger initialisation and shutdown */
-
-bool		logger_init(t_configuration_options * opts, const char *ident);
-
 bool		logger_shutdown(void);
 
-void		logger_set_verbose(void);
+bool logger_init(t_configuration_options * opts, const char *ident,
-void		logger_set_terse(void);
+			const char *level, const char *facility);
 
-void		log_hint(const char *fmt, ...);
+void		logger_min_verbose(int minimum);
-void		log_verbose(int level, const char *fmt, ...);
 
 extern int	log_type;
 extern int	log_level;

repmgr.conf.sample

@@ -2,10 +2,6 @@
 # Replication Manager sample configuration file
 ###################################################
 
-# Some configuration items will be set with a default value; this
-# is noted for each item. Where no default value is shown, the
-# parameter will be treated as empty or false.
-
 # Required configuration items
 # ============================
 #
@@ -20,15 +16,11 @@ cluster=example_cluster
 # Node ID and name
 # (Note: we recommend to avoid naming nodes after their initial
 #  replication funcion, as this will cause confusion when e.g.
-#  "standby2" is promoted to primary)
+#  "standby2" is promoted to master)
-node=2           # a unique integer
+node=2
-node_name=node2  # an arbitrary (but unique) string; we recommend using
+node_name=node2
-                 # the server's hostname or another identifier unambiguously
-                 # associated with the server to avoid confusion
 
-# Database connection information as a conninfo string
+# Database connection information
-# This must be accessible to all servers in the cluster; for details see:
-#   http://www.postgresql.org/docs/current/static/libpq-connect.html#LIBPQ-CONNSTRING
 conninfo='host=192.168.204.104 dbname=repmgr_db user=repmgr_usr'
 
 # Optional configuration items
@@ -40,15 +32,15 @@ conninfo='host=192.168.204.104 dbname=repmgr_db user=repmgr_usr'
 # when using cascading replication and a standby is to be connected to an
 # upstream standby, specify that node's ID with 'upstream_node'. The node
 # must exist before the new standby can be registered. If a standby is
-# to connect directly to a primary node, this parameter is not required.
+# to connect directly to a master node, this parameter is not required.
-upstream_node=1
+#
+# upstream_node=1
 
-# use physical replication slots - PostgreSQL 9.4 and later only
+# physical replication slots - PostgreSQL 9.4 and later only
 # (default: 0)
-use_replication_slots=0
+#
+# use_replication_slots=0
 
-# NOTE: 'max_replication_slots' should be configured for at least the
-# number of standbys which will connect to the primary.
 
 # Logging and monitoring settings
 # -------------------------------
@@ -63,7 +55,7 @@ logfacility=STDERR
 
 # stderr can be redirected to an arbitrary file:
 #
-logfile='/var/log/repmgr/repmgr.log'
+# logfile='/var/log/repmgr.log'
 
 # event notifications can be passed to an arbitrary external program
 # together with the following parameters:
@@ -77,12 +69,12 @@ logfile='/var/log/repmgr/repmgr.log'
 # the values provided for "%t" and "%d" will probably contain spaces,
 # so should be quoted in the provided command configuration, e.g.:
 #
-event_notification_command='/path/to/some/script %n %e %s "%t" "%d"'
+# event_notification_command='/path/to/some/script %n %e %s "%t" "%d"'
 
 # By default, all notifications will be passed; the notification types
 # can be filtered to explicitly named ones:
 #
-event_notifications=master_register,standby_register,witness_create
+# event_notifications=master_register,standby_register,witness_create
 
 
 # Environment/command settings
@@ -90,17 +82,17 @@ event_notifications=master_register,standby_register,witness_create
 
 # path to PostgreSQL binary directory (location of pg_ctl, pg_basebackup etc.)
 # (if not provided, defaults to system $PATH)
-pg_bindir=/usr/bin/
+# pg_bindir=/usr/bin/
 
 # external command options
 
-rsync_options=--archive --checksum --compress --progress --rsh="ssh -o \"StrictHostKeyChecking no\""
+# rsync_options=--archive --checksum --compress --progress --rsh="ssh -o \"StrictHostKeyChecking no\""
-ssh_options=-o "StrictHostKeyChecking no"
+# ssh_options=-o "StrictHostKeyChecking no"
 
-# external command arguments. Values shown are examples.
+# external command arguments
 
-pg_ctl_options='-s'
+# pg_ctl_options='-s'
-pg_basebackup_options='--xlog-method=s'
+# pg_basebackup_options='--xlog-method=s'
 
 
 # Standby clone settings
@@ -116,33 +108,30 @@ pg_basebackup_options='--xlog-method=s'
 # Failover settings (repmgrd)
 # ---------------------------
 #
-# These settings are only applied when repmgrd is running. Values shown
+# These settings are only applied when repmgrd is running.
-# are defaults.
-
-# Number of seconds to wait for a response from the primary server before
-# deciding it has failed.
 
+# How many seconds we wait for master response before declaring master failure
 master_response_timeout=60
 
-# Number of attempts at what interval (in seconds) to try and
+# How many time we try to reconnect to master before starting failover procedure
-# connect to  a server to establish its status (e.g. master
-# during failover)
 reconnect_attempts=6
 reconnect_interval=10
 
 # Autofailover options
-failover=manual     # one of 'automatic', 'manual'
+failover=automatic  # one of 'automatic', 'manual'
-                    # (default: manual)
+priority=100        # a value of zero or less prevents the node being promoted to master
-priority=100        # a value of zero or less prevents the node being promoted to primary
-                    # (default: 100)
 promote_command='repmgr standby promote -f /path/to/repmgr.conf'
 follow_command='repmgr standby follow -f /path/to/repmgr.conf -W'
 
-# monitoring interval in seconds; default is 2
+# monitoring interval; default is 2s
-monitor_interval_secs=2
+#
+# monitor_interval_secs=2
 
-# change wait time for primary; before we bail out and exit when the primary
+# change wait time for master; before we bail out and exit when the master
 # disappears, we wait 'reconnect_attempts' * 'retry_promote_interval_secs'
 # seconds; by default this would be half an hour, as 'retry_promote_interval_secs'
 # default value is 300)
-retry_promote_interval_secs=300
+#
+# retry_promote_interval_secs=300
+
+

repmgr.h

@@ -1,6 +1,6 @@
 /*
  * repmgr.h
- * Copyright (c) 2ndQuadrant, 2010-2016
+ * Copyright (c) 2ndQuadrant, 2010-2015
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -36,8 +36,11 @@
 #define MAXFILENAME		1024
 #define ERRBUFF_SIZE	512
 
+#define DEFAULT_CONFIG_FILE		"./repmgr.conf"
 #define DEFAULT_WAL_KEEP_SEGMENTS	"5000"
 #define DEFAULT_DEST_DIR		"."
+#define DEFAULT_MASTER_PORT		"5432"
+#define DEFAULT_DBNAME			"postgres"
 #define DEFAULT_REPMGR_SCHEMA_PREFIX	"repmgr_"
 #define DEFAULT_PRIORITY		100
 #define FAILOVER_NODES_MAX_CHECK 50
@@ -46,7 +49,14 @@
 #define AUTOMATIC_FAILOVER	1
 #define NODE_NOT_FOUND      -1
 #define NO_UPSTREAM_NODE	-1
-#define UNKNOWN_NODE_ID     -1
+
+
+typedef enum {
+    UNKNOWN = 0,
+	MASTER,
+	STANDBY,
+	WITNESS
+} t_server_type;
 
 
 
@@ -63,7 +73,6 @@ typedef struct
 	char		superuser[MAXLEN];
 	char		wal_keep_segments[MAXLEN];
 	bool		verbose;
-	bool		terse;
 	bool		force;
 	bool		wait_for_master;
 	bool		ignore_rsync_warn;
@@ -71,33 +80,31 @@ typedef struct
 	bool		rsync_only;
 	bool		fast_checkpoint;
 	bool		ignore_external_config_files;
-	char		pg_ctl_mode[MAXLEN];
 	char		masterport[MAXLEN];
-	/*
+	char		localport[MAXLEN];
-	 * configuration file parameters which can be overridden on the
-	 * command line
-	 */
-	char		loglevel[MAXLEN];
 
-	/* parameter used by STANDBY SWITCHOVER */
-	char		remote_config_file[MAXLEN];
-	char		pg_rewind[MAXFILENAME];
-	/* parameter used by STANDBY {ARCHIVE_CONFIG | RESTORE_CONFIG} */
-	char		config_archive_dir[MAXLEN];
 	/* parameter used by CLUSTER CLEANUP */
 	int			keep_history;
 
 	char		pg_bindir[MAXLEN];
 
 	char		recovery_min_apply_delay[MAXLEN];
-
-	/* deprecated command line option */
-	char		localport[MAXLEN];
 }	t_runtime_options;
 
-#define T_RUNTIME_OPTIONS_INITIALIZER { "", "", "", "", "", "", "", DEFAULT_WAL_KEEP_SEGMENTS, false, false, false, false, false, false, false, false, false, "smart", "", "", "", "", "", 0, "", "", "" }
+#define T_RUNTIME_OPTIONS_INITIALIZER { "", "", "", "", "", "", "", DEFAULT_WAL_KEEP_SEGMENTS, false, false, false, false, false, false, false, false, "", "", 0, "", "" }
 
 extern char		repmgr_schema[MAXLEN];
-extern bool		config_file_found;
+
+typedef struct ErrorListCell
+{
+	struct ErrorListCell *next;
+	char			     *error_message;
+} ErrorListCell;
+
+typedef struct ErrorList
+{
+	ErrorListCell *head;
+	ErrorListCell *tail;
+} ErrorList;
 
 #endif

repmgr.sql

@@ -1,7 +1,7 @@
 /*
  * repmgr.sql
  *
- * Copyright (C) 2ndQuadrant, 2010-2016
+ * Copyright (C) 2ndQuadrant, 2010-2015
  *
  */
 
@@ -59,12 +59,3 @@ WHERE (standby_node, last_monitor_time) IN (SELECT standby_node, MAX(last_monito
 ALTER VIEW repl_status OWNER TO repmgr;
 
 CREATE INDEX idx_repl_status_sort ON repl_monitor(last_monitor_time, standby_node);
-
-/*
- * This view shows the list of nodes with the information of which one is the upstream
- * in each case (when appliable)
- */
-CREATE VIEW repl_show_nodes AS 
-SELECT rn.id, rn.conninfo, rn.type, rn.name, rn.cluster,
-	rn.priority, rn.active, sq.name AS upstream_node_name
-FROM repl_nodes as rn LEFT JOIN repl_nodes AS sq ON sq.id=rn.upstream_node_id;

repmgrd.c

@@ -1,6 +1,6 @@
 /*
  * repmgrd.c - Replication manager daemon
- * Copyright (C) 2ndQuadrant, 2010-2016
+ * Copyright (C) 2ndQuadrant, 2010-2015
  *
  * This module connects to the nodes of a replication cluster and monitors
  * how far are they from master
@@ -41,6 +41,22 @@
 #include "access/xlogdefs.h"
 #include "pqexpbuffer.h"
 
+/*
+ * Struct to store node information
+ */
+typedef struct s_node_info
+{
+	int			node_id;
+    int			upstream_node_id;
+	char		conninfo_str[MAXLEN];
+	XLogRecPtr	xlog_location;
+    t_server_type type;
+	bool		is_ready;
+	bool		is_visible;
+	char		slot_name[MAXLEN];
+	bool		active;
+}	t_node_info;
+
 
 
 /* Local info */
@@ -52,7 +68,9 @@ t_configuration_options master_options;
 
 PGconn	   *master_conn = NULL;
 
-char	   *config_file = "";
+const char *progname;
+
+char	   *config_file = DEFAULT_CONFIG_FILE;
 bool		verbose = false;
 bool		monitoring_history = false;
 t_node_info node_info;
@@ -63,7 +81,7 @@ char	   *pid_file = NULL;
 
 t_configuration_options config = T_CONFIGURATION_OPTIONS_INITIALIZER;
 
-static void help(void);
+static void help(const char *progname);
 static void usage(void);
 static void check_cluster_configuration(PGconn *conn);
 static void check_node_configuration(void);
@@ -71,7 +89,7 @@ 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, const char *conninfo);
-static bool set_local_node_status(void);
+static bool set_local_node_failed(void);
 
 static void update_shared_memory(char *last_wal_standby_applied);
 static void update_registration(void);
@@ -79,6 +97,7 @@ static void do_master_failover(void);
 static bool do_upstream_standby_failover(t_node_info upstream_node);
 
 static t_node_info get_node_info(PGconn *conn, char *cluster, int node_id);
+static t_server_type parse_node_type(const char *type);
 static XLogRecPtr lsn_to_xlogrecptr(char *lsn, bool *format_ok);
 
 /*
@@ -139,10 +158,9 @@ main(int argc, char **argv)
 	FILE	   *fd;
 
 	int			server_version_num = 0;
+	progname = get_progname(argv[0]);
 
-	set_progname(argv[0]);
+	while ((c = getopt_long(argc, argv, "?Vf:v:mdp:", long_options, &optindex)) != -1)
-
-	while ((c = getopt_long(argc, argv, "?Vf:vmdp:", long_options, &optindex)) != -1)
 	{
 		switch (c)
 		{
@@ -162,10 +180,10 @@ main(int argc, char **argv)
 				pid_file = optarg;
 				break;
 			case '?':
-				help();
+				help(progname);
 				exit(SUCCESS);
 			case 'V':
-				printf("%s %s (PostgreSQL %s)\n", progname(), REPMGR_VERSION, PG_VERSION);
+				printf("%s %s (PostgreSQL %s)\n", progname, REPMGR_VERSION, PG_VERSION);
 				exit(SUCCESS);
 			default:
 				usage();
@@ -182,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.
 	 */
-	load_config(config_file, verbose, &local_options, argv[0]);
+	load_config(config_file, &local_options, argv[0]);
 
 	if (daemonize)
 	{
@@ -212,9 +230,10 @@ main(int argc, char **argv)
 				strerror(errno));
 	}
 
-	logger_init(&local_options, progname());
+	logger_init(&local_options, progname, local_options.loglevel,
+				local_options.logfacility);
 	if (verbose)
-		logger_set_verbose();
+		logger_min_verbose(LOG_INFO);
 
 	if (log_type == REPMGR_SYSLOG)
 	{
@@ -228,7 +247,6 @@ main(int argc, char **argv)
 	}
 
 	/* Initialise the repmgr schema name */
-	/* XXX check this handles quoting properly */
 	maxlen_snprintf(repmgr_schema, "%s%s", DEFAULT_REPMGR_SCHEMA_PREFIX,
 			 local_options.cluster_name);
 
@@ -246,7 +264,7 @@ main(int argc, char **argv)
 		if (server_version_num > 0)
 		{
 			log_err(_("%s requires PostgreSQL %s or later\n"),
-					progname(),
+					progname,
 					MIN_SUPPORTED_VERSION) ;
 		}
 		else
@@ -264,7 +282,7 @@ main(int argc, char **argv)
 	if (node_info.node_id == NODE_NOT_FOUND)
 	{
 		log_err(_("No metadata record found for this node - terminating\n"));
-		log_hint(_("Check that 'repmgr (master|standby) register' was executed for this node\n"));
+		log_notice(_("HINT: was this node registered with 'repmgr (master|standby) register'?\n"));
 		terminate(ERR_BAD_CONFIG);
 	}
 
@@ -389,7 +407,7 @@ main(int argc, char **argv)
 
 					appendPQExpBuffer(&errmsg,
 									  _("unable to connect to master node '%s'"),
-									  master_options.node_name);
+									  local_options.cluster_name);
 
 					log_err("%s\n", errmsg.data);
 
@@ -439,7 +457,7 @@ main(int argc, char **argv)
 
 				do
 				{
-					log_verbose(LOG_DEBUG, "standby check loop...\n");
+					log_debug("standby check loop...\n");
 
 					if (node_info.type == WITNESS)
 					{
@@ -449,7 +467,6 @@ main(int argc, char **argv)
 					{
 						standby_monitor();
 					}
-
 					sleep(local_options.monitor_interval_secs);
 
 					if (got_SIGHUP)
@@ -541,10 +558,10 @@ witness_monitor(void)
 			{
 				log_warning(
 					_("unable to determine a valid master server; waiting %i seconds to retry...\n"),
-					local_options.reconnect_interval
+					local_options.reconnect_intvl
 					);
 				PQfinish(master_conn);
-				sleep(local_options.reconnect_interval);
+				sleep(local_options.reconnect_intvl);
 			}
 			else
 			{
@@ -657,7 +674,6 @@ standby_monitor(void)
 	char		last_wal_standby_received[MAXLEN];
 	char		last_wal_standby_applied[MAXLEN];
 	char		last_wal_standby_applied_timestamp[MAXLEN];
-	bool		last_wal_standby_received_gte_replayed;
 	char		sqlquery[QUERY_STR_LEN];
 
 	XLogRecPtr	lsn_master;
@@ -685,16 +701,23 @@ standby_monitor(void)
 	{
 		PQExpBufferData errmsg;
 
-		set_local_node_status();
+		set_local_node_failed();
 
 		initPQExpBuffer(&errmsg);
 
 		appendPQExpBuffer(&errmsg,
-						  _("failed to connect to local node, node marked as failed!"));
+						  _("failed to connect to local node, node marked as failed and terminating!"));
 
 		log_err("%s\n", errmsg.data);
 
-		goto continue_monitoring_standby;
+		create_event_record(master_conn,
+							&local_options,
+							local_options.node,
+							"repmgrd_shutdown",
+							false,
+							errmsg.data);
+
+		terminate(ERR_DB_CON);
 	}
 
 	upstream_conn = get_upstream_connection(my_local_conn,
@@ -715,7 +738,7 @@ standby_monitor(void)
 	check_connection(&upstream_conn, type, upstream_conninfo);
 	/*
 	 * This takes up to local_options.reconnect_attempts *
-	 * local_options.reconnect_interval seconds
+	 * local_options.reconnect_intvl seconds
 	 */
 
 	if (PQstatus(upstream_conn) != CONNECTION_OK)
@@ -823,7 +846,6 @@ standby_monitor(void)
 
 	PQfinish(upstream_conn);
 
-  continue_monitoring_standby:
 	/* Check if we still are a standby, we could have been promoted */
 	do
 	{
@@ -839,13 +861,10 @@ standby_monitor(void)
 				 * will require manual resolution as there's no way of determing
 				 * which master is the correct one.
 				 *
-				 * We should log a message so the user knows of the situation at hand.
-				 *
 				 * XXX check if the original master is still active and display a
 				 * warning
 				 */
-				log_err(_("It seems this server was promoted manually (not by repmgr) so you might by in the presence of a split-brain.\n"));
+				log_err(_("It seems like we have been promoted, so exit from monitoring...\n"));
-				log_err(_("Check your cluster and manually fix any anomaly.\n"));
 				terminate(1);
 				break;
 
@@ -855,11 +874,8 @@ standby_monitor(void)
 
 				if (!check_connection(&my_local_conn, "standby", NULL))
 				{
-					set_local_node_status();
+					set_local_node_failed();
-					/*
+					terminate(0);
-					 * Let's continue checking, and if the postgres server on the
-					 * standby comes back up, we will activate it again
-					 */
 				}
 
 				break;
@@ -868,13 +884,6 @@ standby_monitor(void)
 
 	if (did_retry)
 	{
-		/*
-		 * There's a possible situation where the standby went down for some reason
-		 * (maintenance for example) and is now up and maybe connected once again to
-		 * the stream. If we set the local standby node as failed and it's now running
-		 * and receiving replication data, we should activate it again.
-		 */
-	        set_local_node_status();
 		log_info(_("standby connection recovered!\n"));
 	}
 
@@ -882,6 +891,7 @@ standby_monitor(void)
 	if (!monitoring_history)
 		return;
 
+
 	/*
 	 * If original master has gone away we'll need to get the new one
 	 * from the upstream node to write monitoring information
@@ -943,8 +953,7 @@ standby_monitor(void)
 	/* Get local xlog info */
 	sqlquery_snprintf(sqlquery,
 					  "SELECT CURRENT_TIMESTAMP, pg_last_xlog_receive_location(), "
-					  "pg_last_xlog_replay_location(), pg_last_xact_replay_timestamp(), "
+					  "pg_last_xlog_replay_location(), pg_last_xact_replay_timestamp() ");
-					  "pg_last_xlog_receive_location() >= pg_last_xlog_replay_location()");
 
 	res = PQexec(my_local_conn, sqlquery);
 	if (PQresultStatus(res) != PGRES_TUPLES_OK)
@@ -959,30 +968,10 @@ standby_monitor(void)
 	strncpy(last_wal_standby_received, PQgetvalue(res, 0, 1), MAXLEN);
 	strncpy(last_wal_standby_applied, PQgetvalue(res, 0, 2), MAXLEN);
 	strncpy(last_wal_standby_applied_timestamp, PQgetvalue(res, 0, 3), MAXLEN);
-	last_wal_standby_received_gte_replayed = (strcmp(PQgetvalue(res, 0, 4), "t") == 0)
-		? true
-		: false;
-
 	PQclear(res);
 
-	/*
-	 * In the unusual event of a standby becoming disconnected from the primary,
-	 * while this repmgrd remains connected to the primary,  subtracting
-	 * "lsn_standby_applied" from "lsn_standby_received" and coercing to
-	 * (long long unsigned int) will result in a meaningless, very large
-	 * value which will overflow a BIGINT column and spew error messages into the
-	 * PostgreSQL log. In the absence of a better strategy, skip attempting
-	 * to insert a monitoring record.
-	 */
-	if (last_wal_standby_received_gte_replayed == false)
-	{
-		log_verbose(LOG_WARNING,
-					"Invalid replication_lag value calculated - is this standby connected to its upstream?\n");
-		return;
-	}
-
 	/* Get master xlog info */
-	sqlquery_snprintf(sqlquery, "SELECT pg_catalog.pg_current_xlog_location()");
+	sqlquery_snprintf(sqlquery, "SELECT pg_current_xlog_location()");
 
 	res = PQexec(master_conn, sqlquery);
 	if (PQresultStatus(res) != PGRES_TUPLES_OK)
@@ -1024,8 +1013,7 @@ standby_monitor(void)
 	 * Execute the query asynchronously, but don't check for a result. We will
 	 * check the result next time we pause for a monitor step.
 	 */
-	log_verbose(LOG_DEBUG, "standby_monitor:() %s\n", sqlquery);
+	log_debug("standby_monitor: %s\n", sqlquery);
-
 	if (PQsendQuery(master_conn, sqlquery) == 0)
 		log_warning(_("query could not be sent to master. %s\n"),
 					PQerrorMessage(master_conn));
@@ -1067,10 +1055,10 @@ do_master_failover(void)
 	t_node_info nodes[FAILOVER_NODES_MAX_CHECK];
 
     /* Store details of the failed node here */
-    t_node_info failed_master = T_NODE_INFO_INITIALIZER;
+    t_node_info failed_master = {-1, NO_UPSTREAM_NODE, "", InvalidXLogRecPtr, UNKNOWN, false, false};
 
 	/* Store details of the best candidate for promotion to master here */
-	t_node_info best_candidate = T_NODE_INFO_INITIALIZER;
+	t_node_info best_candidate = {-1, NO_UPSTREAM_NODE, "", InvalidXLogRecPtr, UNKNOWN, false, false};
 
 	/* get a list of standby nodes, including myself */
 	sprintf(sqlquery,
@@ -1199,13 +1187,12 @@ do_master_failover(void)
 			terminate(ERR_FAILOVER_FAIL);
 		}
 
-		sqlquery_snprintf(sqlquery, "SELECT pg_catalog.pg_last_xlog_receive_location()");
+		sqlquery_snprintf(sqlquery, "SELECT pg_last_xlog_receive_location()");
 		res = PQexec(node_conn, sqlquery);
 		if (PQresultStatus(res) != PGRES_TUPLES_OK)
 		{
 			log_info(_("unable to retrieve node's last standby location: %s\n"),
 					 PQerrorMessage(node_conn));
-
 			log_debug(_("connection details: %s\n"), nodes[i].conninfo_str);
 			PQclear(res);
 			PQfinish(node_conn);
@@ -1231,7 +1218,7 @@ do_master_failover(void)
 	}
 
 	/* last we get info about this node, and update shared memory */
-	sprintf(sqlquery, "SELECT pg_catalog.pg_last_xlog_receive_location()");
+	sprintf(sqlquery, "SELECT pg_last_xlog_receive_location()");
 	res = PQexec(my_local_conn, sqlquery);
 	if (PQresultStatus(res) != PGRES_TUPLES_OK)
 	{
@@ -1297,7 +1284,7 @@ do_master_failover(void)
 			res = PQexec(node_conn, sqlquery);
 			if (PQresultStatus(res) != PGRES_TUPLES_OK)
 			{
-				log_err(_("PQexec failed: %s.\nReport an invalid value to not "
+				log_err(_("PQexec failed: %s.\nReport an invalid value to not"
 						  "be considered as new master and exit.\n"),
 						PQerrorMessage(node_conn));
 				PQclear(res);
@@ -1321,7 +1308,7 @@ do_master_failover(void)
 						log_crit(
 							_("unable to obtain LSN from node %i"), nodes[i].node_id
 							);
-						log_hint(
+						log_info(
 							_("please check that 'shared_preload_libraries=repmgr_funcs' is set in postgresql.conf\n")
 							);
 
@@ -1349,9 +1336,6 @@ do_master_failover(void)
 				PQclear(res);
 
 				/* If position is 0/0, keep checking */
-				/* XXX we should add a timeout here to prevent infinite looping
-				 * if the other node's repmgrd is not up
-				 */
 				continue;
 			}
 
@@ -1429,7 +1413,8 @@ do_master_failover(void)
 		/* wait */
 		sleep(5);
 
-		log_notice(_("this node is the best candidate to be the new master, promoting...\n"));
+		if (verbose)
+			log_info(_("this node is the best candidate to be the new master, promoting...\n"));
 
 		log_debug(_("promote command is: \"%s\"\n"),
 				  local_options.promote_command);
@@ -1478,8 +1463,10 @@ do_master_failover(void)
 		/* wait */
 		sleep(10);
 
-		log_notice(_("node %d is the best candidate for new master, attempting to follow...\n"),
+		if (verbose)
+			log_info(_("node %d is the best candidate to be the new master, we should follow it...\n"),
 					 best_candidate.node_id);
+		log_debug(_("follow command is: \"%s\"\n"), local_options.follow_command);
 
 		/*
 		 * The new master may some time to be promoted. The follow command
@@ -1490,23 +1477,57 @@ do_master_failover(void)
 			fflush(stderr);
 		}
 
+		/*
+		 * If 9.4 or later, and replication slots in use, we'll need to create a
+		 * slot on the new master
+		 */
+		new_master_conn = establish_db_connection(best_candidate.conninfo_str, true);
 
-		log_debug(_("executing follow command: \"%s\"\n"), local_options.follow_command);
+		if (local_options.use_replication_slots)
+		{
+			if (create_replication_slot(new_master_conn, node_info.slot_name) == false)
+			{
+
+				appendPQExpBuffer(&event_details,
+								  _("Unable to create slot '%s' on the master node: %s"),
+								  node_info.slot_name,
+								  PQerrorMessage(new_master_conn));
+
+				log_err("%s\n", event_details.data);
+
+				create_event_record(new_master_conn,
+									&local_options,
+									node_info.node_id,
+									"repmgrd_failover_follow",
+									false,
+									event_details.data);
+
+				PQfinish(new_master_conn);
+				terminate(ERR_DB_QUERY);
+			}
+		}
 
 		r = system(local_options.follow_command);
 		if (r != 0)
+		{
+			log_err(_("follow command failed. You could check and try it manually.\n"));
+			terminate(ERR_BAD_CONFIG);
+		}
+
+		/* 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_upstream(new_master_conn, local_options.cluster_name, node_info.node_id, best_candidate.node_id) == false)
 		{
 			appendPQExpBuffer(&event_details,
-							  _("Unable to execute follow command:\n %s"),
+							  _("Unable to update node record for node %i (following new upstream node %i)"),
-							  local_options.follow_command);
+							  node_info.node_id,
+							  best_candidate.node_id);
 
 			log_err("%s\n", event_details.data);
 
-			/* It won't be possible to write to the event notification
+			create_event_record(new_master_conn,
-			 * table but we should be able to generate an external notification
-			 * if required.
-			 */
-			create_event_record(NULL,
 								&local_options,
 								node_info.node_id,
 								"repmgrd_failover_follow",
@@ -1516,20 +1537,13 @@ do_master_failover(void)
 			terminate(ERR_BAD_CONFIG);
 		}
 
-		/* and reconnect to the local database */
-		my_local_conn = establish_db_connection(local_options.conninfo, true);
-
 		/* update internal record for this node*/
-		new_master_conn = establish_db_connection(best_candidate.conninfo_str, true);
-
 		node_info = get_node_info(new_master_conn, local_options.cluster_name, local_options.node);
 		appendPQExpBuffer(&event_details,
-						  _("node %i now following new upstream node %i"),
+						  _("Node %i now following new upstream node %i"),
 						  node_info.node_id,
 						  best_candidate.node_id);
 
-		log_notice("%s\n", event_details.data);
-
 		create_event_record(new_master_conn,
 							&local_options,
 							node_info.node_id,
@@ -1556,8 +1570,6 @@ do_master_failover(void)
  * It might be worth providing a selection of reconnection strategies
  * as different behaviour might be desirable in different situations;
  * or maybe the option not to reconnect might be required?
- *
- * XXX check this handles replication slots gracefully
  */
 static bool
 do_upstream_standby_failover(t_node_info upstream_node)
@@ -1566,7 +1578,6 @@ do_upstream_standby_failover(t_node_info upstream_node)
 	char		sqlquery[QUERY_STR_LEN];
 	int			upstream_node_id = node_info.upstream_node_id;
 	int			r;
-	PQExpBufferData event_details;
 
 	log_debug(_("do_upstream_standby_failover(): performing failover for node %i\n"),
               node_info.node_id);
@@ -1636,65 +1647,26 @@ do_upstream_standby_failover(t_node_info upstream_node)
 		}
 
 		PQclear(res);
-		sleep(local_options.reconnect_interval);
+		sleep(local_options.reconnect_intvl);
 	}
 
 	/* Close the connection to this server */
 	PQfinish(my_local_conn);
 	my_local_conn = NULL;
 
-	initPQExpBuffer(&event_details);
-
 	/* Follow new upstream */
 	r = system(local_options.follow_command);
 	if (r != 0)
 	{
-		appendPQExpBuffer(&event_details,
+		log_err(_("follow command failed. You could check and try it manually.\n"));
-						  _("Unable to execute follow command:\n %s"),
-						  local_options.follow_command);
-
-		log_err("%s\n", event_details.data);
-
-		/* It won't be possible to write to the event notification
-		 * table but we should be able to generate an external notification
-		 * if required.
-		 */
-		create_event_record(NULL,
-							&local_options,
-							node_info.node_id,
-							"repmgrd_failover_follow",
-							false,
-							event_details.data);
 		terminate(ERR_BAD_CONFIG);
 	}
 
 	if (update_node_record_set_upstream(master_conn, local_options.cluster_name, node_info.node_id, upstream_node_id) == false)
 	{
-		appendPQExpBuffer(&event_details,
-						  _("Unable to set node %i's new upstream ID to %i"),
-						  node_info.node_id,
-						  upstream_node_id);
-		create_event_record(NULL,
-							&local_options,
-							node_info.node_id,
-							"repmgrd_failover_follow",
-							false,
-							event_details.data);
 		terminate(ERR_BAD_CONFIG);
 	}
 
-	appendPQExpBuffer(&event_details,
-					  _("node %i is now following upstream node %i"),
-					  node_info.node_id,
-					  upstream_node_id);
-
-	create_event_record(NULL,
-						&local_options,
-						node_info.node_id,
-						"repmgrd_failover_follow",
-						true,
-						event_details.data);
-
 	my_local_conn = establish_db_connection(local_options.conninfo, true);
 
 	return true;
@@ -1709,7 +1681,7 @@ check_connection(PGconn **conn, const char *type, const char *conninfo)
 
 	/*
 	 * Check if the node is still available if after
-	 * local_options.reconnect_attempts * local_options.reconnect_interval
+	 * local_options.reconnect_attempts * local_options.reconnect_intvl
 	 * seconds of retries we cannot reconnect return false
 	 */
 	for (connection_retries = 0; connection_retries < local_options.reconnect_attempts; connection_retries++)
@@ -1727,9 +1699,9 @@ check_connection(PGconn **conn, const char *type, const char *conninfo)
 		{
 			log_warning(_("connection to %s has been lost, trying to recover... %i seconds before failover decision\n"),
 						type,
-						(local_options.reconnect_interval * (local_options.reconnect_attempts - connection_retries)));
+						(local_options.reconnect_intvl * (local_options.reconnect_attempts - connection_retries)));
-			/* wait local_options.reconnect_interval seconds between retries */
+			/* wait local_options.reconnect_intvl seconds between retries */
-			sleep(local_options.reconnect_interval);
+			sleep(local_options.reconnect_intvl);
 		}
 		else
 		{
@@ -1756,7 +1728,7 @@ check_connection(PGconn **conn, const char *type, const char *conninfo)
 
 
 /*
- * set_local_node_status()
+ * set_local_node_failed()
  *
  * If failure of the local node is detected, attempt to connect
  * to the current master server (as stored in the global variable
@@ -1764,7 +1736,7 @@ check_connection(PGconn **conn, const char *type, const char *conninfo)
  */
 
 static bool
-set_local_node_status(void)
+set_local_node_failed(void)
 {
 	PGresult   *res;
 	char		sqlquery[QUERY_STR_LEN];
@@ -1773,7 +1745,7 @@ set_local_node_status(void)
 
 	if (!check_connection(&master_conn, "master", NULL))
 	{
-		log_err(_("set_local_node_status(): Unable to connect to last known master node\n"));
+		log_err(_("set_local_node_failed(): Unable to connect to last known master node\n"));
 		return false;
 	}
 
@@ -1827,16 +1799,17 @@ set_local_node_status(void)
 
 
 	/*
-	 * Attempt to set the active record to the correct value.
+	 * Attempt to set own record as inactive
-	 * First
 	 */
+	sqlquery_snprintf(sqlquery,
+					  "UPDATE %s.repl_nodes "
+					  "   SET active = FALSE "
+					  " WHERE id = %i ",
+					  get_repmgr_schema_quoted(master_conn),
+					  node_info.node_id);
 
-	if (!update_node_record_status(master_conn,
+	res = PQexec(master_conn, sqlquery);
-					    local_options.cluster_name,
+	if (PQresultStatus(res) != PGRES_COMMAND_OK)
-					    node_info.node_id,
-					    "standby",
-					    node_info.upstream_node_id,
-					    is_standby(my_local_conn)==1))
 	{
 		log_err(_("unable to set local node %i as inactive on master: %s\n"),
 				node_info.node_id,
@@ -1861,7 +1834,7 @@ check_cluster_configuration(PGconn *conn)
 	sqlquery_snprintf(sqlquery,
 					  "SELECT oid FROM pg_class "
 					  " WHERE oid = '%s.repl_nodes'::regclass ",
-			                  get_repmgr_schema_quoted(master_conn));
+					  get_repmgr_schema());
 	res = PQexec(conn, sqlquery);
 	if (PQresultStatus(res) != PGRES_TUPLES_OK)
 	{
@@ -1988,18 +1961,18 @@ lsn_to_xlogrecptr(char *lsn, bool *format_ok)
 void
 usage(void)
 {
-	log_err(_("%s: Replicator manager daemon \n"), progname());
+	log_err(_("%s: Replicator manager daemon \n"), progname);
-	log_err(_("Try \"%s --help\" for more information.\n"), progname());
+	log_err(_("Try \"%s --help\" for more information.\n"), progname);
 }
 
 
 void
-help(void)
+help(const char *progname)
 {
-	printf(_("%s: replication management daemon for PostgreSQL\n"), progname());
+	printf(_("%s: replication management daemon for PostgreSQL\n"), progname);
 	printf(_("\n"));
 	printf(_("Usage:\n"));
-	printf(_("  %s [OPTIONS]\n"), progname());
+	printf(_("  %s [OPTIONS]\n"), progname);
 	printf(_("\n"));
 	printf(_("Options:\n"));
 	printf(_("  -?, --help                show this help, then exit\n"));
@@ -2010,7 +1983,7 @@ help(void)
 	printf(_("  -d, --daemonize           detach process from foreground\n"));
 	printf(_("  -p, --pid-file=PATH       write a PID file\n"));
 	printf(_("\n"));
-	printf(_("%s monitors a cluster of servers and optionally performs failover.\n"), progname());
+	printf(_("%s monitors a cluster of servers and optionally performs failover.\n"), progname);
 }
 
 
@@ -2048,7 +2021,7 @@ terminate(int retval)
 		unlink(pid_file);
 	}
 
-	log_info(_("%s terminating...\n"), progname());
+	log_info(_("%s terminating...\n"), progname);
 
 	exit(retval);
 }
@@ -2253,13 +2226,13 @@ check_and_create_pid_file(const char *pid_file)
 t_node_info
 get_node_info(PGconn *conn, char *cluster, int node_id)
 {
-	int res;
+	PGresult   *res;
 
-	t_node_info node_info = T_NODE_INFO_INITIALIZER;
+	t_node_info node_info = { NODE_NOT_FOUND, NO_UPSTREAM_NODE, "", InvalidXLogRecPtr, UNKNOWN, false, false};
 
-	res = get_node_record(conn, cluster, node_id, &node_info);
+	res = get_node_record(conn, cluster, node_id);
 
-	if (res == -1)
+	if (PQresultStatus(res) != PGRES_TUPLES_OK)
 	{
 		PQExpBufferData errmsg;
 		initPQExpBuffer(&errmsg);
@@ -2278,14 +2251,47 @@ get_node_info(PGconn *conn, char *cluster, int node_id)
 							false,
 							errmsg.data);
 
-		PQfinish(conn);
+		PQclear(res);
 		terminate(ERR_DB_QUERY);
 	}
 
-	if (res == 0)
+	if (!PQntuples(res)) {
-	{
 		log_warning(_("No record found record for node %i\n"), node_id);
+		PQclear(res);
+		node_info.node_id = NODE_NOT_FOUND;
+		return node_info;
 	}
 
+	node_info.node_id = atoi(PQgetvalue(res, 0, 0));
+	node_info.upstream_node_id = atoi(PQgetvalue(res, 0, 1));
+	strncpy(node_info.conninfo_str, PQgetvalue(res, 0, 2), MAXLEN);
+	node_info.type = parse_node_type(PQgetvalue(res, 0, 3));
+	strncpy(node_info.slot_name, PQgetvalue(res, 0, 4), MAXLEN);
+	node_info.active = (strcmp(PQgetvalue(res, 0, 5), "t") == 0)
+		? true
+		: false;
+
+	PQclear(res);
+
 	return node_info;
 }
+
+
+static t_server_type
+parse_node_type(const char *type)
+{
+	if (strcmp(type, "master") == 0)
+	{
+		return MASTER;
+	}
+	else if (strcmp(type, "standby") == 0)
+	{
+		return STANDBY;
+	}
+	else if (strcmp(type, "witness") == 0)
+	{
+		return WITNESS;
+	}
+
+	return UNKNOWN;
+}

sql/Makefile

@@ -1,7 +1,7 @@
 #
 # Makefile
 #
-# Copyright (c) 2ndQuadrant, 2010-2016
+# Copyright (c) 2ndQuadrant, 2010-2015
 #
 
 MODULE_big = repmgr_funcs

sql/repmgr3.0_repmgr3.1.sql

@@ -1,35 +0,0 @@
-/*
- * Update a repmgr 3.0 installation to repmgr 3.1
- * ----------------------------------------------
- *
- * The new repmgr package should be installed first. Then
- * carry out these steps:
- *
- *   1. (If repmgrd is used) stop any running repmgrd instances
- *   2. On the master node, execute the SQL statements listed below
- *   3. (If repmgrd is used) restart repmgrd
- */
-
-/*
- * If your repmgr installation is not included in your repmgr
- * user's search path, please set the search path to the name
- * of the repmgr schema to ensure objects are installed in
- * the correct location.
- *
- * The repmgr schema is  "repmgr_" + the cluster name defined in
- * 'repmgr.conf'.
- */
-
--- SET search_path TO 'name_of_repmgr_schema';
-
-BEGIN;
-
--- New view "repl_show_nodes" which also displays the server's
--- upstream node
-
-CREATE VIEW repl_show_nodes AS
-SELECT rn.id, rn.conninfo, rn.type, rn.name, rn.cluster,
-	rn.priority, rn.active, sq.name AS upstream_node_name
-FROM repl_nodes as rn LEFT JOIN repl_nodes AS sq ON sq.id=rn.upstream_node_id;
-
-COMMIT;

sql/repmgr_funcs.sql.in

@@ -1,6 +1,6 @@
 /*
  * repmgr_function.sql
- * Copyright (c) 2ndQuadrant, 2010-2016
+ * Copyright (c) 2ndQuadrant, 2010-2015
  *
  */
 

sql/uninstall_repmgr_funcs.sql

@@ -1,6 +1,6 @@
 /*
  * uninstall_repmgr_funcs.sql
- * Copyright (c) 2ndQuadrant, 2010-2016
+ * Copyright (c) 2ndQuadrant, 2010-2015
  *
  */
 

strutil.c

@@ -1,7 +1,7 @@
 /*
  * strutil.c
  *
- * Copyright (C) 2ndQuadrant, 2010-2016
+ * Copyright (C) 2ndQuadrant, 2010-2015
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

strutil.h

@@ -1,6 +1,6 @@
 /*
  * strutil.h
- * Copyright (C) 2ndQuadrant, 2010-2016
+ * Copyright (C) 2ndQuadrant, 2010-2015
  *
  *
  * This program is free software: you can redistribute it and/or modify

uninstall_repmgr.sql

@@ -1,7 +1,7 @@
 /*
  * uninstall_repmgr.sql
  *
- * Copyright (C) 2ndQuadrant, 2010-2016
+ * Copyright (C) 2ndQuadrant, 2010-2015
  *
  */
 

version.h

@@ -1,6 +1,6 @@
 #ifndef _VERSION_H_
 #define _VERSION_H_
 
-#define REPMGR_VERSION "3.1"
+#define REPMGR_VERSION "3.0.2"
 
 #endif