[SCM] CTDB repository - branch master updated - ctdb-1.0.84-9-g46e8c37

[Ronnie Sahlberg]

The branch, master has been updated
       via  46e8c3737e6ff54fc80de8e962e922924c27bc35 (commit)
      from  2a52336ec021dfe8d56ba72726feb7b2dbd41f68 (commit)

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


- Log -----------------------------------------------------------------
commit 46e8c3737e6ff54fc80de8e962e922924c27bc35
Author: Ronnie Sahlberg <ronniesahlberg at gmail.com>
Date:   Wed Jun 10 10:28:47 2009 +1000

    When we ban a node, only drop the IPs on the node being banned, not on every node

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

Summary of changes:
 server/ctdb_monitor.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/server/ctdb_monitor.c b/server/ctdb_monitor.c
index 46d9c63..14da3b7 100644
--- a/server/ctdb_monitor.c
+++ b/server/ctdb_monitor.c
@@ -309,7 +309,7 @@ int32_t ctdb_control_modflags(struct ctdb_context *ctdb, TDB_DATA indata)
 				 CTDB_SRVID_SET_NODE_FLAGS, indata);
 
 	/* if we have become banned, we should go into recovery mode */
-	if ((node->flags & NODE_FLAGS_BANNED) && !(c->old_flags & NODE_FLAGS_BANNED)) {
+	if ((node->flags & NODE_FLAGS_BANNED) && !(c->old_flags & NODE_FLAGS_BANNED) && (node->pnn == ctdb->pnn)) {
 		/* make sure we are frozen */
 		DEBUG(DEBUG_NOTICE,("This node has been banned - forcing freeze and recovery\n"));
 		/* Reset the generation id to 1 to make us ignore any


-- 
CTDB repository