summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ctdb/server/ctdb_recover.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/ctdb/server/ctdb_recover.c b/ctdb/server/ctdb_recover.c
index 7a684d55320..427d9858648 100644
--- a/ctdb/server/ctdb_recover.c
+++ b/ctdb/server/ctdb_recover.c
@@ -504,13 +504,11 @@ static void set_recmode_handler(struct event_context *ev, struct fd_event *fde,
*/
ret = sys_read(state->fd[0], &c, 1);
if (ret != 1 || c != 0) {
- const char *msg = \
- "Took recovery lock from daemon - probably a cluster filesystem lock coherence problem";
ctdb_request_control_reply(
state->ctdb, state->c, NULL, -1,
- msg);
+ "Took recovery lock from daemon during recovery - probably a cluster filesystem lock coherence problem");
talloc_free(state);
- ctdb_die(state->ctdb, msg);
+ return;
}
state->ctdb->recovery_mode = state->recmode;