summaryrefslogtreecommitdiff
path: root/ctdb/server/ctdb_takeover_helper.c
diff options
context:
space:
mode:
authorMartin Schwenke <martin@meltin.net>2018-08-21 09:36:00 +1000
committerAmitay Isaacs <amitay@samba.org>2018-08-24 10:59:21 +0200
commit914e9f22d85b9274871b7c7d5486354928080e51 (patch)
tree8663110607d37f19ce88f3232b0df2b5163f0e4e /ctdb/server/ctdb_takeover_helper.c
parent21de59ab7fe53240380b9a9a5b32d5af32d34237 (diff)
downloadsamba-914e9f22d85b9274871b7c7d5486354928080e51.tar.gz
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 <martin@meltin.net> Reviewed-by: Amitay Isaacs <amitay@gmail.com>
Diffstat (limited to 'ctdb/server/ctdb_takeover_helper.c')
-rw-r--r--ctdb/server/ctdb_takeover_helper.c4
1 files changed, 3 insertions, 1 deletions
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.
*/