[SCM] CTDB repository - branch 1.2 updated - ctdb-1.9.1-307-g3ec1630

[Ronnie Sahlberg]

The branch, 1.2 has been updated
       via  3ec163028aebc5118efb687f2c447bdde1070f93 (commit)
       via  759c8c5937269bed24c53b6a9107f3c201a52f77 (commit)
      from  8a143a97a313a2e50fb409f6382c759dbd14cdcd (commit)

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


- Log -----------------------------------------------------------------
commit 3ec163028aebc5118efb687f2c447bdde1070f93
Author: Ronnie Sahlberg <ronniesahlberg at gmail.com>
Date:   Mon Jan 31 17:48:22 2011 +1100

    New version 1.2.19

commit 759c8c5937269bed24c53b6a9107f3c201a52f77
Author: Ronnie Sahlberg <ronniesahlberg at gmail.com>
Date:   Mon Jan 31 17:40:26 2011 +1100

    If the node is stopped,   put a log entry in /var/log/* to indicate this is why we never become ready

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

Summary of changes:
 packaging/RPM/ctdb.spec.in |    7 ++++++-
 server/ctdb_monitor.c      |    3 +++
 2 files changed, 9 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/packaging/RPM/ctdb.spec.in b/packaging/RPM/ctdb.spec.in
index ba26b15..a7a01ac 100644
--- a/packaging/RPM/ctdb.spec.in
+++ b/packaging/RPM/ctdb.spec.in
@@ -3,7 +3,7 @@ Name: ctdb
 Summary: Clustered TDB
 Vendor: Samba Team
 Packager: Samba Team <samba at samba.org>
-Version: 1.2.18
+Version: 1.2.19
 Release: 1GITHASH
 Epoch: 0
 License: GNU GPL version 3
@@ -143,6 +143,11 @@ development libraries for ctdb
 %{_libdir}/libctdb.a
 
 %changelog
+* Mon Jan 31 2011 : Version 1.2.19
+ - Extra logging to show why CTDB dont start if it is in STOPPED state
+   CQ S1021747
+ - Collapse all DMASTER migration requests on one single dmaster node for a record into one single lockwait child.
+   CQ S1021584
 * Wed Jan 18 2011 : Version 1.2.18
  - Fix for a deadlock in the TDB library, causing "Time Jumped" error messages
    and hung CTDBD process.
diff --git a/server/ctdb_monitor.c b/server/ctdb_monitor.c
index fa642fb..f96dde4 100644
--- a/server/ctdb_monitor.c
+++ b/server/ctdb_monitor.c
@@ -224,6 +224,9 @@ static void ctdb_wait_until_recovered(struct event_context *ev, struct timed_eve
 	int ret;
 
 	DEBUG(DEBUG_NOTICE,("CTDB_WAIT_UNTIL_RECOVERED\n"));
+	if (ctdb->nodes[ctdb->pnn]->flags & NODE_FLAGS_STOPPED) {
+		DEBUG(DEBUG_NOTICE,("Node is STOPPED. Node will NOT recover.\n"));
+	}
 
 	if (ctdb->vnn_map->generation == INVALID_GENERATION) {
 		ctdb->db_persistent_startup_generation = INVALID_GENERATION;


-- 
CTDB repository