recover: finish pending trans3 commits when a recovery is finished.
authorMichael Adam <obnox@samba.org>
Wed, 23 Feb 2011 16:39:57 +0000 (17:39 +0100)
committerMichael Adam <obnox@samba.org>
Mon, 7 May 2012 09:51:23 +0000 (11:51 +0200)
When the end_recovery control is received, pending trans3 commits are
finished. During the recovery, all the actions like persistent_callback
and persistent_store_timeout had been disabled to let the recovery do
its job. After the recover is completed, send the reply to the waiting
clients.
(cherry picked from commit f7dfeb7143f574c2434f7dd16917380dfd1f4f64)

Signed-off-by: Michael Adam <obnox@samba.org>
server/ctdb_recover.c

index ed5c22b699e0f744f43430012677ea5f56ab3fc6..e9e7659e793d8175491ef7636a8aff4b1f68efd1 100644 (file)
@@ -964,6 +964,8 @@ int32_t ctdb_control_end_recovery(struct ctdb_context *ctdb,
 
        DEBUG(DEBUG_NOTICE,("Recovery has finished\n"));
 
+       ctdb_persistent_finish_trans3_commits(ctdb);
+
        state = talloc(ctdb, struct recovery_callback_state);
        CTDB_NO_MEMORY(ctdb, state);