ctdb-ipalloc: Drop known public IPs from IP allocation state

This is never used in the allocation algorithms.  It is only used when
building the merged IP list.

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

diff --git a/ctdb/server/ipalloc.c b/ctdb/server/ipalloc.c
index d60da0315c852e9b430d2235d39e6f23dad1117f..72e0fc4d34fee5b06f6a64a04593bc4043403742 100644 (file)
--- a/ctdb/server/ipalloc.c
+++ b/ctdb/server/ipalloc.c
@@ -62,7 +62,8 @@ static int getips_count_callback(void *param, void *data)
  * merged list of all public addresses needs to be built so that IP
  * allocation can be done. */
 static struct public_ip_list *
-create_merged_ip_list(struct ipalloc_state *ipalloc_state)
+create_merged_ip_list(struct ipalloc_state *ipalloc_state,
+                     struct ctdb_public_ip_list *known_ips)
 {
        int i, j;
        struct public_ip_list *ip_list;
@@ -71,14 +72,14 @@ create_merged_ip_list(struct ipalloc_state *ipalloc_state)
 
        ip_tree = trbt_create(ipalloc_state, 0);
 
-       if (ipalloc_state->known_public_ips == NULL) {
+       if (known_ips == NULL) {
                DEBUG(DEBUG_ERR, ("Known public IPs not set\n"));
                return NULL;
        }
 
        for (i=0; i < ipalloc_state->num; i++) {
 
-               public_ips = &ipalloc_state->known_public_ips[i];
+               public_ips = &known_ips[i];
 
                for (j=0; j < public_ips->num; j++) {
                        struct public_ip_list *tmp_ip;
@@ -120,10 +121,10 @@ bool 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->known_public_ips = known_ips;
        ipalloc_state->available_public_ips = available_ips;
 
-       ipalloc_state->all_ips = create_merged_ip_list(ipalloc_state);
+       ipalloc_state->all_ips = create_merged_ip_list(ipalloc_state,
+                                                      known_ips);
 
        return (ipalloc_state->all_ips != NULL);
 }

diff --git a/ctdb/server/ipalloc.h b/ctdb/server/ipalloc.h
index b5a1bcc849d9cd5f68d152e8a147fb45ab765ddc..06c69f87d0c2acac6b46bbe0855eb4d38841a97a 100644 (file)
--- a/ctdb/server/ipalloc.h
+++ b/ctdb/server/ipalloc.h
@@ -45,7 +45,6 @@ struct ipalloc_state {
        uint32_t num;
 
        /* Arrays with data for each node */
-       struct ctdb_public_ip_list *known_public_ips;
        struct ctdb_public_ip_list *available_public_ips;
        bool *noiptakeover;
        bool *noiphost;