Merge branch 'master' into REL2_0_STABLE

The leak is irrelevant

.gitignore

@@ -1,6 +1,9 @@
 *~
 *.o
+*.so
 repmgr
 repmgrd
 README.htm*
 README.pdf
+sql/repmgr_funcs.so
+sql/repmgr_funcs.sql

COPYRIGHT

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

CREDITS

@@ -10,3 +10,7 @@ Hannu Krosing <hannu@2ndQuadrant.com>
 Cédric Villemain <cedric@2ndquadrant.com>
 Charles Duffy <charles@dyfis.net>
 Daniel Farina <daniel@heroku.com>
+Shawn Ellis <shawn.ellis17@gmail.com>
+Jay Taylor <jay@jaytaylor.com>
+Christian Kruse <christian@2ndQuadrant.com>
+Krzysztof Gajdemski <songo@debian.org.pl>

HISTORY

@@ -1,5 +1,48 @@
-1.0.0   2010-12-05
+2.0stable 2014-01-30
-        First public release
+        Documentation fixes (Christian)
+        General refactoring, code quality improvements and stabilization work (Christian)
+        Added proper daemonizing (-d/--daemonize) (Christian)
+        Added PID file handling (-p/--pid-file) (Christian)
+        New config option: monitor_interval_secs (Christian)
+        New config option: retry_promote_interval (Christian)
+        New config option: logfile (Christian)
+        New config option: pg_bindir (Christian)
+        New config option: pgctl_options (Christian)
+
+2.0beta2 2013-12-19
+        Improve autofailover logic and algorithms (Jaime, Andres)
+        Ignore pg_log when cloning (Jaime)
+        Add timestamps to log line in stderr (Christian)
+        Correctly check wal_keep_segments (Jay Taylor)
+        Add a ssh_options parameter (Jay Taylor)
+
+2.0beta1 2012-07-27
+        Make CLONE command try to make an exact copy including $PGDATA location (Cedric) 
+        Add detection of master failure (Jaime)
+        Add the notion of a witness server (Jaime)
+        Add autofailover capabilities (Jaime)
+        Add a configuration parameter to indicate the script to execute on failover or follow (Jaime)
+        Make the monitoring optional and turned off by default, it can be turned on with --monitoring-history switch (Jaime)
+        Add tunables to specify number of retries to reconnect to master and the time between them (Jaime)
+
+1.2.0	2012-07-27
+		Test ssh connection before trying to rsync (Cédric)
+        Add CLUSTER SHOW command (Carlo)
+        Add CLUSTER CLEANUP command (Jaime)
+        Add function write_primary_conninfo (Marco)
+        Teach repmgr how to get tablespace's location in different pg version (Jaime)
+		Improve version message (Carlo)
+
+1.1.1	2012-04-18
+        Add --ignore-rsync-warning (Cédric)
+        Add strnlen for compatibility with OS X (Greg)
+        Improve performance of the repl_status view (Jaime)
+        Remove last argument from log_err (Jaime, Reported by Jeroen Dekkers)
+        Complete documentation about possible error conditions (Jaime)
+        Document how to clean history (Jaime)
+
+1.1.0   2011-03-09
+        Make options -U, -R and -p not mandatory (Jaime)
 
 1.1.0b1 2011-02-24 
         Fix missing "--force" option in help (Greg Smith)
@@ -28,6 +71,5 @@
         Map old verbose flag into a useful setting for the new logger (Greg)
         Document repmgrd startup restrictions and log info about them (Greg)
 
-1.1.0   2011-03-09
+1.0.0   2010-12-05
-        Make options -U, -R and -p not mandatory (Jaime)
+        First public release
-

Makefile

@@ -1,6 +1,6 @@
 #
 # Makefile
-# Copyright (c) 2ndQuadrant, 2010-2011
+# Copyright (c) 2ndQuadrant, 2010-2014
 
 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
@@ -11,15 +11,18 @@ PG_CPPFLAGS = -I$(libpq_srcdir)
 PG_LIBS = $(libpq_pgport)
 
 all:  repmgrd repmgr
+	$(MAKE) -C sql
 
 repmgrd: $(repmgrd_OBJS)
 	$(CC) $(CFLAGS) $(repmgrd_OBJS) $(PG_LIBS) $(LDFLAGS) $(LDFLAGS_EX) $(LIBS) -o repmgrd
+	$(MAKE) -C sql
 
 repmgr: $(repmgr_OBJS)
 	$(CC) $(CFLAGS) $(repmgr_OBJS) $(PG_LIBS) $(LDFLAGS) $(LDFLAGS_EX) $(LIBS) -o repmgr
 
 ifdef USE_PGXS
-PGXS := $(shell pg_config --pgxs)
+PG_CONFIG = pg_config
+PGXS := $(shell $(PG_CONFIG) --pgxs)
 include $(PGXS)
 else
 subdir = contrib/repmgr
@@ -30,10 +33,15 @@ endif
 
 # XXX: Try to use PROGRAM construct (see pgxs.mk) someday. Right now
 # is overriding pgxs install.
-install:
+install: install_prog install_ext
+
+install_prog:
 	$(INSTALL_PROGRAM) repmgrd$(X) '$(DESTDIR)$(bindir)'
 	$(INSTALL_PROGRAM) repmgr$(X) '$(DESTDIR)$(bindir)'
 
+install_ext:
+	$(MAKE) -C sql install
+
 ifneq (,$(DATA)$(DATA_built))
 	@for file in $(addprefix $(srcdir)/, $(DATA)) $(DATA_built); do \
 	  echo "$(INSTALL_DATA) $$file '$(DESTDIR)$(datadir)/$(datamoduledir)'"; \
@@ -45,10 +53,17 @@ clean:
 	rm -f *.o
 	rm -f repmgrd
 	rm -f repmgr
+	$(MAKE) -C sql clean
 
 deb: repmgrd repmgr
 	mkdir -p ./debian/usr/bin
 	cp repmgrd repmgr ./debian/usr/bin/
+	mkdir -p ./debian/usr/share/postgresql/9.0/contrib/
+	cp sql/repmgr_funcs.sql ./debian/usr/share/postgresql/9.0/contrib/
+	cp sql/uninstall_repmgr_funcs.sql ./debian/usr/share/postgresql/9.0/contrib/
+	mkdir -p ./debian/usr/lib/postgresql/9.0/lib/
+	cp sql/repmgr_funcs.so ./debian/usr/lib/postgresql/9.0/lib/
 	dpkg-deb --build debian
 	mv debian.deb ../postgresql-repmgr-9.0_1.0.0.deb
+	rm -rf ./debian/usr
 

README.rst

@@ -5,7 +5,7 @@ repmgr: Replication Manager for PostgreSQL clusters
 Introduction
 ============
 
-PostgreSQL 9.0 allow us to have replicated Hot Standby servers 
+PostgreSQL 9+ allow us to have replicated Hot Standby servers
 which we can query and/or use for high availability.
 
 While the main components of the feature are included with
@@ -20,6 +20,17 @@ databases as a single cluster.  repmgr includes two components:
 * repmgrd: management and monitoring daemon that watches the cluster
   and can automate remote actions.
 
+Supported Releases
+------------------
+
+repmgr works with PostgreSQL versions 9.0 and superior.
+
+There are currently no incompatibilities when upgrading repmgr from 9.0 to 9.1,
+so your 9.0 configuration will work with 9.1
+
+Additional parameters must be added to postgresql.conf to take advantage of
+the new 9.1 features such as synchronous replication or hot standby feedback.
+
 Requirements
 ------------
 
