[SCM] CTDB repository - branch 1.0.112 updated - ctdb-1.0.111-157-g8d0bd2f
Ronnie Sahlberg
sahlberg at samba.org
Sun Mar 6 13:19:06 MST 2011
The branch, 1.0.112 has been updated
via 8d0bd2f75e29ca8f54bd7cda1e3619e5b6b5d9ac (commit)
via 73b55bcdcb7211f313dc32dbe3cde7d05e0a7437 (commit)
from 9b95d6c9332977c1a216782ba57c4d9072b5de1e (commit)
http://gitweb.samba.org/?p=sahlberg/ctdb.git;a=shortlog;h=1.0.112
- Log -----------------------------------------------------------------
commit 8d0bd2f75e29ca8f54bd7cda1e3619e5b6b5d9ac
Author: Ronnie Sahlberg <ronniesahlberg at gmail.com>
Date: Fri Mar 4 06:56:28 2011 +1100
New version 1.0.112-41
commit 73b55bcdcb7211f313dc32dbe3cde7d05e0a7437
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:
packaging/RPM/ctdb.spec.in | 4 +++-
server/ctdb_recover.c | 12 ++----------
2 files changed, 5 insertions(+), 11 deletions(-)
Changeset truncated at 500 lines:
diff --git a/packaging/RPM/ctdb.spec.in b/packaging/RPM/ctdb.spec.in
index 3ca8a45..d0cf351 100644
--- a/packaging/RPM/ctdb.spec.in
+++ b/packaging/RPM/ctdb.spec.in
@@ -5,7 +5,7 @@ Vendor: Samba Team
Packager: Samba Team <samba at samba.org>
Name: ctdb
Version: 1.0.112
-Release: 40
+Release: 41
Epoch: 0
License: GNU GPL version 3
Group: System Environment/Daemons
@@ -125,6 +125,8 @@ rm -rf $RPM_BUILD_ROOT
%{_docdir}/ctdb/tests/bin/ctdb_transaction
%changelog
+* Fri Mar 4 2011 : Version 1.0.112-41
+ - Try to restart the recovery dameon if it has hung
* Tue Mar 1 2011 : Version 1.0.112-40
- Try restarting the recovery daemon when it fails.
* Wed Oct 27 2010 : Version 1.0.112-39
diff --git a/server/ctdb_recover.c b/server/ctdb_recover.c
index b48b4e7..4435ab3 100644
--- a/server/ctdb_recover.c
+++ b/server/ctdb_recover.c
@@ -1161,18 +1161,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