ctdb-ipalloc: Store known public IPs in IP allocation state

This was dropped because it wasn't used, but it will be needed again.

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/ipalloc.c b/ctdb/server/ipalloc.c
index dd88f81c29bf008a0b4c936806436ac6cd77828e..4f86d6e243d2769ea335e0c507825a378a13760e 100644 (file)
--- a/ctdb/server/ipalloc.c
+++ b/ctdb/server/ipalloc.c
@@ -230,6 +230,7 @@ bool ipalloc_set_public_ips(struct ipalloc_state *ipalloc_state,
                            struct ctdb_public_ip_list *available_ips)
 {
        ipalloc_state->available_public_ips = available_ips;
+       ipalloc_state->known_public_ips = known_ips;
 
        ipalloc_state->all_ips = create_merged_ip_list(ipalloc_state,
                                                       known_ips);

diff --git a/ctdb/server/ipalloc_private.h b/ctdb/server/ipalloc_private.h
index 232868738bfa518ada1db57eef29a4c738142b60..485f62738553d5deaf7afe9db36cbeb8e1aa25f9 100644 (file)
--- a/ctdb/server/ipalloc_private.h
+++ b/ctdb/server/ipalloc_private.h
@@ -31,6 +31,7 @@ struct ipalloc_state {
 
        /* Arrays with data for each node */
        struct ctdb_public_ip_list *available_public_ips;
+       struct ctdb_public_ip_list *known_public_ips;
        bool *noiptakeover;
        bool *noiphost;