@@ -309,7 +320,7 @@ keys and a maching authorization file to a privledged user on the other system::
   [postgres@node1]$ cat ~/.ssh/id_rsa.pub >> ~/.ssh/authorized_keys
   [postgres@node1]$ chmod go-rwx ~/.ssh/*
   [postgres@node1]$ cd ~/.ssh
-  [postgres@node1]$ scp id_rsa.pub id_rsa authorized_keys postgres@node2:
+  [postgres@node1]$ scp id_rsa.pub id_rsa authorized_keys user@node2:
 
 Login as a user on the other system, and install the files into the postgres 
 user's account::
@@ -378,7 +389,7 @@ walkthrough assumes the following setup:
 
 * Another standby server called "node3" with a similar configuration to "node2".
 
-* The Postgress installation in each of the above is defined as $PGDATA, 
+* The Postgres installation in each of the above is defined as $PGDATA, 
   which is represented here as ``/var/lib/pgsql/9.0/data``
   
 Creating some sample data
@@ -503,12 +514,14 @@ following the standard directory structure of a RHEL system.  It should contain:
 
   cluster=test
   node=1
+  node_name=earth
   conninfo='host=node1 user=repmgr dbname=pgbench'
 
 On "node2" create the file ``/var/lib/pgsql/repmgr/repmgr.conf`` with::
 
   cluster=test
   node=2
+  node_name=mars
   conninfo='host=node2 user=repmgr dbname=pgbench'
 
 The STANDBY CLONE process should have created a recovery.conf file on
@@ -701,12 +714,14 @@ and it should contain::
 
   cluster=test
   node=1
+  node_name=earth
   conninfo='host=127.0.0.1 dbname=testdb'
 
 On "standby" create the file ``/home/standby/repmgr/repmgr.conf`` with::
 
   cluster=test
   node=2
+  node_name=mars
   conninfo='host=127.0.0.1 dbname=testdb'
 
 Next, with "prime" server running, we want to use the ``clone standby`` command
@@ -814,6 +829,22 @@ and on "prime."
 
 The servers are now again acting as primary on "prime" and standby on "standby".
 
+Maintainance of monitor history
+-------------------------------
+
+Once you have changed roles (with a failover or to restore original roles)
+you would end up with records saying that node1 is primary and other records
+saying that node2 is the primary. Which could be confusing.
+Also, if you don't do anything about it the monitor history will keep growing.
+For both of those reasons you sometime want to make some maintainance of the 
+``repl_monitor`` table.
+
+If you want to clean the history after a few days you can execute the  
+CLUSTER CLEANUP command in a cron. For example to keep just one day of history
+you can put this in your crontab::
+
+0 1 * * *   repmgr cluster cleanup -k 1 -f ~/repmgr.conf
+
 Configuration and command reference
 ===================================
 
@@ -862,6 +893,7 @@ The output from this program looks like this::
     -f, --config_file=PATH     path to the configuration file
     -R, --remote-user=USERNAME database server username for rsync
     -w, --wal-keep-segments=VALUE  minimum value for the GUC wal_keep_segments (default: 5000)
+    -I, --ignore-rsync-warning ignore rsync partial transfer warning
     -F, --force                force potentially dangerous operations to happen
 
   repmgr performs some tasks like clone a node, promote it or making follow another node and then exits.
@@ -941,6 +973,26 @@ its port if is different from the default one.
 
         ./repmgr standby follow
 
+* cluster show 
+
+    * Shows the role (standby/master) and connection string for all nodes configured 
+      in the cluster or "FAILED" if the node doesn't respond. This allow us to know 
+      which nodes are alive and which one needs attention and to have a notion of the
+      structure of clusters we just have access to.  Example::
+
+        ./repmgr cluster show
+
+* cluster cleanup 
+
+    * Cleans the monitor's history from repmgr tables. This avoids the repl_monitor table
+      to grow excesivelly which in turns affects repl_status view performance, also 
+      keeps controlled the space in disk used by repmgr. This command can be used manually
+      or in a cron to make it periodically.  
+      There is also a --keep-history (-k) option to indicate how many days of history we
+      want to keep, so the command will clean up history older than "keep-history" days. Example::
+
+        ./repmgr cluster cleanup -k 2
+
 repmgrd Daemon
 --------------
 
@@ -961,6 +1013,7 @@ The output from this program looks like this::
     --help                    show this help, then exit
     --version                 output version information, then exit
     --verbose                 output verbose activity information
+    --monitoring-history      track advance or lag of the replication in every standby in repl_monitor
     -f, --config_file=PATH    database to connect to
   
   repmgrd monitors a cluster of servers.
@@ -991,6 +1044,10 @@ Lag monitoring
 repmgrd helps monitor a set of master and standby servers.  You can
 see which node is the current master, as well as how far behind each
 is from current.
+To activate the monitor capabilities of repmgr you must include the
+option --monitoring-history when running it::
+
+  repmgrd --monitoring-history --config-file=/path/to/repmgr.conf &
 
 To look at the current lag between primary and each node listed
 in ``repl_node``, consult the ``repl_status`` view::
@@ -1028,10 +1085,16 @@ License and Contributions
 =========================
 
 repmgr is licensed under the GPL v3.  All of its code and documentation is
-Copyright 2010-2011, 2ndQuadrant Limited.  See the files COPYRIGHT and LICENSE for
+Copyright 2010-2014, 2ndQuadrant Limited.  See the files COPYRIGHT and LICENSE for
 details.
 
-Contributions to repmgr are welcome, and listed in the file CREDITS.
+Main sponsorship of repmgr has been from 2ndQuadrant customers.
+
+Additional work has been sponsored by the 4CaaST project for cloud computing,
+which has received funding from the European Union's Seventh Framework Programme
+(FP7/2007-2013) under grant agreement 258862.
+
+Contributions to repmgr are welcome, and will be listed in the file CREDITS.
 2ndQuadrant Limited requires that any contributions provide a copyright
 assignment and a disclaimer of any work-for-hire ownership claims from the
 employer of the developer.  This lets us make sure that all of the repmgr
@@ -1047,3 +1110,35 @@ Code in repmgr is formatted to a consistent style using the following command::
 
 Contributors should reformat their code similarly before submitting code to
 the project, in order to minimize merge conflicts with other work.
+
+Support and Assistance
+======================
+
+2ndQuadrant provides 24x7 production support for repmgr, as well as help you
+configure it correctly, verify an installation and train you in running a
+robust replication cluster.
+
+There is a mailing list/forum to discuss contributions or issues
+http://groups.google.com/group/repmgr
+
+#repmgr is registered in freenode IRC
+
+Further information is available at http://www.repmgr.org/
+
+We'd love to hear from you about how you use repmgr. Case studies and
+news are always welcome. Send us an email at info@2ndQuadrant.com, or
+send a postcard to
+
+repmgr
+c/o 2ndQuadrant
+7200 The Quorum
+Oxford Business Park North
+Oxford
+OX4 2JZ
+
+Thanks from the repmgr core team
+
+Jaime Casanova
+Simon Riggs
+Greg Smith
+Cedric Villemain

TODO

@@ -1,21 +1,18 @@
 Known issues in repmgr
 ======================
 
-* The check for whether ``wal_keep_segments`` is considered large enough
-  does a string comparison rather than an integer one.  It can give both
-  false positive (setting is large enough but flagged as too small) and
-  false negative (setting is too small but not noted as such) errors.
-
 * When running repmgr against a remote machine, operations that start
   the database server using the ``pg_ctl`` command may accidentally
   terminate after their associated ssh session ends.
 
-* After running repmgrd as a regular foreground application, hitting
-  control-C causes the program to crash.
-
 Planned feature improvements
 ============================
 
-* Before running ``pg_start_backup()``, a sanity check that there is a
+* Timeline increases when promoting a standby
-  a working ssh connection to the destination would help find
+
-  configuration errors before disturbing the database.
+* A better check which standby did receive most of the data
+
+* Make the fact that a standby may be delayed a factor in the voting
+  algorithm
+
+* include support for delayed standbys

autofailover_quick_setup.rst

@@ -0,0 +1,225 @@
+=====================================================
+ PostgreSQL Automatic Fail-Over - User Documentation
+=====================================================
+
+Automatic Failover
+==================
+
+repmgr allows setups 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 hostname fully qualified of the Master server, IP 192.168.1.10
+**node2**
+    is the hostname fully qualified of the Standby server, IP 192.168.1.11
+**witness**
+    is the hostname fully qualified of the server used for witness, IP 192.168.1.12
+
+**Note:** It is not recommanded to use name defining status of a server like «masterserver»,
+this is a name leading to confusion once a failover take place and the Master is
+now on the «standbyserver».
+
+Summary
+-------
+
+2 PostgreSQL servers are involved in the replication.  Automatic fail-over need
+to vote to decide what server it should promote, thus an odd number is required
+and 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 server used for
+   witness)
+
+2. Install repmgr in all the servers involved (including the server used for witness)
+
+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 server used for witness)
+
+6. Register Master and Standby nodes
+
+7. Initiate witness server
+
+8. Start the repmgrd daemons in all nodes
+
+**Note** A complete Hight-Availability design need 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 superior.
+
+Install repmgr
+--------------
+
+Install repmgr following the steps in the README.
+
+Configure PostreSQL
+-------------------
+
+Log in 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 node2.
+
+Clone the 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 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 it is needed 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 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 failover procedure.
+**reconnect_interval**
+    is the amount of time between retries to reconnect to master after a failure has been detected and before start 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 node1.
+
+Register the node as Master::
+
+  su - postgres
+  repmgr -f /etc/repmgr/repmgr.conf master register
+
+Log in node2. Register it as a standby::
+
+  su - postgres
+  repmgr -f /etc/repmgr/repmgr.conf standby register
+
+Initialize witness server
+-------------------------
+
+Log in 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
+
+It needs information to connect to the master to copy the configuration of the cluster, also it needs to know where it should initialize it's own $PGDATA.
+As part of the procees it also ask for the superuser password so it can connect when needed.
+
+Start the repmgrd daemons
+-------------------------
+
+Log in node2 and witness.
+
+	su - postgres
+	repmgrd -f /etc/repmgr/repmgr.conf > /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 `pidoff repmgrd`
+
+Usage
+=====
+
+The repmgr documentation is in the README file (how to build, options, etc.)

check_dir.c

@@ -1,6 +1,6 @@
 /*
  * check_dir.c - Directories management functions
- * Copyright (C) 2ndQuadrant, 2010-2011
+ * Copyright (C) 2ndQuadrant, 2010-2014
  *
  * 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
@@ -31,8 +31,6 @@
 #include "strutil.h"
 #include "log.h"
 
-static int mkdir_p(char *path, mode_t omode);
-
 /*
  * make sure the directory either doesn't exist or is empty
  * we use this function to check the new data directory and
@@ -124,15 +122,15 @@ set_directory_permissions(char *dir)
  * note that on failure, the path arg has been modified to show the particular
  * directory level we had problems with.
  */
