ctdb-ipalloc: ipalloc_set_public_ips() can't fail

So make it a void function.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=12254

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>

diff --git a/ctdb/server/ctdb_takeover.c b/ctdb/server/ctdb_takeover.c
index 02e5c3d397d33da2c04205ea99249fefade4753c..f71c5fbab550334913eb88cee116262a3f5ecffe 100644 (file)
--- a/ctdb/server/ctdb_takeover.c
+++ b/ctdb/server/ctdb_takeover.c
@@ -1604,11 +1604,7 @@ int ctdb_takeover_run(struct ctdb_context *ctdb, struct ctdb_node_map_old *nodem
                return -1;
        }
 
-       if (! ipalloc_set_public_ips(ipalloc_state, known_ips, available_ips)) {
-               DEBUG(DEBUG_ERR, ("Failed to set public IPs\n"));
-               talloc_free(tmp_ctx);
-               return -1;
-       }
+       ipalloc_set_public_ips(ipalloc_state, known_ips, available_ips);
 
        if (! ipalloc_can_host_ips(ipalloc_state)) {
                DEBUG(DEBUG_WARNING,("No nodes available to host public IPs yet\n"));

diff --git a/ctdb/server/ipalloc.c b/ctdb/server/ipalloc.c
index 7fd422a765a1bc0f76326ee65c58c89d56f860fd..37804ea029e48c578c6d2acf8a22ed3d874990b7 100644 (file)
--- a/ctdb/server/ipalloc.c
+++ b/ctdb/server/ipalloc.c
@@ -224,14 +224,12 @@ void ipalloc_set_node_flags(struct ipalloc_state *ipalloc_state,
        }
 }
 
-bool ipalloc_set_public_ips(struct ipalloc_state *ipalloc_state,
+void ipalloc_set_public_ips(struct ipalloc_state *ipalloc_state,
                            struct ctdb_public_ip_list *known_ips,
                            struct ctdb_public_ip_list *available_ips)
 {
        ipalloc_state->available_public_ips = available_ips;
        ipalloc_state->known_public_ips = known_ips;
-
-       return true;
 }
 
 /* This can only return false if there are no available IPs *and*

diff --git a/ctdb/server/ipalloc.h b/ctdb/server/ipalloc.h
index 66a5e75eb6af5db595cd4af39d3f2e8cbdf09c2b..d116426c7be00b3b89f967b0c4ab04879de098d9 100644 (file)
--- a/ctdb/server/ipalloc.h
+++ b/ctdb/server/ipalloc.h
@@ -56,7 +56,7 @@ void ipalloc_set_node_flags(struct ipalloc_state *ipalloc_state,
                            uint32_t *tval_noiptakeover,
                            uint32_t *tval_noiphostonalldisabled);
 
-bool ipalloc_set_public_ips(struct ipalloc_state *ipalloc_state,
+void ipalloc_set_public_ips(struct ipalloc_state *ipalloc_state,
                            struct ctdb_public_ip_list *known_ips,
                            struct ctdb_public_ip_list *available_ips);
 

diff --git a/ctdb/tests/src/ctdb_takeover_tests.c b/ctdb/tests/src/ctdb_takeover_tests.c
index a8f7841232c30de5a6230b4377769e96f811019a..bbeb241c98ac31d5cf43523bbcb2a94d46239d3a 100644 (file)
--- a/ctdb/tests/src/ctdb_takeover_tests.c
+++ b/ctdb/tests/src/ctdb_takeover_tests.c
@@ -300,10 +300,7 @@ static void ctdb_test_init(TALLOC_CTX *mem_ctx,
                                 read_ips_for_multiple_nodes,
                                 &known, &avail);
 
-       if (! ipalloc_set_public_ips(*ipalloc_state, known, avail)) {
-               DEBUG(DEBUG_ERR, ("Failed to set public IPs\n"));
-               exit(1);
-       }
+       ipalloc_set_public_ips(*ipalloc_state, known, avail);
 
        tval_noiptakeover = get_tunable_values(mem_ctx, nodemap->num,
                                               "CTDB_SET_NoIPTakeover");