diff options
| author | Stefan Metzmacher <metze@samba.org> | 2010-08-31 08:42:32 +0200 |
|---|---|---|
| committer | Ronnie Sahlberg <ronniesahlberg@gmail.com> | 2010-09-14 15:48:37 +1000 |
| commit | ff77985f38f8a094499121cc6fe27056bd3febf3 (patch) | |
| tree | 8bba26f63c1bb939f88a5f8fe86660a34be4f195 | |
| parent | 96ddf2f60760c378c6f637333236d8479e2817ad (diff) | |
| download | samba-ff77985f38f8a094499121cc6fe27056bd3febf3.tar.gz samba-ff77985f38f8a094499121cc6fe27056bd3febf3.tar.xz samba-ff77985f38f8a094499121cc6fe27056bd3febf3.zip | |
server/recoverd: do takeover_run after verifying the reclock file
metze
(This used to be ctdb commit 93df096773c89f21f77b3bcf9aa90bf28881b852)
| -rw-r--r-- | ctdb/server/ctdb_recoverd.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/ctdb/server/ctdb_recoverd.c b/ctdb/server/ctdb_recoverd.c index 437e4cb8a4..4df6ce0386 100644 --- a/ctdb/server/ctdb_recoverd.c +++ b/ctdb/server/ctdb_recoverd.c @@ -3009,10 +3009,6 @@ static void main_loop(struct ctdb_context *ctdb, struct ctdb_recoverd *rec, rec->reallocate_callers = NULL; } } - /* if there are takeovers requested, perform it and notify the waiters */ - if (rec->reallocate_callers) { - process_ipreallocate_requests(ctdb, rec); - } if (rec->recmaster == (uint32_t)-1) { DEBUG(DEBUG_NOTICE,(__location__ " Initial recovery master set - forcing election\n")); @@ -3199,6 +3195,11 @@ static void main_loop(struct ctdb_context *ctdb, struct ctdb_recoverd *rec, } } + /* if there are takeovers requested, perform it and notify the waiters */ + if (rec->reallocate_callers) { + process_ipreallocate_requests(ctdb, rec); + } + /* get the nodemap for all active remote nodes */ remote_nodemaps = talloc_array(mem_ctx, struct ctdb_node_map *, nodemap->num); |