-static int
+int
 mkdir_p(char *path, mode_t omode)
 {
 	struct stat sb;
 	mode_t		numask,
-	         oumask;
+	            oumask;
 	int			first,
-	        last,
+	            last,
-	        retval;
+	            retval;
 	char	   *p;
 
 	p = path;
@@ -225,8 +223,85 @@ is_pg_dir(char *dir)
 	const size_t buf_sz = 8192;
 	char		 path[buf_sz];
 	struct stat	 sb;
+	int		r;
 
+	/* test pgdata */
 	xsnprintf(path, buf_sz, "%s/PG_VERSION", dir);
+	if (stat(path, &sb) == 0)
+		return true;
 
-	return (stat(path, &sb) == 0) ? true : false;
+	/* test tablespace dir */
+	sprintf(path, "ls %s/PG_*/ -I*", dir);
+	r = system(path);
+	if (r == 0)
+		return true;
+
+	return false;
+}
+
+
+bool
+create_pgdir(char *dir, bool force)
+{
+	bool	pg_dir = false;
+
+	/* Check this directory could be used as a PGDATA dir */
+	switch (check_dir(dir))
+	{
+	case 0:
+		/* dir not there, must create it */
+		log_info(_("creating directory \"%s\"...\n"), dir);
+
+		if (!create_directory(dir))
+		{
+			log_err(_("couldn't create directory \"%s\"...\n"),
+			        dir);
+			return false;
+		}
+		break;
+	case 1:
+		/* Present but empty, fix permissions and use it */
+		log_info(_("checking and correcting permissions on existing directory %s ...\n"),
+		         dir);
+
+		if (!set_directory_permissions(dir))
+		{
+			log_err(_("could not change permissions of directory \"%s\": %s\n"),
+			        dir, strerror(errno));
+			return false;
+		}
+		break;
+	case 2:
+		/* Present and not empty */
+		log_warning(_("directory \"%s\" exists but is not empty\n"),
+		            dir);
+
+		pg_dir = is_pg_dir(dir);
+
+		/*
+		 * we use force to reduce the time needed to restore a node which
+		 * turn async after a failover or anything else
+		 */
+		if (pg_dir && force)
+		{
+			/* Let it continue */
+			break;
+		}
+		else if (pg_dir && !force)
+		{
+			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 --force option\n"));
+			return false;
+		}
+
+		return false;
+	default:
+		/* Trouble accessing directory */
+		log_err(_("could not access directory \"%s\": %s\n"),
+		        dir, strerror(errno));
+		return false;
+	}
+	return true;
 }

check_dir.h

@@ -1,6 +1,6 @@
 /*
  * check_dir.h
- * Copyright (c) 2ndQuadrant, 2010-2011
+ * Copyright (c) 2ndQuadrant, 2010-2014
  *
  * 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,9 +20,11 @@
 #ifndef _REPMGR_CHECK_DIR_H_
 #define _REPMGR_CHECK_DIR_H_
 
+int mkdir_p(char *path, mode_t omode);
 int  check_dir(char *dir);
 bool create_directory(char *dir);
 bool set_directory_permissions(char *dir);
 bool is_pg_dir(char *dir);
+bool create_pgdir(char *dir, bool force);
 
 #endif

config.c

@@ -1,6 +1,6 @@
 /*
  * config.c - Functions to parse the config file
- * Copyright (C) 2ndQuadrant, 2010-2011
+ * Copyright (C) 2ndQuadrant, 2010-2014
  *
  * 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
@@ -18,11 +18,12 @@
  */
 
 #include "config.h"
-#include "repmgr.h"
+#include "log.h"
 #include "strutil.h"
+#include "repmgr.h"
 
 void
-parse_config(const char* config_file, t_configuration_options* options)
+parse_config(const char *config_file, t_configuration_options *options)
 {
 	char *s, buff[MAXLINELENGTH];
 	char name[MAXLEN];
@@ -34,7 +35,25 @@ parse_config(const char* config_file, t_configuration_options* options)
 	memset(options->cluster_name, 0, sizeof(options->cluster_name));
 	options->node = -1;
 	memset(options->conninfo, 0, sizeof(options->conninfo));
+	options->failover = MANUAL_FAILOVER;
+	options->priority = 0;
+	memset(options->node_name, 0, sizeof(options->node_name));
+	memset(options->promote_command, 0, sizeof(options->promote_command));
+	memset(options->follow_command, 0, sizeof(options->follow_command));
 	memset(options->rsync_options, 0, sizeof(options->rsync_options));
+	memset(options->ssh_options, 0, sizeof(options->ssh_options));
+	memset(options->pg_bindir, 0, sizeof(options->pg_bindir));
+	memset(options->pgctl_options, 0, sizeof(options->pgctl_options));
+
+	/* if nothing has been provided defaults to 60 */
+	options->master_response_timeout = 60;
+
+	/* it defaults to 6 retries with a time between retries of 10s */
+	options->reconnect_attempts = 6;
+	options->reconnect_intvl = 10;
+
+	options->monitor_interval_secs = 2;
+	options->retry_promote_interval_secs = 300;
 
 	/*
 	 * Since some commands don't require a config file at all, not
@@ -42,7 +61,7 @@ parse_config(const char* config_file, t_configuration_options* options)
 	 */
 	if (fp == NULL)
 	{
-		fprintf(stderr, _("Did not find the configuration file '%s', continuing\n"), config_file);
+		log_err(_("Did not find the configuration file '%s', continuing\n"), config_file);
 		return;
 	}
 
@@ -65,12 +84,53 @@ parse_config(const char* config_file, t_configuration_options* options)
 			strncpy (options->conninfo, value, MAXLEN);
 		else if (strcmp(name, "rsync_options") == 0)
 			strncpy (options->rsync_options, value, QUERY_STR_LEN);
+		else if (strcmp(name, "ssh_options") == 0)
+			strncpy (options->ssh_options, value, QUERY_STR_LEN);
 		else if (strcmp(name, "loglevel") == 0)
 			strncpy (options->loglevel, value, MAXLEN);
 		else if (strcmp(name, "logfacility") == 0)
 			strncpy (options->logfacility, value, MAXLEN);
+		else if (strcmp(name, "failover") == 0)
+		{
+			char failoverstr[MAXLEN];
+			strncpy(failoverstr, value, MAXLEN);
+
+			if (strcmp(failoverstr, "manual") == 0)
+				options->failover = MANUAL_FAILOVER;
+			else if (strcmp(failoverstr, "automatic") == 0)
+				options->failover = AUTOMATIC_FAILOVER;
+			else
+			{
+				log_warning(_("value for failover option is incorrect, it should be automatic or manual. Defaulting to manual.\n"));
+				options->failover = MANUAL_FAILOVER;
+			}
+		}
+		else if (strcmp(name, "priority") == 0)
+			options->priority = atoi(value);
+		else if (strcmp(name, "node_name") == 0)
+			strncpy(options->node_name, value, MAXLEN);
+		else if (strcmp(name, "promote_command") == 0)
+			strncpy(options->promote_command, value, MAXLEN);
+		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 = atoi(value);
+		else if (strcmp(name, "reconnect_attempts") == 0)
+			options->reconnect_attempts = atoi(value);
+		else if (strcmp(name, "reconnect_interval") == 0)
+			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)
+			strncpy (options->pgctl_options, value, MAXLEN);
+		else if (strcmp(name, "logfile") == 0)
+			strncpy(options->logfile, value, MAXLEN);
+		else if (strcmp(name, "monitor_interval_secs") == 0)
+			options->monitor_interval_secs = atoi(value);
+		else if (strcmp(name, "retry_promote_interval_secs") == 0)
+			options->retry_promote_interval_secs = atoi(value);
 		else
-			printf ("WARNING: %s/%s: Unknown name/value pair!\n", name, value);
+			log_warning(_("%s/%s: Unknown name/value pair!\n"), name, value);
 	}
 
 	/* Close file */
@@ -79,19 +139,42 @@ parse_config(const char* config_file, t_configuration_options* options)
 	/* Check config settings */
 	if (strnlen(options->cluster_name, MAXLEN)==0)
 	{
-		fprintf(stderr, "Cluster name is missing. "
+		log_err(_("Cluster name is missing. Check the configuration file.\n"));
-		        "Check the configuration file.\n");
 		exit(ERR_BAD_CONFIG);
 	}
 
 	if (options->node == -1)
 	{
-		fprintf(stderr, "Node information is missing. "
+		log_err(_("Node information is missing. Check the configuration file.\n"));
-		        "Check the configuration file.\n");
+		exit(ERR_BAD_CONFIG);
+	}
+
+	if (options->master_response_timeout <= 0)
+	{
+		log_err(_("Master response timeout must be greater than zero. Check the configuration file.\n"));
+		exit(ERR_BAD_CONFIG);
+	}
+
+	if (options->reconnect_attempts < 0)
+	{
+		log_err(_("Reconnect attempts must be zero or greater. Check the configuration file.\n"));
+		exit(ERR_BAD_CONFIG);
+	}
+
+	if (options->reconnect_intvl <= 0)
+	{
+		log_err(_("Reconnect intervals must be zero or greater. Check the configuration file.\n"));
+		exit(ERR_BAD_CONFIG);
+	}
+
+	if (*options->pg_bindir == '\0')
+	{
+		log_err(_("pg_bindir config value not found. Check the configuration file.\n"));
 		exit(ERR_BAD_CONFIG);
 	}
 }
 
