From 8c2948eba59d4ee24af1154c774c9fa79939bd91 Mon Sep 17 00:00:00 2001 From: Martin Schwenke Date: Mon, 10 Aug 2015 15:34:29 +1000 Subject: [PATCH] ctdb-scripts: Drop 62.cnfs eventscript To get a similar effect just do something like this: mmaddcallback ctdb-disable-on-quorumLoss \ --command /usr/bin/ctdb \ --event quorumLoss --parms "disable" mmaddcallback ctdb-enable-on-quorumReached \ --command /usr/bin/ctdb \ --event quorumReached --parms "enable" Signed-off-by: Martin Schwenke Reviewed-by: Amitay Isaacs Reviewed-by: Jose A. Rivera Reviewed-by: Michael Adam --- ctdb/config/events.d/62.cnfs | 78 --------------------------------- ctdb/packaging/RPM/ctdb.spec.in | 1 - 2 files changed, 79 deletions(-) delete mode 100755 ctdb/config/events.d/62.cnfs diff --git a/ctdb/config/events.d/62.cnfs b/ctdb/config/events.d/62.cnfs deleted file mode 100755 index 339eaef3cb0..00000000000 --- a/ctdb/config/events.d/62.cnfs +++ /dev/null @@ -1,78 +0,0 @@ -#!/bin/sh -# event script to integrate with gpfs cnfs - -[ -n "$CTDB_BASE" ] || \ - export CTDB_BASE=$(cd -P $(dirname "$0") ; dirname "$PWD") - -. $CTDB_BASE/functions - -loadconfig - -ctdb_setup_service_state_dir "gpfs" - -check_if_healthy() { - mkdir -p "$service_state_dir/fs" - - [ -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 - } - - logger All required GPFS resources are available. CNFS part is healthy. - $CTDB_BASE/events.d/62.cnfs healthy -} - -case "$1" in - startup) - check_if_healthy - ;; - - - gpfsquorumreached) - rm -f "$service_state_dir/gpfsnoquorum" - logger "GPFS quorum has been reached." - check_if_healthy - ;; - - gpfsquorumloss) - 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." - ;; - - unhealthy) - # Mark the node as UNHEALTHY which means all public addresses - # will be migrated off the node. - shift - echo "$*" | ctdb_setstatus unhealthy - - - # force a monitor event so we pick up immediately that this script - # will now fail and make the node unhealthy. - ctdb eventscript monitor - - # Wait until we no longer serve any ip addresses at all - ctdb_get_pnn - while ctdb -X ip | grep -q "^|.*|${pnn}|\$" ; do - sleep 1 - done - ;; - - healthy) - # mark the node as healthy - ctdb_setstatus healthy - ;; - - - monitor) - ctdb_checkstatus - exit $? - ;; - - *) - ctdb_standard_event_handler "$@" - ;; -esac - -exit 0 - diff --git a/ctdb/packaging/RPM/ctdb.spec.in b/ctdb/packaging/RPM/ctdb.spec.in index 318dacf7412..bc5ec0c3b00 100644 --- a/ctdb/packaging/RPM/ctdb.spec.in +++ b/ctdb/packaging/RPM/ctdb.spec.in @@ -180,7 +180,6 @@ rm -rf $RPM_BUILD_ROOT %{_sysconfdir}/ctdb/events.d/49.winbind %{_sysconfdir}/ctdb/events.d/50.samba %{_sysconfdir}/ctdb/events.d/60.nfs -%{_sysconfdir}/ctdb/events.d/62.cnfs %{_sysconfdir}/ctdb/events.d/70.iscsi %{_sysconfdir}/ctdb/events.d/91.lvs %{_sysconfdir}/ctdb/events.d/99.timeout