[SCM] CTDB repository - branch master updated - ctdb-1.10-108-g221ecc2
Ronnie Sahlberg
sahlberg at samba.org
Sun Mar 6 13:19:06 MST 2011
The branch, master has been updated
via 221ecc2509f6d267d1854c1042ff945a620510bb (commit)
from 0566ef3d6cef809bda204877c493c80ff9eb2c40 (commit)
http://gitweb.samba.org/?p=sahlberg/ctdb.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 221ecc2509f6d267d1854c1042ff945a620510bb
Author: Ronnie Sahlberg <ronniesahlberg at gmail.com>
Date: Fri Mar 4 06:55:24 2011 +1100
Restart recovery dameon if it looks like it hung.
Dont shutdown ctdbd completely, that only makes the problem worse.
-----------------------------------------------------------------------
Summary of changes:
server/ctdb_recover.c | 12 ++----------
1 files changed, 2 insertions(+), 10 deletions(-)
Changeset truncated at 500 lines:
diff --git a/server/ctdb_recover.c b/server/ctdb_recover.c
index 0cbd7dc..eb3bf0a 100644
--- a/server/ctdb_recover.c
+++ b/server/ctdb_recover.c
@@ -1197,18 +1197,10 @@ static void ctdb_recd_ping_timeout(struct event_context *ev, struct timed_event
return;
}
- DEBUG(DEBUG_ERR, ("Final timeout for recovery daemon ping. Shutting down ctdb daemon. (This can be caused if the cluster filesystem has hung)\n"));
+ DEBUG(DEBUG_ERR, ("Final timeout for recovery daemon ping. Restarting recovery daemon. (This can be caused if the cluster filesystem has hung)\n"));
ctdb_stop_recoverd(ctdb);
- ctdb_stop_keepalive(ctdb);
- ctdb_stop_monitoring(ctdb);
- ctdb_release_all_ips(ctdb);
- if (ctdb->methods != NULL) {
- ctdb->methods->shutdown(ctdb);
- }
- ctdb_event_script(ctdb, CTDB_EVENT_SHUTDOWN);
- DEBUG(DEBUG_ERR, ("Recovery daemon ping timeout. Daemon has been shut down.\n"));
- exit(0);
+ ctdb_start_recoverd(ctdb);
}
/* The recovery daemon will ping us at regular intervals.
--
CTDB repository
More information about the samba-cvs
mailing list