[SCM] CTDB repository - branch 1.2 updated - ctdb-1.9.1-483-g7b0ddb7

[Ronnie Sahlberg]

The branch, 1.2 has been updated
       via  7b0ddb7b3b4b4ce42ee40872b66269920d9f472a (commit)
       via  3bc0cb45f6406f5d673e842b2f072d13930dae96 (commit)
      from  d46363a722d563896e21ad82dd264e84f1912aca (commit)

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


- Log -----------------------------------------------------------------
commit 7b0ddb7b3b4b4ce42ee40872b66269920d9f472a
Author: Ronnie Sahlberg <ronniesahlberg at gmail.com>
Date:   Thu Sep 22 15:16:06 2011 +1000

    New version 1.2.36

commit 3bc0cb45f6406f5d673e842b2f072d13930dae96
Author: Ronnie Sahlberg <ronniesahlberg at gmail.com>
Date:   Thu Sep 22 15:13:26 2011 +1000

    One of the entry points to release an ip reset the pnn field before invoking the eventscript.
    this triggered a check for "only run the eventscript if we host the address" to trigger and shortcir=cuit calling the eventscript.
    
    An effect of this would be that 'ctdb delip' would remove the ip from ctdb, but fail to delete it from the interface.
    
    S1028798

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

Summary of changes:
 packaging/RPM/ctdb.spec.in |    5 ++++-
 server/ctdb_takeover.c     |   10 +++++++---
 2 files changed, 11 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/packaging/RPM/ctdb.spec.in b/packaging/RPM/ctdb.spec.in
index b647365..d5b081d 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.35
+Version: 1.2.36
 Release: 1GITHASH
 Epoch: 0
 License: GNU GPL version 3
@@ -144,6 +144,9 @@ development libraries for ctdb
 %{_libdir}/libctdb.a
 
 %changelog
+* Thu Sep 22 2011 : Version 1.2.36
+ - Fix for delip failing to delete the ip drom the interface
+   S1028798
 * Thu Sep 8 2011 : Version 1.2.35
  - Drop loglevel for a tevent warning from critical to error : S1028400
  - Add new tunable : AllowClientDBAttach to allow different / new approach to concurrent upgrade
diff --git a/server/ctdb_takeover.c b/server/ctdb_takeover.c
index 626b10e..5865a17 100644
--- a/server/ctdb_takeover.c
+++ b/server/ctdb_takeover.c
@@ -3312,13 +3312,14 @@ int32_t ctdb_control_del_public_address(struct ctdb_context *ctdb, TDB_DATA inda
 			TALLOC_CTX *mem_ctx;
 
 			DLIST_REMOVE(ctdb->vnn, vnn);
-			if (vnn->iface != NULL) {
-				ctdb_vnn_unassign_iface(ctdb, vnn);
-			}
 			if (vnn->pnn != ctdb->pnn) {
+				if (vnn->iface != NULL) {
+					ctdb_vnn_unassign_iface(ctdb, vnn);
+				}
 				talloc_free(vnn);
 				return 0;
 			}
+			vnn->pnn = -1;
 
 			mem_ctx = talloc_new(ctdb);
 			talloc_steal(mem_ctx, vnn);
@@ -3330,6 +3331,9 @@ int32_t ctdb_control_del_public_address(struct ctdb_context *ctdb, TDB_DATA inda
 					 ctdb_vnn_iface_string(vnn),
 					 ctdb_addr_to_str(&vnn->public_address),
 					 vnn->public_netmask_bits);
+			if (vnn->iface != NULL) {
+				ctdb_vnn_unassign_iface(ctdb, vnn);
+			}
 			if (ret != 0) {
 				return -1;
 			}


-- 
CTDB repository