From 1279b66342d31bdbc45d58222fcc9029f3e920b1 Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Tue, 22 Feb 2011 22:24:50 +0100 Subject: [PATCH] persistent_callback: ignore the update-recordreturn code of remote node in recovery If a recovery was started, then all further processing of the update_record controls sent by the trans3_commit control is disabled. The recovery should trigger sending the reply for the update record control when finished. --- server/ctdb_persistent.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/server/ctdb_persistent.c b/server/ctdb_persistent.c index f9a20510..3f297fa2 100644 --- a/server/ctdb_persistent.c +++ b/server/ctdb_persistent.c @@ -53,6 +53,12 @@ static void ctdb_persistent_callback(struct ctdb_context *ctdb, struct ctdb_persistent_state *state = talloc_get_type(private_data, struct ctdb_persistent_state); + if (ctdb->recovery_mode != CTDB_RECOVERY_NORMAL) { + DEBUG(DEBUG_INFO, ("ctdb_persistent_callback: ignoring reply " + "during recovery\n")); + return; + } + if (status != 0) { DEBUG(DEBUG_ERR,("ctdb_persistent_callback failed with status %d (%s)\n", status, errormsg)); -- 2.34.1