Preparation for obsoleting this tunable.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=13589
Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
{
static char prog[PATH_MAX+1] = "";
char *arg;
- int i;
+ int i, ret;
if (!ctdb_set_helper("takeover_helper", prog, sizeof(prog),
"CTDB_TAKEOVER_HELPER", CTDB_HELPER_BINDIR,
}
}
+ if (rec->ctdb->tunable.disable_ip_failover != 0) {
+ ret = setenv("CTDB_DISABLE_IP_FAILOVER", "1", 1);
+ if (ret != 0) {
+ D_ERR("Failed to set CTDB_DISABLE_IP_FAILOVER variable\n");
+ return -1;
+ }
+ }
+
return helper_run(rec, rec, prog, arg, "takeover");
}
bool status;
int ret;
struct ctdb_node_map *nodemap;
+ const char *ptr;
status = ctdb_client_control_recv(subreq, &ret, state, &reply);
TALLOC_FREE(subreq);
return;
}
- if (state->tun_list->disable_ip_failover != 0) {
+ ptr = getenv("CTDB_DISABLE_IP_FAILOVER");
+ if (ptr != NULL) {
/* IP failover is completely disabled so just send out
* ipreallocated event.
*/
. "${TEST_SCRIPTS_DIR}/unit.sh"
-define_test "3 nodes, all healthy, IPs all unassigned, DisableIPFailover"
+define_test "3 nodes, all healthy, IPs all unassigned, IP failover disabled"
setup_ctdbd <<EOF
NODEMAP
10.0.0.33 -1
EOF
-ctdb_cmd setvar DisableIPFailover 1
+export CTDB_DISABLE_IP_FAILOVER=1
ok <<EOF
EOF