1
0
mirror of https://github.com/samba-team/samba.git synced 2025-01-11 05:18:09 +03:00

ctdb-recoverd: Abort when daemon can take recovery lock during recovery

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>

Autobuild-User(master): Amitay Isaacs <amitay@samba.org>
Autobuild-Date(master): Fri Feb 13 09:48:15 CET 2015 on sn-devel-104
This commit is contained in:
Martin Schwenke 2015-01-27 12:55:42 +11:00 committed by Amitay Isaacs
parent 432d677489
commit 39d2fd330a

View File

@ -536,11 +536,13 @@ 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,
"Took recovery lock from daemon during recovery - probably a cluster filesystem lock coherence problem");
msg);
talloc_free(state);
return;
ctdb_die(state->ctdb, msg);
}
state->ctdb->recovery_mode = state->recmode;