From 609a1e5c7766da47c16d7ef4e771735377ebe6e2 Mon Sep 17 00:00:00 2001 From: Martin Schwenke Date: Thu, 16 Dec 2010 08:45:28 +1100 Subject: [PATCH 1/3] Evenscripts: update 20.multipathd to use ctdb_setup_service_state_dir. Signed-off-by: Martin Schwenke (This used to be ctdb commit 797ca65bdd59b14325ffd32b4d4140e9b01dbe71) --- ctdb/config/events.d/20.multipathd | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/ctdb/config/events.d/20.multipathd b/ctdb/config/events.d/20.multipathd index 73b6054f449..1bf7070fb58 100755 --- a/ctdb/config/events.d/20.multipathd +++ b/ctdb/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" ] || { From 061b7adad6a871de3a9380a4c308e733f57af90c Mon Sep 17 00:00:00 2001 From: Martin Schwenke Date: Thu, 16 Dec 2010 08:42:44 +1100 Subject: [PATCH 2/3] Evenscripts: update 13.per_ip_routing to use ctdb_setup_service_state_dir. Signed-off-by: Martin Schwenke (This used to be ctdb commit 18e0236754507a9475653f04bb239c5d46ba51de) --- ctdb/config/events.d/13.per_ip_routing | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ctdb/config/events.d/13.per_ip_routing b/ctdb/config/events.d/13.per_ip_routing index a0df1198954..ff4dbdb8c37 100755 --- a/ctdb/config/events.d/13.per_ip_routing +++ b/ctdb/config/events.d/13.per_ip_routing @@ -3,8 +3,10 @@ . $CTDB_BASE/functions loadconfig +ctdb_setup_service_state_dir "per_ip_routing" + [ -z "$CTDB_PER_IP_ROUTING_STATE" ] && { - CTDB_PER_IP_ROUTING_STATE="$CTDB_VARDIR/state/per_ip_routing" + CTDB_PER_IP_ROUTING_STATE="$service_state_dir" } AUTO_LINK_LOCAL="no" From 098da255fad18e41339ec1ad5b0cde52862438d1 Mon Sep 17 00:00:00 2001 From: Martin Schwenke Date: Thu, 16 Dec 2010 08:48:21 +1100 Subject: [PATCH 3/3] Evenscripts: update 61.cnfs to use ctdb_setup_service_state_dir. Signed-off-by: Martin Schwenke (This used to be ctdb commit afafeb1fb12384bddff470d38b534f513a1f3b07) --- ctdb/config/events.d/62.cnfs | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/ctdb/config/events.d/62.cnfs b/ctdb/config/events.d/62.cnfs index af4ecc3b7a4..3cc56e39555 100755 --- a/ctdb/config/events.d/62.cnfs +++ b/ctdb/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." ;;