[SCM] CTDB repository - branch master updated - ctdb-1.10-326-gabe67d6

[Ronnie Sahlberg]

The branch, master has been updated
       via  abe67d6af1e0594641b98facc3534059263e1745 (commit)
       via  fb87fa9273db4f82e801a331b5d95059d64dfb8e (commit)
       via  b8493ceb35b125a390b1e83464fb9ff72f2e1495 (commit)
       via  cfa4102ec0d97e1d1d3c1ce6407ffacdb85c2e10 (commit)
       via  afafeb1fb12384bddff470d38b534f513a1f3b07 (commit)
       via  797ca65bdd59b14325ffd32b4d4140e9b01dbe71 (commit)
      from  20984a28d9617c0b7a5868057594920ed3f1a2c7 (commit)

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


- Log -----------------------------------------------------------------
commit abe67d6af1e0594641b98facc3534059263e1745
Merge: b8493ceb35b125a390b1e83464fb9ff72f2e1495 fb87fa9273db4f82e801a331b5d95059d64dfb8e
Author: Ronnie Sahlberg <ronniesahlberg at gmail.com>
Date:   Wed Aug 10 15:32:24 2011 +1000

    Merge remote branch 'martins/eventscript.20.multipathd'

commit fb87fa9273db4f82e801a331b5d95059d64dfb8e
Merge: 797ca65bdd59b14325ffd32b4d4140e9b01dbe71 cfa4102ec0d97e1d1d3c1ce6407ffacdb85c2e10
Author: Martin Schwenke <martin at meltin.net>
Date:   Wed Aug 10 15:32:11 2011 +1000

    Merge branch 'eventscript.62.cnfs' into eventscript.20.multipathd

commit b8493ceb35b125a390b1e83464fb9ff72f2e1495
Merge: 20984a28d9617c0b7a5868057594920ed3f1a2c7 cfa4102ec0d97e1d1d3c1ce6407ffacdb85c2e10
Author: Ronnie Sahlberg <ronniesahlberg at gmail.com>
Date:   Wed Aug 10 15:31:56 2011 +1000

    Merge remote branch 'martins/eventscript.62.cnfs'

commit cfa4102ec0d97e1d1d3c1ce6407ffacdb85c2e10
Merge: afafeb1fb12384bddff470d38b534f513a1f3b07 18e0236754507a9475653f04bb239c5d46ba51de
Author: Martin Schwenke <martin at meltin.net>
Date:   Wed Aug 10 15:31:13 2011 +1000

    Merge branch 'eventscript.13.per_ip_routing' into eventscript.62.cnfs

commit afafeb1fb12384bddff470d38b534f513a1f3b07
Author: Martin Schwenke <martin at meltin.net>
Date:   Thu Dec 16 08:48:21 2010 +1100

    Evenscripts: update 61.cnfs to use ctdb_setup_service_state_dir.
    
    Signed-off-by: Martin Schwenke <martin at meltin.net>

commit 797ca65bdd59b14325ffd32b4d4140e9b01dbe71
Author: Martin Schwenke <martin at meltin.net>
Date:   Thu Dec 16 08:45:28 2010 +1100

    Evenscripts: update 20.multipathd to use ctdb_setup_service_state_dir.
    
    Signed-off-by: Martin Schwenke <martin at meltin.net>

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

Summary of changes:
 config/events.d/20.multipathd |   11 +++--------
 config/events.d/62.cnfs       |   14 +++++---------
 2 files changed, 8 insertions(+), 17 deletions(-)


Changeset truncated at 500 lines:

diff --git a/config/events.d/20.multipathd b/config/events.d/20.multipathd
index 73b6054..1bf7070 100755
--- a/config/events.d/20.multipathd
+++ b/config/events.d/20.multipathd
@@ -16,7 +16,9 @@ loadconfig
 	exit 0
 }
 
-MPFAILURE=$CTDB_VARDIR/state/multipathd/failure
+ctdb_setup_service_state_dir
+
+MPFAILURE="$service_state_dir/failure"
 
 multipathd_check_background()
 {
@@ -75,13 +77,6 @@ multipathd_check()
 }
 
 case "$1" in
-    startup)
-	# create a state directory to keep/track the multipath device
-	# state
-	mkdir -p $CTDB_VARDIR/state/multipathd
-	exit 0
-	;;
-
     monitor)
 	multipathd_check
 	[ "$?" = "0" ] || {
diff --git a/config/events.d/62.cnfs b/config/events.d/62.cnfs
index af4ecc3..3cc56e3 100755
--- a/config/events.d/62.cnfs
+++ b/config/events.d/62.cnfs
@@ -5,13 +5,12 @@
 
 loadconfig
 
-STATEDIR=$CTDB_VARDIR/state/gpfs
-
+ctdb_setup_service_state_dir "gpfs"
 
 check_if_healthy() {
-        mkdir -p $STATEDIR/fs
+        mkdir -p "$service_state_dir/fs"
 
-        [ -f "$STATEDIR/gpfsnoquorum" ] && {
+        [ -f "$service_state_dir/gpfsnoquorum" ] && {
                 logger No GPFS quorum. Node is UNHEALTHY
                 $CTDB_BASE/events.d/62.cnfs unhealthy "No GPFS quorum. Nodfe is UNHEALTHY."
 		exit 0
@@ -23,21 +22,18 @@ check_if_healthy() {
 
 case "$1" in
     startup)
-        mkdir -p $STATEDIR
         check_if_healthy
         ;;
 
 
     gpfsquorumreached)
-        mkdir -p $STATEDIR
-        rm -f "$STATEDIR/gpfsnoquorum"
+        rm -f "$service_state_dir/gpfsnoquorum"
         logger "GPFS quorum has been reached."
         check_if_healthy
         ;;
 
     gpfsquorumloss)
-        mkdir -p $STATEDIR
-        touch "$STATEDIR/gpfsnoquorum"
+        touch "$service_state_dir/gpfsnoquorum"
         logger "GPFS quorum has been lost."
         $CTDB_BASE/events.d/62.cnfs unhealthy "GPFS quorum was lost! Marking node as UNHEALTHY."
         ;;


-- 
CTDB repository