From 914e9f22d85b9274871b7c7d5486354928080e51 Mon Sep 17 00:00:00 2001 From: Martin Schwenke Date: Tue, 21 Aug 2018 09:36:00 +1000 Subject: ctdb-daemon: Pass DisableIPFailover tunable via environment variable Preparation for obsoleting this tunable. BUG: https://bugzilla.samba.org/show_bug.cgi?id=13589 Signed-off-by: Martin Schwenke Reviewed-by: Amitay Isaacs --- ctdb/server/ctdb_takeover_helper.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'ctdb/server/ctdb_takeover_helper.c') diff --git a/ctdb/server/ctdb_takeover_helper.c b/ctdb/server/ctdb_takeover_helper.c index 9672a2b20f9..9aa77d14f1d 100644 --- a/ctdb/server/ctdb_takeover_helper.c +++ b/ctdb/server/ctdb_takeover_helper.c @@ -799,6 +799,7 @@ static void takeover_nodemap_done(struct tevent_req *subreq) bool status; int ret; struct ctdb_node_map *nodemap; + const char *ptr; status = ctdb_client_control_recv(subreq, &ret, state, &reply); TALLOC_FREE(subreq); @@ -845,7 +846,8 @@ static void takeover_nodemap_done(struct tevent_req *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. */ -- cgit v1.2.1