summaryrefslogtreecommitdiff
path: root/ctdb/include
diff options
context:
space:
mode:
authorMartin Schwenke <martin@meltin.net>2016-05-03 15:35:08 +1000
committerAmitay Isaacs <amitay@samba.org>2016-05-13 13:47:17 +0200
commit9dc3b117e2cb6849f5ea8f2944e39e79ca1eb0d3 (patch)
tree2be78cd60ff2e66c8dce5be4f79b89d498c074af /ctdb/include
parent1e9f650382c25ba2c9b9d41c90fcce7372f100e3 (diff)
downloadsamba-9dc3b117e2cb6849f5ea8f2944e39e79ca1eb0d3.tar.gz
ctdb-takeover: Recovery daemon no longer passes fail callback
Banning is now handled by the takeover code sending banning credit messages. This commit makes a change in behaviour quite obvious. Takeover runs were initiated from several locations in the code but banning was only done from one of these locations. Now banning can be done from any failed takeover run. Signed-off-by: Martin Schwenke <martin@meltin.net> Reviewed-by: Amitay Isaacs <amitay@gmail.com>
Diffstat (limited to 'ctdb/include')
-rw-r--r--ctdb/include/ctdb_private.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/ctdb/include/ctdb_private.h b/ctdb/include/ctdb_private.h
index f8889e025a8..a2f6dfce76c 100644
--- a/ctdb/include/ctdb_private.h
+++ b/ctdb/include/ctdb_private.h
@@ -975,8 +975,7 @@ int32_t ctdb_control_ipreallocated(struct ctdb_context *ctdb,
int ctdb_set_public_addresses(struct ctdb_context *ctdb, bool check_addresses);
int ctdb_takeover_run(struct ctdb_context *ctdb, struct ctdb_node_map_old *nodemap,
- uint32_t *force_rebalance_nodes,
- client_async_callback fail_callback, void *callback_data);
+ uint32_t *force_rebalance_nodes);
int32_t ctdb_control_tcp_client(struct ctdb_context *ctdb, uint32_t client_id,
TDB_DATA indata);