The branch, 1.2.27 has been updated via 798b1349c6d35e268c7173806f63ea3bd37a8f4e (commit) via fc0d8b0da05e88512a5e024d873f61255f880a37 (commit) via b82ba4940dad3a21ed5b0e5734bd487af775ea78 (commit) from 8411e70e021f5ac90731059a02bec2a29ffc43b2 (commit)
http://gitweb.samba.org/?p=ctdb.git;a=shortlog;h=1.2.27 - Log ----------------------------------------------------------------- commit 798b1349c6d35e268c7173806f63ea3bd37a8f4e Author: Ronnie Sahlberg <ronniesahlb...@gmail.com> Date: Tue May 10 14:53:53 2011 +1000 New version 1.2.27-3 commit fc0d8b0da05e88512a5e024d873f61255f880a37 Author: Ronnie Sahlberg <ronniesahlb...@gmail.com> Date: Tue May 10 08:25:27 2011 +1000 If samba fails to start for some reason, make this cause the startup event to fail too, so that ctdbd will re-try the startup event later. Or else this will leave samba not running. CQ S1023394 commit b82ba4940dad3a21ed5b0e5734bd487af775ea78 Author: Ronnie Sahlberg <ronniesahlb...@gmail.com> Date: Tue May 10 06:19:34 2011 +1000 Dont exit from checking interfaces once we have found one interface that is not in use by public addresses. this can happen when we have removed existing interfaces/ip addresses and prevents us from verifying the status of other interfaces ----------------------------------------------------------------------- Summary of changes: config/events.d/10.interface | 2 +- config/events.d/50.samba | 17 ++++++++++++++--- packaging/RPM/ctdb.spec.in | 6 +++++- 3 files changed, 20 insertions(+), 5 deletions(-) Changeset truncated at 500 lines: diff --git a/config/events.d/10.interface b/config/events.d/10.interface index e0689c4..5f25445 100755 --- a/config/events.d/10.interface +++ b/config/events.d/10.interface @@ -43,7 +43,7 @@ monitor_interfaces() ip addr show $IFACE 2>/dev/null >/dev/null || { echo Interface $IFACE does not exist but it is used by public addresses. - exit 1 + continue } # These interfaces are sometimes bond devices diff --git a/config/events.d/50.samba b/config/events.d/50.samba index a1f99fb..184fb2f 100755 --- a/config/events.d/50.samba +++ b/config/events.d/50.samba @@ -65,7 +65,11 @@ start_samba() { # start the winbind service [ "$CTDB_MANAGES_WINBIND" = "yes" ] && { - service "$CTDB_SERVICE_WINBIND" start + service "$CTDB_SERVICE_WINBIND" start || { + echo failed to start winbind + exit 1 + } + } # start Samba service. Start it reniced, as under very heavy load @@ -74,8 +78,15 @@ start_samba() { [ "$CTDB_MANAGES_SAMBA" = "yes" ] && { /usr/bin/net serverid wipe - nice_service "$CTDB_SERVICE_NMB" start - nice_service "$CTDB_SERVICE_SMB" start + nice_service "$CTDB_SERVICE_NMB" start || { + echo failed to start nmbd + exit 1 + } + + nice_service "$CTDB_SERVICE_SMB" start || { + echo failed to start samba + exit 1 + } } return 0 } diff --git a/packaging/RPM/ctdb.spec.in b/packaging/RPM/ctdb.spec.in index 75ca661..3005f4e 100644 --- a/packaging/RPM/ctdb.spec.in +++ b/packaging/RPM/ctdb.spec.in @@ -4,7 +4,7 @@ Summary: Clustered TDB Vendor: Samba Team Packager: Samba Team <sa...@samba.org> Version: 1.2.27 -Release: 2GITHASH +Release: 3GITHASH Epoch: 0 License: GNU GPL version 3 Group: System Environment/Daemons @@ -143,6 +143,10 @@ development libraries for ctdb %{_libdir}/libctdb.a %changelog +* Tue May 10 2011 : Version 1.2.27-3 + - Add support for bonding mode 4, workaround thel5 kernel bug + - Restart samba if it fails 'service smb start' CQ S1023394 + - Dont stop checking interfaces when deleted interfce found : CQ S1023420 * Mon Apr 11 2011 : Version 1.2.27-2 - Update and simplify handling of interfaces. check for and become unhealthy if an interface has been deleted -- CTDB repository