From: Martin Schwenke <martin@meltin.net>
Date: Thu, 21 Feb 2013 02:13:09 +0000 (+1100)
Subject: recoverd: ctdb_takeover_run() uses CTDB_CONTROL_IPREALLOCATED
X-Git-Url: http://git.samba.org/?a=commitdiff_plain;h=83b61f7414b1f7a3424497ac987ca0724fba9eaa;p=obnox%2Fctdb.git

recoverd: ctdb_takeover_run() uses CTDB_CONTROL_IPREALLOCATED

This means "ipreallocated" is now run on stopped nodes.

Signed-off-by: Martin Schwenke <martin@meltin.net>
---

diff --git a/server/ctdb_takeover.c b/server/ctdb_takeover.c
index 15a8bbb4..44393a71 100644
--- a/server/ctdb_takeover.c
+++ b/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"));