ports/databases/pgpool-II-33/files/patch-recovery.c
Matthew Seaman 219d691b62 New port databases/pgpool-II-33
Repo copy from databases/pgpool-II. Changes from that port:

 - New port for pgpool-II33-3.3.3

 - Stagify

 - Add libtool, gmake, pgsql, perl5 to USES.  Drop .la files -- this is a
   new port, so there can't be any pre-existing consumers of the .la files
   to worry about.

 - Use options helpers

 - The configure used with this software is buggy and doesn't understand
   --without-foo.  Just omit any --with-foo or --without-foo to turn off
   'foo' support.

 - New options PAM MEMCACHED.  Enable PAM by default since it
   only depends on the base system.

 - Add RUN_DEPENDS on rsync and perl5 -- needed for the scripts
   pgpool_copy_backup and pgpool_remote_start respectively.

 - regenerate pkg-plist using 'make makeplist.'  Just use the auto-generated
   plist entries for %%PORTDOCS%% rather than the $PORTDOCS variable.

 - Simplify how docs and sql/contrib functions are installed

Redports:   	https://redports.org/buildarchive/20140629142900-20287/
PR:		189880
Submitted by:	michelle@sorbs.net
Reviewed by:	pi, matthew
2014-06-29 16:40:54 +00:00

19 lines
681 B
C

--- ./recovery.c.orig 2014-03-24 14:30:01.000000000 +0000
+++ ./recovery.c 2014-06-29 14:55:21.756363519 +0100
@@ -117,7 +117,7 @@
if (REPLICATION)
{
- pool_log("starting 2nd stage");
+ pool_log("starting 2nd stage. waiting connections from clients to be closed");
/* 2nd stage */
*InRecovery = RECOVERY_ONLINE;
@@ -430,6 +430,6 @@
sleep(3);
} while (i++ < WAIT_RETRY_COUNT);
- pool_error("wait_connection_closed: existing connections did not close in %d sec.", pool_config->recovery_timeout);
+ pool_error("wait_connection_closed: existing connections (%d) did not close in %d sec.", Req_info->conn_counter, pool_config->recovery_timeout);
return 1;
}