summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2011-02-23 17:39:57 +0100
committerMichael Adam <obnox@samba.org>2011-02-24 10:35:26 +0100
commit40e922f4e687129069a6f526ad8c593f94cd92ec (patch)
tree9f01a018f48081a2d1893813d8997faf52f6c6b4
parent2bd04f0ff84d213f416c7df66c6745eed7d769da (diff)
downloadsamba-40e922f4e687129069a6f526ad8c593f94cd92ec.tar.gz
samba-40e922f4e687129069a6f526ad8c593f94cd92ec.tar.xz
samba-40e922f4e687129069a6f526ad8c593f94cd92ec.zip
recover: finish pending trans3 commits when a recovery is finished.
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. (This used to be ctdb commit f7dfeb7143f574c2434f7dd16917380dfd1f4f64)
-rw-r--r--ctdb/server/ctdb_recover.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/ctdb/server/ctdb_recover.c b/ctdb/server/ctdb_recover.c
index 4db4d97f0b..2dbfbd4934 100644
--- a/ctdb/server/ctdb_recover.c
+++ b/ctdb/server/ctdb_recover.c
@@ -988,6 +988,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);