[SCM] CTDB repository - branch master updated - ctdb-1.0.87-49-gfbfa1c7

[Ronnie Sahlberg]

The branch, master has been updated
       via  fbfa1c72875dda4d1636d8e72c67ba09b10455df (commit)
       via  e5b25e1386294b1f800c32fb01c69c3c3ce85c26 (commit)
       via  d8d21884736a9610d48cf532e1c6778e511fb7a8 (commit)
      from  5852a526ce7d0333cd1f9a05353d8920ea99db37 (commit)

http://gitweb.samba.org/?p=sahlberg/ctdb.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit fbfa1c72875dda4d1636d8e72c67ba09b10455df
Author: Ronnie Sahlberg <ronniesahlberg at gmail.com>
Date:   Mon Aug 17 11:04:40 2009 +1000

    new version 1.0.88

commit e5b25e1386294b1f800c32fb01c69c3c3ce85c26
Author: Ronnie Sahlberg <ronniesahlberg at gmail.com>
Date:   Mon Aug 17 10:56:12 2009 +1000

    reduce the loglevel for the message that we switch to a different recmaster while waiting for ipreallocate to finish

commit d8d21884736a9610d48cf532e1c6778e511fb7a8
Author: Ronnie Sahlberg <ronniesahlberg at gmail.com>
Date:   Mon Aug 17 10:54:45 2009 +1000

    if no timeout at all is specified to the ctdb tool, neither using -T nor by setting CGTDB_TIMEOUT, then use 120 seconds as a default timepout before the ctdb command will exit with an error.

-----------------------------------------------------------------------

Summary of changes:
 packaging/RPM/ctdb.spec |   17 ++++++++++++++++-
 tools/ctdb.c            |   12 +++++++-----
 2 files changed, 23 insertions(+), 6 deletions(-)


Changeset truncated at 500 lines:

diff --git a/packaging/RPM/ctdb.spec b/packaging/RPM/ctdb.spec
index 0544e10..573fde6 100644
--- a/packaging/RPM/ctdb.spec
+++ b/packaging/RPM/ctdb.spec
@@ -4,7 +4,7 @@ Summary: Clustered TDB
 Vendor: Samba Team
 Packager: Samba Team <samba at samba.org>
 Name: ctdb
-Version: 1.0.87
+Version: 1.0.88
 Release: 1
 Epoch: 0
 License: GNU GPL version 3
@@ -131,6 +131,21 @@ fi
 %{_libdir}/pkgconfig/ctdb.pc
 
 %changelog
+* Mon Aug 17 2009 : Version 1.0.88
+ - Add a new state for eventscripts : DISABLED.
+   Add two new commands "ctdb enablescript/disablescript" to enable/disable
+   eventscripts at runtime.
+ - Bugfixes for TDB from rusty.
+ - Merge/Port changes from upstream TDB library by rusty.
+ - Additional new tests from MartinS. Tests for stop/continue.
+ - Initial patch to rework vacuuming/repacking process from Wolfgang Mueller.
+ - Updates from Michael Adam for persistent writes.
+ - Updates from MartinS to handle the new STOPPED bit in the test framework.
+ - Make it possible to enable/disable the RECMASTER and LMASTER roles
+   at runtime. Add two new commands 
+   "ctdb setlmasterrole/setrecmasterrole on/off"
+ - Make it possible to enable/disable the natgw feature at runtime. Add
+   the command "ctdb setnatgwstate on/off"
 * Fri Jul 17 2009 : Version 1.0.87
  - Add a new event "stopped" that is called when a node is stopped.
  - Documentation of the STOPPED flag and the stop/continue commands
diff --git a/tools/ctdb.c b/tools/ctdb.c
index a419e23..cd376c7 100644
--- a/tools/ctdb.c
+++ b/tools/ctdb.c
@@ -1707,7 +1707,7 @@ again:
 		event_loop_once(ctdb->ev);
 	}
 
-	DEBUG(DEBUG_ERR,("Timed out waiting for recmaster ipreallocate. Trying again\n"));
+	DEBUG(DEBUG_INFO,("Timed out waiting for recmaster ipreallocate. Trying again\n"));
 	retries++;
 	sleep(1);
 	goto again;
@@ -3487,12 +3487,14 @@ int main(int argc, const char *argv[])
 		ctdb_timeout = getenv("CTDB_TIMEOUT");
 		if (ctdb_timeout != NULL) {
 			options.maxruntime = strtoul(ctdb_timeout, NULL, 0);
+		} else {
+			/* default timeout is 120 seconds */
+			options.maxruntime = 120;
 		}
 	}
-	if (options.maxruntime != 0) {
-		signal(SIGALRM, ctdb_alarm);
-		alarm(options.maxruntime);
-	}
+
+	signal(SIGALRM, ctdb_alarm);
+	alarm(options.maxruntime);
 
 	/* setup the node number to contact */
 	if (nodestring != NULL) {


-- 
CTDB repository