ctdb-ipalloc: Don't build a global IP tree

It isn't used outside this function, so just use a local variable.

This makes create_merged_ip_list() independent of the CTDB context.

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

diff --git a/ctdb/include/ctdb_private.h b/ctdb/include/ctdb_private.h
index 57a045a9e9be47b75070db625310602fa2cddd5d..f7982de10fdcd0d4f6516e857c5e24179732c6cd 100644 (file)
--- a/ctdb/include/ctdb_private.h
+++ b/ctdb/include/ctdb_private.h
@@ -364,9 +364,6 @@ struct ctdb_context {
        /* mapping from pid to ctdb_client * */
        struct ctdb_client_pid_list *client_pids;
 
-       /* used in the recovery daemon to remember the ip allocation */
-       struct trbt_tree *ip_tree;
-
        /* Used to defer db attach requests while in recovery mode */
        struct ctdb_deferred_attach_context *deferred_attach;
 

diff --git a/ctdb/server/ctdb_takeover.c b/ctdb/server/ctdb_takeover.c
index 0b18f4a5e932ffb42d55698a4882e884120b7e55..e0c0ca110e3fa217c32695066520c5e53d5caa99 100644 (file)
--- a/ctdb/server/ctdb_takeover.c
+++ b/ctdb/server/ctdb_takeover.c
@@ -1220,14 +1220,14 @@ static int ctdb_reload_remote_public_ips(struct ctdb_context *ctdb,
 }
 
 static struct public_ip_list *
-create_merged_ip_list(struct ctdb_context *ctdb, struct ipalloc_state *ipalloc_state)
+create_merged_ip_list(struct ipalloc_state *ipalloc_state)
 {
        int i, j;
        struct public_ip_list *ip_list;
        struct ctdb_public_ip_list *public_ips;
+       struct trbt_tree *ip_tree;
 
-       TALLOC_FREE(ctdb->ip_tree);
-       ctdb->ip_tree = trbt_create(ctdb, 0);
+       ip_tree = trbt_create(ipalloc_state, 0);
 
        if (ipalloc_state->known_public_ips == NULL) {
                DEBUG(DEBUG_ERR, ("Known public IPs not set\n"));
@@ -1241,10 +1241,12 @@ create_merged_ip_list(struct ctdb_context *ctdb, struct ipalloc_state *ipalloc_s
                for (j=0; j < public_ips->num; j++) {
                        struct public_ip_list *tmp_ip;
 
-                       tmp_ip = talloc_zero(ctdb->ip_tree, struct public_ip_list);
+                       /* This is returned as part of ip_list */
+                       tmp_ip = talloc_zero(ipalloc_state, struct public_ip_list);
                        if (tmp_ip == NULL) {
                                DEBUG(DEBUG_ERR,
                                      (__location__ " out of memory\n"));
+                               talloc_free(ip_tree);
                                return NULL;
                        }
 
@@ -1258,7 +1260,7 @@ create_merged_ip_list(struct ctdb_context *ctdb, struct ipalloc_state *ipalloc_s
                        tmp_ip->addr = public_ips->ip[j].addr;
                        tmp_ip->next = NULL;
 
-                       trbt_insertarray32_callback(ctdb->ip_tree,
+                       trbt_insertarray32_callback(ip_tree,
                                IP_KEYLEN, ip_key(&public_ips->ip[j].addr),
                                add_ip_callback,
                                tmp_ip);
@@ -1266,7 +1268,8 @@ create_merged_ip_list(struct ctdb_context *ctdb, struct ipalloc_state *ipalloc_s
        }
 
        ip_list = NULL;
-       trbt_traversearray32(ctdb->ip_tree, IP_KEYLEN, getips_count_callback, &ip_list);
+       trbt_traversearray32(ip_tree, IP_KEYLEN, getips_count_callback, &ip_list);
+       talloc_free(ip_tree);
 
        return ip_list;
 }
@@ -1725,10 +1728,12 @@ int ctdb_takeover_run(struct ctdb_context *ctdb, struct ctdb_node_map_old *nodem
           a full list of all public addresses that exist in the cluster.
           Walk over all node structures and create a merged list of
           all public addresses that exist in the cluster.
-
-          keep the tree of ips around as ctdb->ip_tree
        */
-       all_ips = create_merged_ip_list(ctdb, ipalloc_state);
+       all_ips = create_merged_ip_list(ipalloc_state);
+       if (all_ips == NULL) {
+               talloc_free(tmp_ctx);
+               return -1;
+       }
        ipalloc_state->all_ips = all_ips;
 
        ipalloc_state->force_rebalance_nodes = force_rebalance_nodes;

diff --git a/ctdb/tests/src/ctdb_takeover_tests.c b/ctdb/tests/src/ctdb_takeover_tests.c
index a46ddbcba6c63809b40555e229fe0e96fa35c407..9de3f2789f21d808a9719325d94d1dd1ef51a8b5 100644 (file)
--- a/ctdb/tests/src/ctdb_takeover_tests.c
+++ b/ctdb/tests/src/ctdb_takeover_tests.c
@@ -316,8 +316,7 @@ static void ctdb_test_init(const char nodestates[],
                             tval_noiptakeover,
                             tval_noiptakeoverondisabled);
 
-       (*ipalloc_state)->all_ips = create_merged_ip_list(*ctdb,
-                                                         *ipalloc_state);
+       (*ipalloc_state)->all_ips = create_merged_ip_list(*ipalloc_state);
 
        (*ipalloc_state)->force_rebalance_nodes = NULL;
 }