+
 char *
 trim (char *s)
 {
@@ -108,7 +191,9 @@ trim (char *s)
 		++s1;
 
 	/* Copy finished string */
-	strcpy (s, s1);
+	memmove (s, s1, s2 - s1);
+	s[s2 - s1 + 1] = '\0';
+
 	return s;
 }
 
@@ -144,3 +229,100 @@ parse_line(char *buff, char *name, char *value)
 	value[j] = '\0';
 	trim(value);
 }
+
+bool
+reload_configuration(char *config_file, t_configuration_options *orig_options)
+{
+	PGconn	*conn;
+
+	t_configuration_options new_options;
+
+	/*
+	 * Re-read the configuration file: repmgr.conf
+	 */
+	log_info(_("Reloading configuration file and updating repmgr tables\n"));
+	parse_config(config_file, &new_options);
+	if (new_options.node == -1)
+	{
+		log_warning(_("Cannot load new configuration, will keep current one.\n"));
+		return false;
+	}
+
+	if (strcmp(new_options.cluster_name, orig_options->cluster_name) != 0)
+	{
+		log_warning(_("Cannot change cluster name, will keep current configuration.\n"));
+		return false;
+	}
+
+	if (new_options.node != orig_options->node)
+	{
+		log_warning(_("Cannot change node number, will keep current configuration.\n"));
+		return false;
+	}
+
+	if (strcmp(new_options.node_name, orig_options->node_name) != 0)
+	{
+		log_warning(_("Cannot change standby name, will keep current configuration.\n"));
+		return false;
+	}
+
+	if (new_options.failover != MANUAL_FAILOVER && new_options.failover != AUTOMATIC_FAILOVER)
+	{
+		log_warning(_("New value for failover is not valid. Should be MANUAL or AUTOMATIC.\n"));
+		return false;
+	}
+
+	if (new_options.master_response_timeout <= 0)
+	{
+		log_warning(_("New value for master_response_timeout is not valid. Should be greater than zero.\n"));
+		return false;
+	}
+
+	if (new_options.reconnect_attempts < 0)
+	{
+		log_warning(_("New value for reconnect_attempts is not valid. Should be greater or equal than zero.\n"));
+		return false;
+	}
+
+	if (new_options.reconnect_intvl < 0)
+	{
+		log_warning(_("New value for reconnect_interval is not valid. Should be greater or equal than zero.\n"));
+		return false;
+	}
+
+	/* Test conninfo string */
+	conn = establishDBConnection(new_options.conninfo, false);
+	if (!conn || (PQstatus(conn) != CONNECTION_OK))
+	{
+		log_warning(_("conninfo string is not valid, will keep current configuration.\n"));
+		return false;
+	}
+	PQfinish(conn);
+
+	/* Configuration seems ok, will load new values */
+	strcpy(orig_options->cluster_name, new_options.cluster_name);
+	orig_options->node = new_options.node;
+	strcpy(orig_options->conninfo, new_options.conninfo);
+	orig_options->failover = new_options.failover;
+	orig_options->priority = new_options.priority;
+	strcpy(orig_options->node_name, new_options.node_name);
+	strcpy(orig_options->promote_command, new_options.promote_command);
+	strcpy(orig_options->follow_command, new_options.follow_command);
+	strcpy(orig_options->rsync_options, new_options.rsync_options);
+	strcpy(orig_options->ssh_options, new_options.ssh_options);
+	orig_options->master_response_timeout = new_options.master_response_timeout;
+	orig_options->reconnect_attempts = new_options.reconnect_attempts;
+	orig_options->reconnect_intvl = new_options.reconnect_intvl;
+	/*
+	 * XXX These ones can change with a simple SIGHUP?
+
+		strcpy (orig_options->loglevel, new_options.loglevel);
+		strcpy (orig_options->logfacility, new_options.logfacility);
+
+		logger_shutdown();
+		XXX do we have progname here ?
+		logger_init(progname, orig_options.loglevel, orig_options.logfacility);
+	*/
+
+	return true;
+}

config.h

@@ -1,6 +1,6 @@
 /*
  * config.h
- * Copyright (c) 2ndQuadrant, 2010-2011
+ * Copyright (c) 2ndQuadrant, 2010-2014
  *
  * 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
@@ -28,13 +28,30 @@ typedef struct
 	char cluster_name[MAXLEN];
 	int node;
 	char conninfo[MAXLEN];
+	int failover;
+	int priority;
+	char node_name[MAXLEN];
+	char promote_command[MAXLEN];
+	char follow_command[MAXLEN];
 	char loglevel[MAXLEN];
 	char logfacility[MAXLEN];
 	char rsync_options[QUERY_STR_LEN];
+	char ssh_options[QUERY_STR_LEN];
+	int  master_response_timeout;
+	int  reconnect_attempts;
+	int  reconnect_intvl;
+	char pg_bindir[MAXLEN];
+	char pgctl_options[MAXLEN];
+	char logfile[MAXLEN];
+	int monitor_interval_secs;
+	int retry_promote_interval_secs;
 } t_configuration_options;
 
-void parse_config(const char* config_file, t_configuration_options* options);
+#define T_CONFIGURATION_OPTIONS_INITIALIZER { "", -1, "", MANUAL_FAILOVER, -1, "", "", "", "", "", "", "", -1, -1, -1, "", "", "", 0, 0 }
+
+void parse_config(const char *config_file, t_configuration_options *options);
 void parse_line(char *buff, char *name, char *value);
 char *trim(char *s);
+bool reload_configuration(char *config_file, t_configuration_options *orig_options);
 
 #endif

dbutils.c

@@ -1,6 +1,6 @@
 /*
  * dbutils.c - Database connection/management functions
- * Copyright (C) 2ndQuadrant, 2010-2011
+ * Copyright (C) 2ndQuadrant, 2010-2014
  *
  * 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
@@ -17,6 +17,10 @@
  *
  */
 
+#include <unistd.h>
+#include <time.h>
+#include <sys/time.h>
+
 #include "repmgr.h"
 #include "strutil.h"
 #include "log.h"
