[SCM] CTDB repository - branch 1.0.82 updated - ctdb-1.0.82-9-g8ada393

[Ronnie Sahlberg]

The branch, 1.0.82 has been updated
       via  8ada39306af1f1fdfe122dd0fc6d041aa6acf1c0 (commit)
       via  ca46b7f6d105cee008172705f1e119d25b04efa6 (commit)
      from  40a6cc53b65fce41b20f133c11769d4a48a773c4 (commit)

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


- Log -----------------------------------------------------------------
commit 8ada39306af1f1fdfe122dd0fc6d041aa6acf1c0
Author: Ronnie Sahlberg <ronniesahlberg at gmail.com>
Date:   Wed Jun 10 10:35:32 2009 +1000

    new version 1.0.82-5

commit ca46b7f6d105cee008172705f1e119d25b04efa6
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:
 packaging/RPM/ctdb.spec |    6 ++++--
 server/ctdb_monitor.c   |    2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/packaging/RPM/ctdb.spec b/packaging/RPM/ctdb.spec
index 186bdab..f2f6c2f 100644
--- a/packaging/RPM/ctdb.spec
+++ b/packaging/RPM/ctdb.spec
@@ -5,7 +5,7 @@ Vendor: Samba Team
 Packager: Samba Team <samba at samba.org>
 Name: ctdb
 Version: 1.0.82
-Release: 4
+Release: 5
 Epoch: 0
 License: GNU GPL version 3
 Group: System Environment/Daemons
@@ -132,7 +132,9 @@ fi
 %{_libdir}/pkgconfig/ctdb.pc
 
 %changelog
-* Tue Jun 9 2009 : Version 1.0.83-4
+* Wed Jun 10 2009 : Version 1.0.82-5
+ - When banning a node, only drop all ips on the node being banned, not all nodes.
+* Tue Jun 9 2009 : Version 1.0.82-4
  - dont delete the socket when exiting ctdb
 * Tue Jun 2 2009 : Version 1.0.82-3
  - Make ctdb statistics support machinereadable output
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