diff options
| author | Martin Schwenke <martin@meltin.net> | 2019-02-22 15:09:33 +1100 |
|---|---|---|
| committer | Amitay Isaacs <amitay@samba.org> | 2019-02-25 02:12:17 +0100 |
| commit | 13a1a4808935290dceb219daccd7aac3fda4e184 (patch) | |
| tree | 5d7f54ed2b01f5763fe0cf8de27d79e820cb944e /ctdb | |
| parent | 45a77d65b2e39b4af94da4ab99575f4ee08a7ebd (diff) | |
| download | samba-13a1a4808935290dceb219daccd7aac3fda4e184.tar.gz | |
ctdb-recoverd: Time out attempt to take recovery lock after 120s
Currently this will wait forever. It really needs a timeout in case
the cluster filesystem (or other lock mechanism) is completely wedged.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=13800
Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
Diffstat (limited to 'ctdb')
| -rw-r--r-- | ctdb/server/ctdb_recoverd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ctdb/server/ctdb_recoverd.c b/ctdb/server/ctdb_recoverd.c index 584d65d61a7..9b3559b2a92 100644 --- a/ctdb/server/ctdb_recoverd.c +++ b/ctdb/server/ctdb_recoverd.c @@ -971,7 +971,7 @@ static bool ctdb_recovery_lock(struct ctdb_recoverd *rec) h = ctdb_cluster_mutex(s, ctdb, ctdb->recovery_lock, - 0, + 120, take_reclock_handler, s, lost_reclock_handler, |