@@ -25,7 +29,12 @@ PGconn *
 establishDBConnection(const char *conninfo, const bool exit_on_error)
 {
 	/* Make a connection to the database */
-	PGconn *conn = PQconnectdb(conninfo);
+	PGconn *conn = NULL;
+	char    connection_string[MAXLEN];
+
+	strcpy(connection_string, conninfo);
+	strcat(connection_string, " fallback_application_name='repmgr'");
+	conn = PQconnectdb(connection_string);
 
 	/* Check to see that the backend connection was successfully made */
 	if ((PQstatus(conn) != CONNECTION_OK))
@@ -64,33 +73,104 @@ establishDBConnectionByParams(const char *keywords[], const char *values[],const
 	return conn;
 }
 
-bool
+int
 is_standby(PGconn *conn)
 {
 	PGresult   *res;
-	bool		result;
+	int			result = 0;
 
 	res = PQexec(conn, "SELECT pg_is_in_recovery()");
 
-	if (PQresultStatus(res) != PGRES_TUPLES_OK)
+	if (res == NULL || PQresultStatus(res) != PGRES_TUPLES_OK)
 	{
 		log_err(_("Can't query server mode: %s"),
 		        PQerrorMessage(conn));
-		PQclear(res);
+		result = -1;
-		PQfinish(conn);
-		exit(ERR_DB_QUERY);
 	}
-
+	else if (PQntuples(res) == 1 && strcmp(PQgetvalue(res, 0, 0), "t") == 0)
-	if (strcmp(PQgetvalue(res, 0, 0), "f") == 0)
+		result = 1;
-		result = false;
-	else
-		result = true;
 
 	PQclear(res);
 	return result;
 }
 
 
+
+int
+is_witness(PGconn *conn, char *schema, char *cluster, int node_id)
+{
+	PGresult   *res;
+	int			result = 0;
+	char		sqlquery[QUERY_STR_LEN];
+
+	sqlquery_snprintf(sqlquery, "SELECT witness from %s.repl_nodes where cluster = '%s' and id = %d",
+	                  schema, cluster, node_id);
+	res = PQexec(conn, sqlquery);
+	if (PQresultStatus(res) != PGRES_TUPLES_OK)
+	{
+		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;
+}
+
+
+/* check the PQStatus and try to 'select 1' to confirm good connection */
+bool
+is_pgup(PGconn *conn, int timeout)
+{
+	char		sqlquery[QUERY_STR_LEN];
+	/* Check the connection status twice in case it changes after reset */
+	bool		twice = false;
+
+	/* Check the connection status twice in case it changes after reset */
+	for (;;)
+	{
+		if (PQstatus(conn) != CONNECTION_OK)
+		{
+			if (twice)
+				return false;
+			PQreset(conn);  /* reconnect */
+			twice = true;
+		}
+		else
+		{
+			/*
+			* Send a SELECT 1 just to check if the connection is OK
+			*/
+			if (!CancelQuery(conn, timeout))
+				goto failed;
+			if (wait_connection_availability(conn, timeout) != 1)
+				goto failed;
+
+			sqlquery_snprintf(sqlquery, "SELECT 1");
+			if (PQsendQuery(conn, sqlquery) == 0)
+			{
+				log_warning(_("PQsendQuery: Query could not be sent to primary. %s\n"),
+				            PQerrorMessage(conn));
+				goto failed;
+			}
+			if (wait_connection_availability(conn, timeout) != 1)
+				goto failed;
+
+			break;
+
+failed:
+			/* we need to retry, because we might just have loose the connection once */
+			if (twice)
+				return false;
+			PQreset(conn);  /* reconnect */
+			twice = true;
+		}
+	}
+	return true;
+}
+
+
 /*
  * If postgreSQL version is 9 or superior returns the major version
  * if 8 or inferior returns an empty string
@@ -114,8 +194,7 @@ pg_version(PGconn *conn, char* major_version)
 		log_err(_("Version check PQexec failed: %s"),
 		        PQerrorMessage(conn));
 		PQclear(res);
-		PQfinish(conn);
+		return NULL;
-		exit(ERR_DB_QUERY);
 	}
 
 	major_version1 = atoi(PQgetvalue(res, 0, 0));
@@ -136,12 +215,13 @@ pg_version(PGconn *conn, char* major_version)
 }
 
 
-bool
+int
-guc_setted(PGconn *conn, const char *parameter, const char *op,
+guc_set(PGconn *conn, const char *parameter, const char *op,
            const char *value)
 {
 	PGresult	*res;
 	char		sqlquery[QUERY_STR_LEN];
+	int			retval = 1;
 
 	sqlquery_snprintf(sqlquery, "SELECT true FROM pg_settings "
 	                  " WHERE name = '%s' AND setting %s '%s'",
@@ -152,18 +232,49 @@ guc_setted(PGconn *conn, const char *parameter, const char *op,
 	{
 		log_err(_("GUC setting check PQexec failed: %s"),
 		        PQerrorMessage(conn));
-		PQclear(res);
+		retval = -1;
-		PQfinish(conn);
-		exit(ERR_DB_QUERY);
 	}
-	if (PQntuples(res) == 0)
+	else if (PQntuples(res) == 0)
 	{
-		PQclear(res);
+		retval = 0;
-		return false;
 	}
+
 	PQclear(res);
 
-	return true;
+	return retval;
+}
+
+/**
+ * Just like guc_set except with an extra parameter containing the name of
+ * the pg datatype so that the comparison can be done properly.
+ */
+int
+guc_set_typed(PGconn *conn, const char *parameter, const char *op, 
+                 const char *value, const char *datatype)
+{
+	PGresult	*res;
+	char		sqlquery[QUERY_STR_LEN];
+	int			retval = 1;
+
+	sqlquery_snprintf(sqlquery, "SELECT true FROM pg_settings "
+	                  " WHERE name = '%s' AND setting::%s %s '%s'::%s",
+	                  parameter, datatype, op, value, datatype);
+
+	res = PQexec(conn, sqlquery);
+	if (PQresultStatus(res) != PGRES_TUPLES_OK)
+	{
+		log_err(_("GUC setting check PQexec failed: %s"),
+		        PQerrorMessage(conn));
+		retval = -1;
+	}
+	else if (PQntuples(res) == 0)
+	{
+		retval = 0;
+	}
+
+	PQclear(res);
+
+	return retval;
 }
 
 
@@ -171,7 +282,7 @@ const char *
 get_cluster_size(PGconn *conn)
 {
 	PGresult	*res;
-	const char	*size;
+	const char	*size = NULL;
 	char		 sqlquery[QUERY_STR_LEN];
 
 	sqlquery_snprintf(
@@ -184,11 +295,12 @@ get_cluster_size(PGconn *conn)
 	{
 		log_err(_("Get cluster size PQexec failed: %s"),
 		        PQerrorMessage(conn));
-		PQclear(res);
-		PQfinish(conn);
-		exit(ERR_DB_QUERY);
 	}
-	size = PQgetvalue(res, 0, 0);
+	else
+	{
+		size = PQgetvalue(res, 0, 0);
+	}
+
 	PQclear(res);
 	return size;
 }
@@ -202,7 +314,7 @@ get_cluster_size(PGconn *conn)
  * connection string is placed there.
  */
 PGconn *
-getMasterConnection(PGconn *standby_conn, int id, char *cluster,
+getMasterConnection(PGconn *standby_conn, char *schema, char *cluster,
                     int *master_id, char *master_conninfo_out)
 {
 	PGconn		*master_conn	 = NULL;
@@ -211,7 +323,6 @@ getMasterConnection(PGconn *standby_conn, int id, char *cluster,
 	char		 sqlquery[QUERY_STR_LEN];
 	char		 master_conninfo_stack[MAXCONNINFO];
 	char		*master_conninfo = &*master_conninfo_stack;
-	char		 schema_str[MAXLEN];
 	char		 schema_quoted[MAXLEN];
 
 	int		 i;
@@ -228,10 +339,9 @@ getMasterConnection(PGconn *standby_conn, int id, char *cluster,
 	 *
 	 * Assemble the unquoted schema name
 	 */
-	maxlen_snprintf(schema_str, "repmgr_%s", cluster);
 	{
-		char *identifier = PQescapeIdentifier(standby_conn, schema_str,
+		char *identifier = PQescapeIdentifier(standby_conn, schema,
-		                                      strlen(schema_str));
+		                                      strlen(schema));
 
 		maxlen_snprintf(schema_quoted, "%s", identifier);
 		PQfreemem(identifier);
@@ -241,9 +351,9 @@ getMasterConnection(PGconn *standby_conn, int id, char *cluster,
 	log_info(_("finding node list for cluster '%s'\n"),
 	         cluster);
 
-	sqlquery_snprintf(sqlquery, "SELECT * FROM %s.repl_nodes "
+	sqlquery_snprintf(sqlquery, "SELECT id, conninfo FROM %s.repl_nodes "
-	                  " WHERE cluster = '%s' and id <> %d",
+	                  " WHERE cluster = '%s' and not witness",
-	                  schema_quoted, cluster, id);
+	                  schema_quoted, cluster);
 
 	res1 = PQexec(standby_conn, sqlquery);
 	if (PQresultStatus(res1) != PGRES_TUPLES_OK)
@@ -251,15 +361,14 @@ getMasterConnection(PGconn *standby_conn, int id, char *cluster,
 		log_err(_("Can't get nodes info: %s\n"),
 		        PQerrorMessage(standby_conn));
 		PQclear(res1);
-		PQfinish(standby_conn);
+		return NULL;
-		exit(ERR_DB_QUERY);
 	}
 
 	for (i = 0; i < PQntuples(res1); i++)
 	{
 		/* initialize with the values of the current node being processed */
 		*master_id = atoi(PQgetvalue(res1, i, 0));
-		strncpy(master_conninfo, PQgetvalue(res1, i, 2), MAXCONNINFO);
+		strncpy(master_conninfo, PQgetvalue(res1, i, 1), MAXCONNINFO);
 		log_info(_("checking role of cluster node '%s'\n"),
 		         master_conninfo);
 		master_conn = establishDBConnection(master_conninfo, false);
@@ -311,3 +420,103 @@ getMasterConnection(PGconn *standby_conn, int id, char *cluster,
 	PQclear(res1);
 	return NULL;
 }
+
+
+/*
+ * wait until current query finishes ignoring any results, this could be an async command
+ * or a cancelation of a query
+ * return 1 if Ok; 0 if any error ocurred; -1 if timeout reached
+ */
+int
+wait_connection_availability(PGconn *conn, long long timeout)
+{
+	PGresult   *res;
+	fd_set      read_set;
+	int         sock = PQsocket(conn);
+	struct timeval tmout, before, after;
+	struct timezone tz;
+
+	/* recalc to microseconds */
+	timeout *= 1000000;
+
+	while (timeout > 0)
+	{
+		if (PQconsumeInput(conn) == 0)
+		{
+			log_warning(_("wait_connection_availability: could not receive data from connection. %s\n"),
+						PQerrorMessage(conn));
+			return 0;
+		}
+
+		if (PQisBusy(conn) == 0)
+		{
+			do {
+				res = PQgetResult(conn);
+				PQclear(res);
+			} while(res != NULL);
+
+			break;
+		}
+
+
+		tmout.tv_sec = 0;
+		tmout.tv_usec = 250000;
+
+		FD_ZERO(&read_set);
+		FD_SET(sock, &read_set);
+
+		gettimeofday(&before, &tz);
+		if (select(sock, &read_set, NULL, NULL, &tmout) == -1)
+		{
+			log_warning(
+				_("wait_connection_availability: select() returned with error: %s"),
+				strerror(errno));
+			return -1;
+		}
+		gettimeofday(&after, &tz);
+
+		timeout -= (after.tv_sec * 1000000 + after.tv_usec) -
+			(before.tv_sec * 1000000 + before.tv_usec);
+	}
+
+
+	if (timeout >= 0)
+	{
+		return 1;
+	}
+
+	log_warning(_("wait_connection_availability: timeout reached"));
+	return -1;
+}
+
+
+bool
+CancelQuery(PGconn *conn, int timeout)
+{
+	char errbuf[ERRBUFF_SIZE];
+	PGcancel *pgcancel;
+
+	if (wait_connection_availability(conn, timeout) != 1)
+		return false;
+
+	pgcancel = PQgetCancel(conn);
+
+	if (pgcancel == NULL)
+		return false;
+
+	/*
+	 * PQcancel can only return 0 if socket()/connect()/send()
+ 	 * fails, in any of those cases we can assume something
+	 * bad happened to the connection
+	 */
+	if (PQcancel(pgcancel, errbuf, ERRBUFF_SIZE) == 0)
+	{
+		log_warning(_("Can't stop current query: %s\n"), errbuf);
+		PQfreeCancel(pgcancel);
+		return false;
+	}
+
+	PQfreeCancel(pgcancel);
+
+	return true;
+}

dbutils.h

@@ -1,6 +1,6 @@
 /*
  * dbutils.h
- * Copyright (c) 2ndQuadrant, 2010-2011
+ * Copyright (c) 2ndQuadrant, 2010-2014
  *
  * 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,16 +20,25 @@
 #ifndef _REPMGR_DBUTILS_H_
 #define _REPMGR_DBUTILS_H_
 
+#include "strutil.h"
+
 PGconn *establishDBConnection(const char *conninfo, const bool exit_on_error);
 PGconn *establishDBConnectionByParams(const char *keywords[],
                                       const char *values[],
                                       const bool exit_on_error);
-bool	is_standby(PGconn *conn);
+int     is_standby(PGconn *conn);
+int     is_witness(PGconn *conn, char *schema, char *cluster, int node_id);
+bool	is_pgup(PGconn *conn, int timeout);
 char   *pg_version(PGconn *conn, char* major_version);
-bool	guc_setted(PGconn *conn, const char *parameter, const char *op,
+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);
+
 const char	 *get_cluster_size(PGconn *conn);
-PGconn *getMasterConnection(PGconn *standby_conn, int id, char *cluster,
+PGconn *getMasterConnection(PGconn *standby_conn, char *schema, char *cluster,
                             int *master_id, char *master_conninfo_out);
 
+int wait_connection_availability(PGconn *conn, long long timeout);
+bool CancelQuery(PGconn *conn, int timeout);
 #endif

debian/DEBIAN/control

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

debian/repmgr.repmgrd.default

@@ -0,0 +1,14 @@
+#!/bin/sh
+# default settings for repmgrd. This file is source by /bin/sh from
+# /etc/init.d/repmgrd
+
+# Options for repmgrd
+REPMGRD_OPTS=""
+
+# repmgrd binary
+REPMGR_BIN="/usr/bin/repmgr"
+
+# pid file
+REPMGR_PIDFILE="/var/run/repmgrd.pid"
+
+

debian/repmgr.repmgrd.init

@@ -0,0 +1,48 @@
+#!/bin/sh
+### BEGIN INIT INFO
+# Provides:          repmgrd
+# Required-Start:    $local_fs $remote_fs $network $syslog $postgresql
+# Required-Stop:     $local_fs $remote_fs $network $syslog $postgresql
+# Should-Start:      $syslog $postgresql
+# Should-Start:      $syslog $postgresql
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: Start/stop repmgrd
+### END INIT INFO
+
+set -e
+
+if test -f /etc/default/repmgrd; then
+    . /etc/default/repmgrd
+fi
+
+if [ -z "$REPMGRD_BIN" ]; then
+    REPMGRD_BIN="/usr/bin/repmgrd"
+fi
+
+if [ -z "$REPMGRD_PIDFILE" ]; then
+    REPMGRD_PIDFILE="/var/run/repmgrd.pid"
+fi
+
+test -x $REPMGRD_BIN || exit 0
+
+case "$1" in
+    start)
+        start-stop-daemon --start --quiet --make-pidfile --pidfile $REPMGRD_PIDFILE --exec $REPMGRD_BIN $REPMGRD_OPTS
+        ;;
+
+    stop)
+        start-stop-daemon --stop --oknodo --quiet --pidfile $REPMGRD_PIDFILE
+        ;;
+
+    restart)
+        $0 stop && $0 start || exit 1
+        ;;
+
+    *)
+        echo "Usage: $0 {start|stop|restart}"
+        exit 1
+        ;;
+esac
+
+exit 0

errcode.h

@@ -1,6 +1,6 @@
 /*
  * errcode.h
- * Copyright (C) 2ndQuadrant, 2011
+ * Copyright (C) 2ndQuadrant, 2010-2014
  *
  * 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
@@ -33,5 +33,8 @@
 #define ERR_PROMOTED 8
 #define ERR_BAD_PASSWORD 9
 #define ERR_STR_OVERFLOW 10
+#define ERR_FAILOVER_FAIL 11
+#define ERR_BAD_SSH	12
+#define ERR_SYS_FAILURE 13
 
 #endif	/* _ERRCODE_H_ */

log.c

@@ -1,6 +1,6 @@
 /*
  * log.c - Logging methods
- * Copyright (C) 2ndQuadrant, 2010-2011
+ * Copyright (C) 2ndQuadrant, 2010-2014
  *
  * This module is a set of methods for logging (currently only syslog)
  *
@@ -25,9 +25,11 @@
 
 #ifdef HAVE_SYSLOG
 #include <syslog.h>
-#include <stdarg.h>
 #endif
 
+#include <stdarg.h>
+#include <time.h>
+
 #include "log.h"
 
 #define DEFAULT_IDENT "repmgr"
@@ -37,13 +39,38 @@
 
 /* #define REPMGR_DEBUG */
 
+void stderr_log_with_level(const char *level_name, int level, const char *fmt, ...) {
+	size_t len = strlen(fmt);
+	char fmt1[len + 150];
+	time_t t;
+	struct tm *tm;
+	char buff[100];
+	va_list ap;
+
+	if(log_level >= level) {
+		time(&t);
+		tm = localtime(&t);
+
+		va_start(ap, fmt);
+
+		strftime(buff, 100, "[%Y-%m-%d %H:%M:%S]", tm);
+		snprintf(fmt1, len + 150, "%s [%s] %s", buff, level_name, fmt);
+		vfprintf(stderr, fmt1, ap);
+
+		va_end(ap);
+
+		fflush(stderr);
+	}
+}
+
+
 static int detect_log_level(const char* level);
 static int detect_log_facility(const char* facility);
 
 int log_type = REPMGR_STDERR;
 int log_level = LOG_NOTICE;
 
-bool logger_init(const char* ident, const char* level, const char* facility)
+bool logger_init(t_configuration_options *opts, const char* ident, const char* level, const char* facility)
 {
 
 	int l;
@@ -115,6 +142,11 @@ bool logger_init(const char* ident, const char* level, const char* facility)
 
 #endif
 
+	if (*opts->logfile)
+	{
+		freopen(opts->logfile, "a", stderr);
+	}
+
 	return true;
 
 }

log.h

@@ -1,6 +1,6 @@
 /*
  * log.h
- * Copyright (c) 2ndQuadrant, 2010-2011
+ * Copyright (c) 2ndQuadrant, 2010-2014
  *
  * 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
@@ -25,15 +25,17 @@
 #define REPMGR_SYSLOG 1
 #define REPMGR_STDERR 2
 
+void stderr_log_with_level(const char *level_name, int level, const char *fmt, ...) __attribute__ ((format (PG_PRINTF_ATTRIBUTE, 3, 4)));
+
 /* Standard error logging */
-#define stderr_log_debug(...) if (log_level >= LOG_DEBUG) fprintf(stderr, __VA_ARGS__)
+#define stderr_log_debug(...) stderr_log_with_level("DEBUG", LOG_DEBUG, __VA_ARGS__)
-#define stderr_log_info(...) if (log_level >= LOG_INFO) fprintf(stderr, __VA_ARGS__)
+#define stderr_log_info(...)  stderr_log_with_level("INFO", LOG_INFO, __VA_ARGS__)
-#define stderr_log_notice(...) if (log_level >= LOG_NOTICE) fprintf(stderr, __VA_ARGS__)
+#define stderr_log_notice(...) stderr_log_with_level("NOTICE", LOG_NOTICE, __VA_ARGS__)
-#define stderr_log_warning(...) if (log_level >= LOG_WARNING) fprintf(stderr, __VA_ARGS__)
+#define stderr_log_warning(...) stderr_log_with_level("WARNING", LOG_WARNING, __VA_ARGS__)
-#define stderr_log_err(...) if (log_level >= LOG_ERR) fprintf(stderr, __VA_ARGS__)
+#define stderr_log_err(...) stderr_log_with_level("ERROR", LOG_ERR, __VA_ARGS__)
-#define stderr_log_crit(...) if (log_level >= LOG_CRIT) fprintf(stderr, __VA_ARGS__)
+#define stderr_log_crit(...) stderr_log_with_level("CRITICAL", LOG_CRIT, __VA_ARGS__)
-#define stderr_log_alert(...) if (log_level >= LOG_ALERT) fprintf(stderr, __VA_ARGS__)
+#define stderr_log_alert(...) stderr_log_with_level("ALERT", LOG_ALERT, __VA_ARGS__)
-#define stderr_log_emerg(...) if (log_level >= LOG_EMERG) fprintf(stderr, __VA_ARGS__)
+#define stderr_log_emerg(...) stderr_log_with_level("EMERGENCY", LOG_EMERG, __VA_ARGS__)
 
 #ifdef HAVE_SYSLOG
 
@@ -112,7 +114,7 @@
 
 /* Logger initialisation and shutdown */
 bool logger_shutdown(void);
-bool logger_init(const char* ident, const char* level, const char* facility);
+bool logger_init(t_configuration_options *opts, const char* ident, const char* level, const char* facility);
 void logger_min_verbose(int minimum);
 
 extern int log_type;

repmgr.conf

@@ -1,21 +0,0 @@
-###################################################
-# Replication Manager configuration file
-###################################################
-
-# Cluster name
-cluster=test
-
-# Node ID
-node=2
-
-# Connection information
-conninfo='host=192.168.204.104'
-rsync_options=--archive --checksum --compress --progress --rsh=ssh
-
-# Log level: possible values are DEBUG, INFO, NOTICE, WARNING, ERR, ALERT, CRIT or EMERG
-# Default: NOTICE
-loglevel=NOTICE
-
-# Logging facility: possible values are STDERR or - for Syslog integration - one of LOCAL0, LOCAL1, ..., LOCAL7, USER
-# Default: STDERR
-logfacility=STDERR

repmgr.conf.sample

@@ -0,0 +1,62 @@
+###################################################
+# Replication Manager configuration file
+###################################################
+
+# Cluster name
+cluster=test
+
+# Node ID
+node=2
+node_name=standby2
+
+# Connection information
+conninfo='host=192.168.204.104'
+rsync_options=--archive --checksum --compress --progress --rsh="ssh -o \"StrictHostKeyChecking no\""
+ssh_options=-o "StrictHostKeyChecking no"
+
+# How many seconds we wait for master response before declaring master failure
+master_response_timeout=60
+
+# How many time we try to reconnect to master before starting failover procedure
+reconnect_attempts=6
+reconnect_interval=10
+
+# Autofailover options
+failover=manual
+priority=-1
+promote_command='repmgr standby promote -f /path/to/repmgr.conf'
+follow_command='repmgr standby follow -f /path/to/repmgr.conf -W'
+
+# Log level: possible values are DEBUG, INFO, NOTICE, WARNING, ERR, ALERT, CRIT or EMERG
+# Default: NOTICE
+loglevel=NOTICE
+
+# Logging facility: possible values are STDERR or - for Syslog integration - one of LOCAL0, LOCAL1, ..., LOCAL7, USER
+# Default: STDERR
+logfacility=STDERR
+
+# path to pg_ctl executable
+pg_bindir=/usr/bin/
+
+#
+# you may add command line arguments for pg_ctl
+#
+# pg_ctl_options='-s'
+
+#
+# redirect stderr to a logfile
+#
+# logfile='/var/log/repmgr.log'
+
+#
+# change monitoring interval; default is 2s
+#
+# monitor_interval_secs=2
+
+#
+# change wait time for master; before we bail out and exit when the
+# master disappears, we wait 6 * retry_promote_interval_secs seconds;
+# by default this would be half an hour (since sleep_delay default
+# value is 300)
+#
+# retry_promote_interval_secs=300

repmgr.h

@@ -1,6 +1,6 @@
 /*
  * repmgr.h
- * Copyright (c) 2ndQuadrant, 2010-2011
+ * Copyright (c) 2ndQuadrant, 2010-2014
  *
  * 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
@@ -30,6 +30,7 @@
 
 #define PRIMARY_MODE		0
 #define STANDBY_MODE		1
+#define WITNESS_MODE		2
 
 #include "config.h"
 #define MAXFILENAME		1024
@@ -42,6 +43,9 @@
 #define DEFAULT_DBNAME			"postgres"
 #define DEFAULT_REPMGR_SCHEMA_PREFIX	"repmgr_"
 
+#define MANUAL_FAILOVER		0
+#define AUTOMATIC_FAILOVER	1
+
 /* Run time options type */
 typedef struct
 {
@@ -55,9 +59,16 @@ typedef struct
 	char wal_keep_segments[MAXLEN];
 	bool verbose;
 	bool force;
+	bool wait_for_master;
+	bool ignore_rsync_warn;
 
 	char masterport[MAXLEN];
+	char localport[MAXLEN];
 
+	/* parameter used by CLUSTER CLEANUP */
+	int keep_history;
 } t_runtime_options;
 
+#define T_RUNTIME_OPTIONS_INITIALIZER { "", "", "", "", "", "", DEFAULT_WAL_KEEP_SEGMENTS, false, false, false, false, "", "", 0 }
+
 #endif

repmgr.sql

@@ -1,7 +1,7 @@
 /*
  * repmgr.sql
  *
- * Copyright (C) 2ndQuadrant, 2011
+ * Copyright (C) 2ndQuadrant, 2010-2014
  *
  */
 
@@ -14,8 +14,11 @@ CREATE SCHEMA repmgr;
  */
 CREATE TABLE repl_nodes (
   id            integer primary key,
-  cluster   text        not null,       -- Name to identify the cluster
+  cluster   	text    not null,       -- Name to identify the cluster
-  conninfo      text    not null
+  name			text	not null,
+  conninfo      text    not null,
+  priority  	integer not null,
+  witness   	boolean not null default false
 );
 ALTER TABLE repl_nodes OWNER TO repmgr;
 
@@ -28,13 +31,12 @@ CREATE TABLE repl_monitor (
   standby_node                   INTEGER NOT NULL,
   last_monitor_time                      TIMESTAMP WITH TIME ZONE NOT NULL,
   last_wal_primary_location      TEXT NOT NULL,
-  last_wal_standby_location      TEXT NOT NULL,
+  last_wal_standby_location      TEXT,		-- In case of a witness server this will be NULL
   replication_lag                BIGINT NOT NULL,
   apply_lag                      BIGINT NOT NULL
 );
 ALTER TABLE repl_monitor OWNER TO repmgr;
 
-
 /*
  * This view shows the latest monitor info about every node.
  * Interesting thing to see:
@@ -46,14 +48,14 @@ ALTER TABLE repl_monitor OWNER TO repmgr;
  * time_lag: how many seconds are we from being up-to-date with master
  */
 CREATE VIEW repl_status AS
-WITH monitor_info AS (SELECT *, ROW_NUMBER() OVER (PARTITION BY primary_node, standby_node
+SELECT primary_node, standby_node, name AS standby_name, last_monitor_time, last_wal_primary_location,
-                                                       ORDER BY last_monitor_time desc)
-                        FROM repl_monitor)
-SELECT primary_node, standby_node, last_monitor_time, last_wal_primary_location,
        last_wal_standby_location, pg_size_pretty(replication_lag) replication_lag,
        pg_size_pretty(apply_lag) apply_lag,
        age(now(), last_monitor_time) AS time_lag
-  FROM monitor_info a
+ FROM repl_monitor JOIN repl_nodes ON standby_node = id
- WHERE row_number = 1;
+WHERE (standby_node, last_monitor_time) IN (SELECT standby_node, MAX(last_monitor_time)
+                                              FROM repl_monitor GROUP BY 1);
 
 ALTER VIEW repl_status OWNER TO repmgr;
+
+CREATE INDEX idx_repl_status_sort ON repl_monitor(last_monitor_time, standby_node);

sql/Makefile

@@ -0,0 +1,20 @@
+#
+# Makefile
+# Copyright (c) 2ndQuadrant, 2010
+#
+
+MODULE_big = repmgr_funcs
+DATA_built=repmgr_funcs.sql
+DATA=uninstall_repmgr_funcs.sql
+OBJS=repmgr_funcs.o
+
+ifdef USE_PGXS
+PG_CONFIG = pg_config
+PGXS := $(shell $(PG_CONFIG) --pgxs)
+include $(PGXS)
+else
+subdir = contrib/repmgr/sql
+top_builddir = ../../..
+include $(top_builddir)/src/Makefile.global
+include $(top_srcdir)/contrib/contrib-global.mk
+endif

sql/repmgr_funcs.c

@@ -0,0 +1,232 @@
+/*
+ * repmgr_funcs.c
+ * Copyright (c) 2ndQuadrant, 2010
+ *
+ * Shared memory state management and some backend functions in SQL
+ */
+
+#include "postgres.h"
+#include "fmgr.h"
+#include "access/xlog.h"
+#include "miscadmin.h"
+#include "storage/ipc.h"
+#include "storage/lwlock.h"
+#include "storage/procarray.h"
+#include "storage/shmem.h"
+#include "storage/spin.h"
+#include "utils/builtins.h"
+#include "utils/timestamp.h"
+
+/* same definition as the one in xlog_internal.h */
+#define MAXFNAMELEN 	64
+
+PG_MODULE_MAGIC;
+
+/*
+ * Global shared state
+ */
+typedef struct repmgrSharedState
+{
+    LWLockId    lock;           		/* protects search/modification */
+    char		location[MAXFNAMELEN];	/* last known xlog location */
+	TimestampTz last_updated;
+} repmgrSharedState;
+
+/* Links to shared memory state */
+static repmgrSharedState *shared_state = NULL;
+
+static shmem_startup_hook_type prev_shmem_startup_hook = NULL;
+
+void        _PG_init(void);
+void        _PG_fini(void);
+
+static void repmgr_shmem_startup(void);
+static Size repmgr_memsize(void);
+
+static bool repmgr_set_standby_location(char *locationstr);
+
+Datum repmgr_update_standby_location(PG_FUNCTION_ARGS);
+Datum repmgr_get_last_standby_location(PG_FUNCTION_ARGS);
+
+PG_FUNCTION_INFO_V1(repmgr_update_standby_location);
+PG_FUNCTION_INFO_V1(repmgr_get_last_standby_location);
+
+Datum repmgr_update_last_updated(PG_FUNCTION_ARGS);
+Datum repmgr_get_last_updated(PG_FUNCTION_ARGS);
+
+PG_FUNCTION_INFO_V1(repmgr_update_last_updated);
+PG_FUNCTION_INFO_V1(repmgr_get_last_updated);
+
+
+/*
+ * Module load callback
+ */
+void
+_PG_init(void)
+{
+	/*
+	 * In order to create our shared memory area, we have to be loaded via
+	 * shared_preload_libraries.  If not, fall out without hooking into any of
+	 * the main system.  (We don't throw error here because it seems useful to
+	 * allow the repmgr functions to be created even when the
+	 * module isn't active.  The functions must protect themselves against
+	 * being called then, however.)
+	 */
+	if (!process_shared_preload_libraries_in_progress)
+		return;
+
+	/*
+	 * Request additional shared resources.  (These are no-ops if we're not in
+	 * the postmaster process.)  We'll allocate or attach to the shared
+	 * resources in repmgr_shmem_startup().
+	 */
+	RequestAddinShmemSpace(repmgr_memsize());
+	RequestAddinLWLocks(1);
+
+	/*
+	 * Install hooks.
+	 */
+	prev_shmem_startup_hook = shmem_startup_hook;
+	shmem_startup_hook = repmgr_shmem_startup;
+}
+
+/*
+ * Module unload callback
+ */
+void
+_PG_fini(void)
+{
+	/* Uninstall hooks. */
+	shmem_startup_hook = prev_shmem_startup_hook;
+}
+
+/*
+ * shmem_startup hook: allocate or attach to shared memory,
+ */
+static void
+repmgr_shmem_startup(void)
+{
+	bool		found;
+
+	if (prev_shmem_startup_hook)
+		prev_shmem_startup_hook();
+
+	/* reset in case this is a restart within the postmaster */
+	shared_state = NULL;
+
+	/*
+	 * Create or attach to the shared memory state, including hash table
+	 */
+	LWLockAcquire(AddinShmemInitLock, LW_EXCLUSIVE);
+
+	shared_state = ShmemInitStruct("repmgr shared state",
+						   sizeof(repmgrSharedState),
+						   &found);
+
+	if (!found)
+	{
+		/* First time through ... */
+		shared_state->lock = LWLockAssign();
+		snprintf(shared_state->location,
+				sizeof(shared_state->location), "%X/%X", 0, 0);
+	}
+
+	LWLockRelease(AddinShmemInitLock);
+}
+
+
+/*
+ * Estimate shared memory space needed.
+ */
+static Size
+repmgr_memsize(void)
+{
+    return MAXALIGN(sizeof(repmgrSharedState));
+}
+
+
+static bool
+repmgr_set_standby_location(char *locationstr)
+{
+    /* Safety check... */
+    if (!shared_state)
+        return false;
+
+    LWLockAcquire(shared_state->lock, LW_EXCLUSIVE);
+	strncpy(shared_state->location, locationstr, MAXFNAMELEN);
+    LWLockRelease(shared_state->lock);
+
+	return true;
+}
+
+
+/* SQL Functions */
+
+/* Read last xlog location reported by this standby from shared memory */
+Datum
+repmgr_get_last_standby_location(PG_FUNCTION_ARGS)
+{
+	char location[MAXFNAMELEN];
+
+	/* Safety check... */
+	if (!shared_state)
+		PG_RETURN_NULL();
+
+	LWLockAcquire(shared_state->lock, LW_SHARED);
+	strncpy(location, shared_state->location, MAXFNAMELEN);
+	LWLockRelease(shared_state->lock);
+
+	PG_RETURN_TEXT_P(cstring_to_text(location));
+}
+
+
+/* Set update last xlog location reported by this standby to shared memory */
+Datum
+repmgr_update_standby_location(PG_FUNCTION_ARGS)
+{
+	text       *location = PG_GETARG_TEXT_P(0);
+	char       *locationstr;
+
+    /* Safety check... */
+    if (!shared_state)
+        PG_RETURN_BOOL(false);
+
+    locationstr = text_to_cstring(location);
+
+	PG_RETURN_BOOL(repmgr_set_standby_location(locationstr));
+}
+
+/* update and return last updated with current timestamp */
+Datum
+repmgr_update_last_updated(PG_FUNCTION_ARGS)
+{
+	TimestampTz last_updated = GetCurrentTimestamp();
+
+	/* Safety check... */
+	if (!shared_state)
+		PG_RETURN_NULL();
+
+	LWLockAcquire(shared_state->lock, LW_SHARED);
+	shared_state->last_updated = last_updated;
+	LWLockRelease(shared_state->lock);
+
+	PG_RETURN_TIMESTAMPTZ(last_updated);
+}
+
+
+/* get last updated timestamp */
+Datum
+repmgr_get_last_updated(PG_FUNCTION_ARGS)
+{
+	TimestampTz last_updated;
+
+    /* Safety check... */
+    if (!shared_state)
+        PG_RETURN_NULL();
+
+	LWLockAcquire(shared_state->lock, LW_EXCLUSIVE);
+	last_updated = shared_state->last_updated;
+	LWLockRelease(shared_state->lock);
+
+	PG_RETURN_TIMESTAMPTZ(last_updated);
+}

sql/repmgr_funcs.sql.in

@@ -0,0 +1,23 @@
+/*
+ * repmgr_function.sql
+ * Copyright (c) 2ndQuadrant, 2010-2014
+ *
+ */
+
+-- SET SEARCH_PATH TO 'repmgr';
+
+CREATE FUNCTION repmgr_update_standby_location(text) RETURNS boolean
+AS 'MODULE_PATHNAME', 'repmgr_update_standby_location'
+LANGUAGE C STRICT;
+
+CREATE FUNCTION repmgr_get_last_standby_location() RETURNS text
+AS 'MODULE_PATHNAME', 'repmgr_get_last_standby_location'
+LANGUAGE C STRICT;
+
+CREATE FUNCTION repmgr_update_last_updated() RETURNS TIMESTAMP WITH TIME ZONE
+AS 'MODULE_PATHNAME', 'repmgr_update_last_updated'
+LANGUAGE C STRICT;
+
+CREATE FUNCTION repmgr_get_last_updated() RETURNS TIMESTAMP WITH TIME ZONE
+AS 'MODULE_PATHNAME', 'repmgr_get_last_updated'
+LANGUAGE C STRICT;

sql/uninstall_repmgr_funcs.sql

@@ -0,0 +1,11 @@
+/*
+ * uninstall_repmgr_funcs.sql
+ * Copyright (c) 2ndQuadrant, 2010-2014
+ *
+ */
+
+DROP FUNCTION repmgr_update_standby_location(text);
+DROP FUNCTION repmgr_get_last_standby_location();
+
+DROP FUNCTION repmgr_update_last_updated();
+DROP FUNCTION repmgr_get_last_updated();

strutil.c

@@ -1,7 +1,7 @@
 /*
  * strutil.c
  *
- * Copyright (C) 2ndQuadrant, 2011
+ * Copyright (C) 2ndQuadrant, 2010-2014
  *
  * 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
@@ -25,8 +25,17 @@
 #include "log.h"
 #include "strutil.h"
 
-static int xvsnprintf(char *str, size_t size, const char *format, va_list ap);
+static int xvsnprintf(char *str, size_t size, const char *format, va_list ap) __attribute__ ((format (PG_PRINTF_ATTRIBUTE, 3, 0)));
 
+/* Add strnlen on platforms that don't have it, like OS X */
+#ifndef strnlen
+size_t
+strnlen(const char *s, size_t n)
+{
+	const char *end = (const char *) memchr(s, '\0', n);
+	return(end ? end - s : n);
+}
+#endif
 
 static int
 xvsnprintf(char *str, size_t size, const char *format, va_list ap)
@@ -35,7 +44,7 @@ xvsnprintf(char *str, size_t size, const char *format, va_list ap)
 
 	retval = vsnprintf(str, size, format, ap);
 
-	if (retval >= size)
+	if (retval >= (int)size)
 	{
 		log_err(_("Buffer of size not large enough to format entire string '%s'\n"),
 		        str);

strutil.h

@@ -1,6 +1,6 @@
 /*
  * strutil.h
- * Copyright (C) 2ndQuadrant, 2010-2011
+ * Copyright (C) 2ndQuadrant, 2010-2014
  *
  *
  * This program is free software: you can redistribute it and/or modify
@@ -31,8 +31,13 @@
 #define MAXCONNINFO		1024
 
 
-extern int xsnprintf(char *str, size_t size, const char *format, ...);
+extern int xsnprintf(char *str, size_t size, const char *format, ...) __attribute__ ((format (PG_PRINTF_ATTRIBUTE, 3, 4)));
-extern int sqlquery_snprintf(char *str, const char *format, ...);
+extern int sqlquery_snprintf(char *str, const char *format, ...) __attribute__ ((format (PG_PRINTF_ATTRIBUTE, 2, 3)));
-extern int maxlen_snprintf(char *str, const char *format, ...);
+extern int maxlen_snprintf(char *str, const char *format, ...) __attribute__ ((format (PG_PRINTF_ATTRIBUTE, 2, 3)));
+
+/* Add strnlen on platforms that don't have it, like OS X */
+#ifndef strnlen
+extern size_t strnlen(const char *s, size_t n);
+#endif
 
 #endif	/* _STRUTIL_H_ */

uninstall_repmgr.sql

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

version.h

@@ -0,0 +1,5 @@
+#ifndef _VERSION_H_
+#define _VERSION_H_
+
+#define REPMGR_VERSION "2.0RC1"
+#endif