diff options
| author | Martin Schwenke <martin@meltin.net> | 2016-12-10 19:39:11 +1100 |
|---|---|---|
| committer | Amitay Isaacs <amitay@samba.org> | 2016-12-19 04:07:08 +0100 |
| commit | 9b456bc7301927d515bab14ae7b875330da70f21 (patch) | |
| tree | 0c8b3f2e7d9fdcdad0c3850d1385e10c7240d76c /ctdb/tests/src/ctdb_takeover_tests.c | |
| parent | c4eab456ab9f634cd7fa0ce36749432d36d03a2b (diff) | |
| download | samba-9b456bc7301927d515bab14ae7b875330da70f21.tar.gz | |
ctdb-takeover: NoIPTakeover is global across cluster
Instead of gathering the value from all nodes, just use the value on
the recovery master and have it affect all nodes.
Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
Diffstat (limited to 'ctdb/tests/src/ctdb_takeover_tests.c')
| -rw-r--r-- | ctdb/tests/src/ctdb_takeover_tests.c | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/ctdb/tests/src/ctdb_takeover_tests.c b/ctdb/tests/src/ctdb_takeover_tests.c index 1f463300aec..ee99e2ae9a1 100644 --- a/ctdb/tests/src/ctdb_takeover_tests.c +++ b/ctdb/tests/src/ctdb_takeover_tests.c @@ -154,9 +154,10 @@ static void ctdb_test_init(TALLOC_CTX *mem_ctx, { struct ctdb_public_ip_list *known; struct ctdb_public_ip_list *avail; - char *tok, *ns, *t; + char *tok, *ns; + const char *t; struct ctdb_node_map *nodemap; - uint32_t *tval_noiptakeover; + uint32_t noiptakeover; uint32_t *tval_noiptakeoverondisabled; ctdb_sock_addr sa_zero = { .ip = { 0 } }; enum ipalloc_algorithm algorithm; @@ -194,8 +195,16 @@ static void ctdb_test_init(TALLOC_CTX *mem_ctx, } } + t = getenv("CTDB_SET_NoIPTakeover"); + if (t != NULL) { + noiptakeover = (uint32_t) strtol(t, NULL, 0); + } else { + noiptakeover = 0; + } + *ipalloc_state = ipalloc_state_init(mem_ctx, nodemap->num, algorithm, + (noiptakeover != 0), false, NULL); assert(*ipalloc_state != NULL); @@ -205,16 +214,12 @@ static void ctdb_test_init(TALLOC_CTX *mem_ctx, ipalloc_set_public_ips(*ipalloc_state, known, avail); - tval_noiptakeover = get_tunable_values(mem_ctx, nodemap->num, - "CTDB_SET_NoIPTakeover"); - assert(tval_noiptakeover != NULL); tval_noiptakeoverondisabled = get_tunable_values(mem_ctx, nodemap->num, "CTDB_SET_NoIPHostOnAllDisabled"); assert(tval_noiptakeoverondisabled != NULL); ipalloc_set_node_flags(*ipalloc_state, nodemap, - tval_noiptakeover, tval_noiptakeoverondisabled); } |