diff options
| author | Martin Schwenke <martin@meltin.net> | 2013-02-21 13:13:09 +1100 |
|---|---|---|
| committer | Amitay Isaacs <amitay@gmail.com> | 2013-05-06 13:38:21 +1000 |
| commit | 745c6bc363e9c9952385b260c8807e00a0bc08b8 (patch) | |
| tree | d53eee15c50d8af5eec302f963c9ae6b7897596b /ctdb/server | |
| parent | 2e59cd54281a6a852c6037d68a3973feec60b7c8 (diff) | |
| download | samba-745c6bc363e9c9952385b260c8807e00a0bc08b8.tar.gz samba-745c6bc363e9c9952385b260c8807e00a0bc08b8.tar.xz samba-745c6bc363e9c9952385b260c8807e00a0bc08b8.zip | |
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>
(This used to be ctdb commit 83b61f7414b1f7a3424497ac987ca0724fba9eaa)
Diffstat (limited to 'ctdb/server')
| -rw-r--r-- | ctdb/server/ctdb_takeover.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/ctdb/server/ctdb_takeover.c b/ctdb/server/ctdb_takeover.c index 15a8bbb409..44393a71ee 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")); |