[SCM] CTDB repository - branch 1.2.27 updated - ctdb-1.9.1-416-g9ed4975

[Ronnie Sahlberg]

The branch, 1.2.27 has been updated
       via  9ed49755394b31cb4dc78bb711dc71c4afea4a4d (commit)
       via  6c9ccac234cf357354e42b86cf9a5d97bf53f6bb (commit)
       via  d97d550f93643b655a2f6b330c648108465641bd (commit)
       via  41deae1d27e58cd7080d686bc47cad9f5d89bbc6 (commit)
      from  798b1349c6d35e268c7173806f63ea3bd37a8f4e (commit)

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


- Log -----------------------------------------------------------------
commit 9ed49755394b31cb4dc78bb711dc71c4afea4a4d
Author: Ronnie Sahlberg <ronniesahlberg at gmail.com>
Date:   Wed May 11 19:50:09 2011 +1000

    Remove all checking of GPFS from ctdb_diagnostics
    
    CQ S1023524

commit 6c9ccac234cf357354e42b86cf9a5d97bf53f6bb
Author: Ronnie Sahlberg <ronniesahlberg at gmail.com>
Date:   Thu May 12 10:24:46 2011 +1000

    When using multiple VLANs, some funky stuff can sometimes happen when
    adding/removing IP addresses causing routes might be dropped by the system.
    
    The easiest workaround for this is to unconditionally try to reapply
    all static routes for all interfaces once ipreallocation has finished,
    not just adding them back on the affected interface.
    
    This worksaround a funky issue in
    CQ S1023538

commit d97d550f93643b655a2f6b330c648108465641bd
Author: Ronnie Sahlberg <ronniesahlberg at gmail.com>
Date:   Mon May 23 12:19:36 2011 +1000

    Verify that state is not NULL before we dereference it in
    ctdb_event_script_hndler().
    
    This should not be possible since hndler is called through an event that is a child of state itself.
    
    CQ1023707

commit 41deae1d27e58cd7080d686bc47cad9f5d89bbc6
Author: Ronnie Sahlberg <ronniesahlberg at gmail.com>
Date:   Tue May 17 07:50:18 2011 +1000

    renme to version 1.2.27-200 to leve some spce so we dont collide with
    the ptf1 branch

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

Summary of changes:
 config/events.d/11.routing |   14 ++++++--------
 packaging/RPM/ctdb.spec.in |    5 ++++-
 server/eventscript.c       |   12 ++++++++++--
 tools/ctdb_diagnostics     |   32 --------------------------------
 4 files changed, 20 insertions(+), 43 deletions(-)


Changeset truncated at 500 lines:

diff --git a/config/events.d/11.routing b/config/events.d/11.routing
index c265c38..2dd6208 100755
--- a/config/events.d/11.routing
+++ b/config/events.d/11.routing
@@ -19,14 +19,12 @@ loadconfig
     exit 0
 }
 
-case "$1" in 
-    takeip|releaseip)
-	iface=$2
-	cat $CTDB_BASE/static-routes | egrep "^$iface " | while read IFACE DEST GW; do
-	    ip route add $DEST via $GW dev $IFACE >/dev/null 2>/dev/null
-	done
-	;;
-
+case "$1" in
+    recovered|ipreallocated)
+        cat $CTDB_BASE/static-routes | while read IFACE DEST GW; do
+            ip route add $DEST via $GW dev $IFACE >/dev/null 2>/dev/null
+        done
+        ;;
     *)
 	ctdb_standard_event_handler "$@"
 	;;
diff --git a/packaging/RPM/ctdb.spec.in b/packaging/RPM/ctdb.spec.in
index 3005f4e..0979174 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 <samba at samba.org>
 Version: 1.2.27
-Release: 3GITHASH
+Release: 200GITHASH
 Epoch: 0
 License: GNU GPL version 3
 Group: System Environment/Daemons
@@ -143,6 +143,9 @@ development libraries for ctdb
 %{_libdir}/libctdb.a
 
 %changelog
+* Tue May 17 2011 : Version 1.2.27-200
+ - rename to -200  so we leave some space for non-collission with the PTF1
+   branch
 * 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
diff --git a/server/eventscript.c b/server/eventscript.c
index 9ba3a5d..dbe9598 100644
--- a/server/eventscript.c
+++ b/server/eventscript.c
@@ -444,10 +444,18 @@ static void ctdb_event_script_handler(struct event_context *ev, struct fd_event
 {
 	struct ctdb_event_script_state *state = 
 		talloc_get_type(p, struct ctdb_event_script_state);
-	struct ctdb_script_wire *current = get_current_script(state);
-	struct ctdb_context *ctdb = state->ctdb;
+	struct ctdb_script_wire *current;
+	struct ctdb_context *ctdb;
 	int r, status;
 
+	if (state == NULL) {
+		DEBUG(DEBUG_ERR,("state is NULL in ctdb_event_script_handler\n"));
+		return;
+	}
+
+	current = get_current_script(state);
+	ctdb = state->ctdb;
+
 	r = read(state->fd[0], &current->status, sizeof(current->status));
 	if (r < 0) {
 		current->status = -errno;
diff --git a/tools/ctdb_diagnostics b/tools/ctdb_diagnostics
index eae5483..cf166ec 100755
--- a/tools/ctdb_diagnostics
+++ b/tools/ctdb_diagnostics
@@ -249,38 +249,6 @@ show_all "/usr/sbin/nfsstat -v"
     done
 }
 
-[ -d /usr/lpp/mmfs ] && {
-cat <<EOF
---------------------------------------------------------------------
-Showing GPFS status and recent log entries
-EOF
- show_all "tail -100 /var/adm/ras/mmfs.log.latest"
- show_all "/usr/lpp/mmfs/bin/mmlsconfig"
- show_all "/usr/lpp/mmfs/bin/mmlsfs all"
- show_all "/usr/lpp/mmfs/bin/mmlsnsd"
- show_all "/usr/lpp/mmfs/bin/mmlsnsd -X"
- show_all "/usr/lpp/mmfs/bin/mmfsadm dump version"
- show_all "/usr/lpp/mmfs/bin/mmfsadm dump waiters"
- show_all "/usr/lpp/mmfs/bin/mmlsmount all"
- show_all "/usr/lpp/mmfs/bin/mmlsquota"
- show_all "/usr/lpp/mmfs/bin/mmlscluster"
- show_all "/usr/lpp/mmfs/bin/mmlsmgr"
- devlist=`mmlsfs all|grep ^File.system.attributes | cut -d/ -f3 | cut -d: -f1`
- for d in $devlist; do
-     show_all "mmdf $d"
-     show_all "mmlsdisk $d"
-     show_all "mmlsfileset $d"
-     show_all "mmlspolicy $d"
-     show_all "mmlssnapshot $d"
- done
- fslist=`mount|grep type.gpfs|awk '{print $1}'`
- for fs in $fslist; do
-     show_all "/usr/lpp/mmfs/bin/mmlssnapshot $fs"
-     show_all "/usr/lpp/mmfs/bin/mmlsdisk $fs"
-     show_all "/usr/lpp/mmfs/bin/mmlsfileset $fs"
- done
-}
-
 cat <<EOF
 --------------------------------------------------------------------
 Showing Samba status


-- 
CTDB repository