ctdb-ipalloc: Make no_ip_failback a boolean

No need to expose tunable values that far down.

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 efa466a77a0ff7e93e50422b29d1fbdddef20c57..fe94c09eea1a6ceb4090b2961d01512283b20c23 100644 (file)
--- a/ctdb/server/ctdb_takeover.c
+++ b/ctdb/server/ctdb_takeover.c
@@ -1428,7 +1428,7 @@ static struct ipalloc_state * ipalloc_state_init(struct ctdb_context *ctdb,
                ipalloc_state->algorithm = IPALLOC_NONDETERMINISTIC;
        }
 
                ipalloc_state->algorithm = IPALLOC_NONDETERMINISTIC;
        }
 

-       ipalloc_state->no_ip_failback = ctdb->tunable.no_ip_failback;
+       ipalloc_state->no_ip_failback = (ctdb->tunable.no_ip_failback != 0);

 
        return ipalloc_state;
 fail:
 
        return ipalloc_state;
 fail:

diff --git a/ctdb/server/ipalloc.h b/ctdb/server/ipalloc.h
index 3d7d783d88732c83edb663dc93ea2acea932bcfa..990fca46d1c313cc1274def9d6a94eabc9fb9429 100644 (file)
--- a/ctdb/server/ipalloc.h
+++ b/ctdb/server/ipalloc.h
@@ -51,7 +51,7 @@ struct ipalloc_state {
 
        struct public_ip_list *all_ips;
        enum ipalloc_algorithm algorithm;
 
        struct public_ip_list *all_ips;
        enum ipalloc_algorithm algorithm;

-       uint32_t no_ip_failback;
+       bool no_ip_failback;

        uint32_t *force_rebalance_nodes;
 };
 
        uint32_t *force_rebalance_nodes;
 };
 

diff --git a/ctdb/server/ipalloc_deterministic.c b/ctdb/server/ipalloc_deterministic.c
index 2801bf6c25e48b8be6f21c96664f5d48cf9e3eef..c11d5f9dc71a05e1498ec328c2ed5fdec8a35716 100644 (file)
--- a/ctdb/server/ipalloc_deterministic.c
+++ b/ctdb/server/ipalloc_deterministic.c
@@ -48,7 +48,7 @@ bool ipalloc_deterministic(struct ipalloc_state *ipalloc_state)
         * IPs, since the modulo step above implicitly fails
         * back IPs to their "home" node.
         */
         * IPs, since the modulo step above implicitly fails
         * back IPs to their "home" node.
         */

-       if (1 == ipalloc_state->no_ip_failback) {
+       if (ipalloc_state->no_ip_failback) {

                DEBUG(DEBUG_WARNING, ("WARNING: 'NoIPFailback' set but ignored - incompatible with 'DeterministicIPs\n"));
        }
 
                DEBUG(DEBUG_WARNING, ("WARNING: 'NoIPFailback' set but ignored - incompatible with 'DeterministicIPs\n"));
        }
 

diff --git a/ctdb/server/ipalloc_lcp2.c b/ctdb/server/ipalloc_lcp2.c
index a4b3bdb028e3c1bbdf6bf1988611e38181afca24..48e0d0218e84bc0d7663c557a27faf4037b741b9 100644 (file)
--- a/ctdb/server/ipalloc_lcp2.c
+++ b/ctdb/server/ipalloc_lcp2.c
@@ -487,7 +487,7 @@ bool ipalloc_lcp2(struct ipalloc_state *ipalloc_state)
        lcp2_allocate_unassigned(ipalloc_state, lcp2_imbalances);
 
        /* If we don't want IPs to fail back then don't rebalance IPs. */
        lcp2_allocate_unassigned(ipalloc_state, lcp2_imbalances);
 
        /* If we don't want IPs to fail back then don't rebalance IPs. */

-       if (1 == ipalloc_state->no_ip_failback) {
+       if (ipalloc_state->no_ip_failback) {

                goto finished;
        }
 
                goto finished;
        }
 

diff --git a/ctdb/server/ipalloc_nondeterministic.c b/ctdb/server/ipalloc_nondeterministic.c
index 300d8f1982fc87cfcc1ff9390237b6e74d247411..9951aaac91c87ffe93e407204ba78c5044e85bd1 100644 (file)
--- a/ctdb/server/ipalloc_nondeterministic.c
+++ b/ctdb/server/ipalloc_nondeterministic.c
@@ -134,7 +134,7 @@ bool ipalloc_nondeterministic(struct ipalloc_state *ipalloc_state)
        basic_allocate_unassigned(ipalloc_state);
 
        /* If we don't want IPs to fail back then don't rebalance IPs. */
        basic_allocate_unassigned(ipalloc_state);
 
        /* If we don't want IPs to fail back then don't rebalance IPs. */

-       if (1 == ipalloc_state->no_ip_failback) {
+       if (ipalloc_state->no_ip_failback) {

                return true;
        }
 
                return true;
        }