- Fix syntax error in tools/altperl/slon_watchdog.pl

- Add cleanup_interval example to sample slon.conf file

- Add cleanup_interval configuration configuration to regression tests

Per discussion on slony-bugs list with Cyril Scetbon

diff --git a/RELEASE b/RELEASE
index 63fa8be2872a9b7c778872d550d97404016aa92c..22c8066c1ad17375e3b3b99c2a8fdb131845f996 100644 (file)
--- a/RELEASE
+++ b/RELEASE
@@ -1,4 +1,4 @@
-$Id: RELEASE,v 1.3.2.1 2008-12-18 21:35:03 cbbrowne Exp $
+$Id: RELEASE,v 1.3.2.2 2009-01-05 22:04:09 cbbrowne Exp $
 
 RELEASE 2.0.0
 
@@ -11,8 +11,18 @@ RELEASE 2.0.1
 
   This would cause UPGRADE FUNCTIONS to fail.
 
-- Bug #?? - use of syslog levels had some inappropriate break statements so that some logging would get lost.
+- Bug #64 - use of syslog levels had some inappropriate break statements so that some logging would get lost.
 
 - If you had multiple clusters where one cluster name was a substring of the other, slon-tools.pm could find
   both when looking for slon processes relevant to the shorter cluster name.  Added a space to the relevant
   bit of slon-tools.pm
+
+- Failover had an insert into sl_event where # of columns provided didn't match those expected.  This
+  resulted from the change of snapshot handling which used to involve 3 columns where in 8.3+, there is
+  now a snapshot type.
+
+- Fix syntax error in tools/altperl/slon_watchdog.pl
+
+- Add cleanup_interval example to sample slon.conf file
+
+- Add cleanup_interval configuration configuration to regression tests

diff --git a/share/slon.conf-sample b/share/slon.conf-sample
index 060b1450498e5d0744d53e39b6904359446474de..79b9071c8b734b4e3d1b82d3a2dec177dbd2b380 100644 (file)
--- a/share/slon.conf-sample
+++ b/share/slon.conf-sample
@@ -1,9 +1,13 @@
-# $Id: slon.conf-sample,v 1.7 2007-08-08 15:24:22 cbbrowne Exp $
+# $Id: slon.conf-sample,v 1.7.2.1 2009-01-05 22:04:09 cbbrowne Exp $
 #
 # Sets how many cleanup cycles to run before a vacuum is done.
 # Range: [0,100], default: 3
 #vac_frequency=3
 
+# Aging interval to use for deleting old events and for trimming
+# data from sl_log_1/sl_log_2
+#cleanup_interval="10 minutes"
+
 # Debug log level (higher value ==> more output).  Range: [0,4], default 4
 #log_level=4
 

diff --git a/tests/run_test.sh b/tests/run_test.sh
index 9858f9a9ea60e8e37315cc677cd8662bceb5d27c..520c9ac46838d2f5cfd130c3b1d0233cdea2f4bf 100755 (executable)
--- a/tests/run_test.sh
+++ b/tests/run_test.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $Id: run_test.sh,v 1.26 2008-09-23 20:31:09 cbbrowne Exp $
+# $Id: run_test.sh,v 1.26.2.1 2009-01-05 22:04:08 cbbrowne Exp $
 
 pgbindir=${PGBINDIR:-"/usr/local/pgsql/bin"}
 numerrors=0
@@ -489,6 +489,7 @@ build_slonconf()
     CONFFILE=$mktmp/slon-conf.${node}
     echo "log_level=2" > ${CONFFILE}
     echo "vac_frequency=2" >> ${CONFFILE}
+    echo "cleanup_interval=\"30 seconds\"" >> ${CONFFILE}
     echo "sync_interval=2010" >> ${CONFFILE}
     echo "sync_interval_timeout=15000" >> ${CONFFILE}
     echo "sync_group_maxsize=8" >> ${CONFFILE}

diff --git a/tools/altperl/slon_watchdog.pl b/tools/altperl/slon_watchdog.pl
index dbea7a797e5dd4ae96eeca1b4a78c85012b99c13..fabf9e197bf291fa68bb766ecb3e12ea86d76d15 100755 (executable)
--- a/tools/altperl/slon_watchdog.pl
+++ b/tools/altperl/slon_watchdog.pl
@@ -1,5 +1,5 @@
 #!@@PERL@@
-# $Id: slon_watchdog.pl,v 1.15 2008-03-12 15:43:55 cbbrowne Exp $
+# $Id: slon_watchdog.pl,v 1.15.2.1 2009-01-05 22:04:09 cbbrowne Exp $
 # Author: Christopher Browne
 # Copyright 2004 Afilias Canada
 
@@ -43,7 +43,7 @@ while (1) {
   $pid = get_pid($node);
   if (!($pid)) {
     my ($dsn, $dbname) = ($DSN[$nodenum], $DBNAME[$nodenum]);
-    my ($logfile) = "$LOGDIR/slon-$dbname-$node.err"
+    my ($logfile) = "$LOGDIR/slon-$dbname-$node.err";
     open (SLONLOG, ">>$logfile");
     print SLONLOG "WATCHDOG: No Slon is running for node $node!\n";
     print SLONLOG "WATCHDOG: You ought to check the postmaster and slon for evidence of a crash!\n";