From 745c6bc363e9c9952385b260c8807e00a0bc08b8 Mon Sep 17 00:00:00 2001 From: Martin Schwenke Date: Thu, 21 Feb 2013 13:13:09 +1100 Subject: [PATCH] recoverd: ctdb_takeover_run() uses CTDB_CONTROL_IPREALLOCATED This means "ipreallocated" is now run on stopped nodes. Signed-off-by: Martin Schwenke (This used to be ctdb commit 83b61f7414b1f7a3424497ac987ca0724fba9eaa) --- ctdb/server/ctdb_takeover.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/ctdb/server/ctdb_takeover.c b/ctdb/server/ctdb_takeover.c index 15a8bbb409d..44393a71ee2 100644 --- a/ctdb/server/ctdb_takeover.c +++ b/ctdb/server/ctdb_takeover.c @@ -2456,12 +2456,10 @@ ipreallocated: * IPs have moved. Once upon a time this event only used to * update natwg. */ - data.dptr = discard_const("ipreallocated"); - data.dsize = strlen((char *)data.dptr) + 1; nodes = list_of_connected_nodes(ctdb, nodemap, tmp_ctx, true); - if (ctdb_client_async_control(ctdb, CTDB_CONTROL_RUN_EVENTSCRIPTS, + if (ctdb_client_async_control(ctdb, CTDB_CONTROL_IPREALLOCATED, nodes, 0, TAKEOVER_TIMEOUT(), - false, data, + false, tdb_null, NULL, fail_callback, callback_data) != 0) { DEBUG(DEBUG_ERR, (__location__ " failed to send control to run eventscripts with \"ipreallocated\"\n"));