[SCM] CTDB repository - branch 1.2 updated - ctdb-1.9.1-488-g418313d

[Ronnie Sahlberg]

The branch, 1.2 has been updated
       via  418313dce4b0142d12aa73aeb5e98333055bdbf0 (commit)
       via  767f6bdeea8fe9fda67fce4a68c19455cf712e1d (commit)
      from  fa72d7d50beb7155234a8e15fa5c8443a3c34eaf (commit)

http://gitweb.samba.org/?p=ctdb.git;a=shortlog;h=1.2


- Log -----------------------------------------------------------------
commit 418313dce4b0142d12aa73aeb5e98333055bdbf0
Author: Ronnie Sahlberg <ronniesahlberg at gmail.com>
Date:   Mon Oct 17 15:27:41 2011 +1100

    new version 1.2.38

commit 767f6bdeea8fe9fda67fce4a68c19455cf712e1d
Author: Martin Schwenke <martin at meltin.net>
Date:   Fri Oct 14 17:29:35 2011 +1100

    Eventscripts: Work around 50.samba autostop failure
    
    This hack is shameful but the eventscript really needs to be split to
    avoid this type of rubbish - 1 service per eventscript!
    
    There are a few ways of hacking the conditions and this doesn't seem
    much worse than any of the others...
    
    This works... but on autostart will still restart the service that
    isn't being autostarted.  That's a separate bug.
    
    Signed-off-by: Martin Schwenke <martin at meltin.net>

-----------------------------------------------------------------------

Summary of changes:
 config/events.d/50.samba   |    4 ++--
 config/functions           |    1 +
 packaging/RPM/ctdb.spec.in |    5 ++++-
 3 files changed, 7 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/config/events.d/50.samba b/config/events.d/50.samba
index 03bed85..55ddf32 100755
--- a/config/events.d/50.samba
+++ b/config/events.d/50.samba
@@ -93,14 +93,14 @@ start_samba() {
 
 stop_samba() {
 	# shutdown Samba when ctdb goes down
-	[ "$CTDB_MANAGES_SAMBA" = "yes" ] && {
+	[ "$CTDB_AUTOSTOPPING" != "winbind" -a "$CTDB_MANAGES_SAMBA" = "yes" -o "$CTDB_AUTOSTOPPING" = "samba" ] && {
 		service "$CTDB_SERVICE_SMB" stop
 		service "$CTDB_SERVICE_NMB" stop
 	}
 
 	# stop the winbind service
 	check_ctdb_manages_winbind
-	[ "$CTDB_MANAGES_WINBIND" = "yes" ] && {
+	[ "$CTDB_AUTOSTOPPING" != "samba" -a "$CTDB_MANAGES_WINBIND" = "yes"  -o "$CTDB_AUTOSTOPPING" = "winbind" ] && {
 		service "$CTDB_SERVICE_WINBIND" stop
 	}
 
diff --git a/config/functions b/config/functions
index 8d2e48c..e5924c6 100755
--- a/config/functions
+++ b/config/functions
@@ -857,6 +857,7 @@ ctdb_start_stop_service ()
     else
 	if [ -e "$_active" ] ; then
 	    echo "Stopping service $_service_name"
+	    CTDB_AUTOSTOPPING="$_service_name"
 	    ctdb_service_stop || exit $?
 	    rm -f "$_active"
 	    exit 0
diff --git a/packaging/RPM/ctdb.spec.in b/packaging/RPM/ctdb.spec.in
index 06e805e..9c74287 100644
--- a/packaging/RPM/ctdb.spec.in
+++ b/packaging/RPM/ctdb.spec.in
@@ -3,7 +3,7 @@ Name: ctdb
 Summary: Clustered TDB
 Vendor: Samba Team
 Packager: Samba Team <samba at samba.org>
-Version: 1.2.37
+Version: 1.2.38
 Release: 1GITHASH
 Epoch: 0
 License: GNU GPL version 3
@@ -144,6 +144,9 @@ development libraries for ctdb
 %{_libdir}/libctdb.a
 
 %changelog
+* Mon Oct 17 2011 : Version 1.2.38
+ - When adding a new ip, release it from the current node so it gets rebalanced : S1031575
+ - fix autostop for 50.samba eventscript : S1031552
 * Thu Oct 13 2011 : Version 1.2.37
  - updates to ctdb-diagnostics
 * Thu Sep 22 2011 : Version 1.2.36


-- 
CTDB repository