new version 1.2.27-204

diff --git a/packaging/RPM/ctdb.spec.in b/packaging/RPM/ctdb.spec.in
index 32509ee170281feea585c309b443bdc382292d0c..2ddfaae0b05c05fb09537b36e901118e6d8263a9 100644 (file)
--- a/packaging/RPM/ctdb.spec.in
+++ b/packaging/RPM/ctdb.spec.in
@@ -4,7 +4,7 @@ Summary: Clustered TDB
 Vendor: Samba Team
 Packager: Samba Team <samba@samba.org>
 Version: 1.2.27
-Release: 203GITHASH
+Release: 204GITHASH
 Epoch: 0
 License: GNU GPL version 3
 Group: System Environment/Daemons
@@ -143,6 +143,8 @@ development libraries for ctdb
 %{_libdir}/libctdb.a
 
 %changelog
+* Fri Jul 29 2011 : Version 1.2.27-204
+ - ctdb delip updates.  CQ S1026664
 * Mon Jul 25 2011 : Version 1.2.27-203
  - Fix a bug with the talloc hierarchy when running takeip/releaseip eventscripts
    and talloc_free(vnn)-ing

diff --git a/tools/ctdb.c b/tools/ctdb.c
index 674622a68afa129dabbf86a5a019f316964d4702..652d24eef1cdaa7a6c05be2fd0ba065bf1d14330 100644 (file)
--- a/tools/ctdb.c
+++ b/tools/ctdb.c
@@ -1827,6 +1827,13 @@ static int control_delip(struct ctdb_context *ctdb, int argc, const char **argv)
                return -1;
        }
 
+       ret = ctdb_ctrl_del_public_ip(ctdb, TIMELIMIT(), options.pnn, &pub);
+       if (ret != 0) {
+               DEBUG(DEBUG_ERR, ("Unable to del public ip from node %u\n", options.pnn));
+               talloc_free(tmp_ctx);
+               return ret;
+       }
+
        if (ips->ips[i].pnn == options.pnn) {
                ret = find_other_host_for_public_ip(ctdb, &addr);
                if (ret != -1) {
@@ -1840,18 +1847,11 @@ static int control_delip(struct ctdb_context *ctdb, int argc, const char **argv)
                        } while (retries < 5 && ret != 0);
                        if (ret != 0) {
                                DEBUG(DEBUG_ERR,("Failed to move ip to node %d. Giving up.\n", options.pnn));
-                               return -1;
+                               return 0;
                        }
                }
        }
 
-       ret = ctdb_ctrl_del_public_ip(ctdb, TIMELIMIT(), options.pnn, &pub);
-       if (ret != 0) {
-               DEBUG(DEBUG_ERR, ("Unable to del public ip from node %u\n", options.pnn));
-               talloc_free(tmp_ctx);
-               return ret;
-       }
-
        talloc_free(tmp_ctx);
        return 0;
 }