diff options
| author | Martin Schwenke <martin@meltin.net> | 2015-01-27 12:55:42 +1100 |
|---|---|---|
| committer | Amitay Isaacs <amitay@samba.org> | 2015-02-13 09:48:15 +0100 |
| commit | 39d2fd330a60ea590d76213f8cb406a42fa8d680 (patch) | |
| tree | b57de6f7507a15a46642e8428e8d28f9b85040cc /ctdb | |
| parent | 432d6774891eba30a959cd2d8ee8469d189c7872 (diff) | |
| download | samba-39d2fd330a60ea590d76213f8cb406a42fa8d680.tar.gz samba-39d2fd330a60ea590d76213f8cb406a42fa8d680.tar.xz samba-39d2fd330a60ea590d76213f8cb406a42fa8d680.zip | |
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
Diffstat (limited to 'ctdb')
| -rw-r--r-- | ctdb/server/ctdb_recover.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/ctdb/server/ctdb_recover.c b/ctdb/server/ctdb_recover.c index 4b9407f6c8..db88f060d1 100644 --- a/ctdb/server/ctdb_recover.c +++ b/ctdb/server/ctdb_recover.c @@ -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; |