diff options
| author | Martin Schwenke <martin@meltin.net> | 2013-11-14 14:25:47 +1100 |
|---|---|---|
| committer | Michael Adam <obnox@samba.org> | 2013-11-27 18:46:16 +0100 |
| commit | 2038d166ad0e283708e50378128671e985bcaed2 (patch) | |
| tree | a9b63bfaff426aba038de5b4a7ccf1a577e45363 | |
| parent | d261a75ff5edcb22afc9fb1656831ae5ee9896ef (diff) | |
| download | samba-2038d166ad0e283708e50378128671e985bcaed2.tar.gz samba-2038d166ad0e283708e50378128671e985bcaed2.tar.xz samba-2038d166ad0e283708e50378128671e985bcaed2.zip | |
ctdb-recoverd: Remove duplicate code to update flags during recovery
This also happens earlier in do_recovery() and the nodemap is not
updated after that, so this update is redundant.
Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Michael Adam <obnox@samba.org>
| -rw-r--r-- | ctdb/server/ctdb_recoverd.c | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/ctdb/server/ctdb_recoverd.c b/ctdb/server/ctdb_recoverd.c index 8b4b6d0298..6d232e0706 100644 --- a/ctdb/server/ctdb_recoverd.c +++ b/ctdb/server/ctdb_recoverd.c @@ -1989,23 +1989,6 @@ static int do_recovery(struct ctdb_recoverd *rec, DEBUG(DEBUG_NOTICE, (__location__ " Recovery - updated recmaster\n")); - /* - update all nodes to have the same flags that we have - */ - for (i=0;i<nodemap->num;i++) { - if (nodemap->nodes[i].flags & NODE_FLAGS_DISCONNECTED) { - continue; - } - - ret = update_flags_on_all_nodes(ctdb, nodemap, i, nodemap->nodes[i].flags); - if (ret != 0) { - DEBUG(DEBUG_ERR, (__location__ " Unable to update flags on all nodes for node %d\n", i)); - return -1; - } - } - - DEBUG(DEBUG_NOTICE, (__location__ " Recovery - updated flags\n")); - /* disable recovery mode */ ret = set_recovery_mode(ctdb, rec, nodemap, CTDB_RECOVERY_NORMAL); if (ret != 0) { |