ctdb-scripts: Move event scripts to events/legacy/ directory

This is the initial location that will be used by the new
multi-component aware event daemon.

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>

diff --git a/ctdb/.gitignore b/ctdb/.gitignore
index 9e8c5812e9dd0601b263d0b13cf6cf33693ad867..a634aeb8b452145ffa816cd642bed7483dc0ad0b 100644 (file)
--- a/ctdb/.gitignore
+++ b/ctdb/.gitignore
@@ -22,7 +22,6 @@ public_addresses.txt
 rec.lock
 test.db
 tests/bin
-tests/events.d/00.ctdb_test_trigger
 tests/var
 tests/takeover/ctdb_takeover.pyc
 tests/eventscripts/var

diff --git a/ctdb/config/README b/ctdb/config/README
index ffbeb0e690bac81a0e3da0677349f20dad95cf60..d28f4f0fc600c8ae8d25747616de19b1bb708a0e 100644 (file)
--- a/ctdb/config/README
+++ b/ctdb/config/README
@@ -6,9 +6,9 @@ Selected highlights:
 
     An initscript for starting ctdbd at boot time.
 
-  events.d/
+  events/
 
-    Eventscripts.  See events.d/README for more details.
+    Eventscripts.  See events/README for more details.
 
   functions
 

diff --git a/ctdb/config/events.d/README b/ctdb/config/events/README
similarity index 97%
rename from ctdb/config/events.d/README
rename to ctdb/config/events/README
index f13714a7a2eddd82ce1e2f35fdfafb14fb4bec1f..88d5da45b6e8aef708b2abd677af32cd753bf8cb 100644 (file)
--- a/ctdb/config/events.d/README
+++ b/ctdb/config/events/README
@@ -1,8 +1,11 @@
-The events.d/ directory contains event scripts used by CTDB.  Event
+The events/ directory contains event scripts used by CTDB.  Event
 scripts are triggered on certain events, such as startup, monitoring
 or public IP allocation.  Scripts may be specific to services,
 networking or internal CTDB operations.
 
+Scripts are divided into subdirectories for different CTDB components.
+Right now the only component is "legacy".
+
 All event scripts start with the prefix 'NN.' where N is a digit.  The
 event scripts are run in sequence based on NN.  Thus 10.interface will
 be run before 60.nfs.  It is recommended to keep each NN unique.

diff --git a/ctdb/config/events.d/00.ctdb b/ctdb/config/events/legacy/00.ctdb
similarity index 100%
rename from ctdb/config/events.d/00.ctdb
rename to ctdb/config/events/legacy/00.ctdb

diff --git a/ctdb/config/events.d/01.reclock b/ctdb/config/events/legacy/01.reclock
similarity index 100%
rename from ctdb/config/events.d/01.reclock
rename to ctdb/config/events/legacy/01.reclock

diff --git a/ctdb/config/events.d/05.system b/ctdb/config/events/legacy/05.system
similarity index 100%
rename from ctdb/config/events.d/05.system
rename to ctdb/config/events/legacy/05.system

diff --git a/ctdb/config/events.d/06.nfs b/ctdb/config/events/legacy/06.nfs
similarity index 100%
rename from ctdb/config/events.d/06.nfs
rename to ctdb/config/events/legacy/06.nfs

diff --git a/ctdb/config/events.d/10.interface b/ctdb/config/events/legacy/10.interface
similarity index 100%
rename from ctdb/config/events.d/10.interface
rename to ctdb/config/events/legacy/10.interface

diff --git a/ctdb/config/events.d/11.natgw b/ctdb/config/events/legacy/11.natgw
similarity index 100%
rename from ctdb/config/events.d/11.natgw
rename to ctdb/config/events/legacy/11.natgw

diff --git a/ctdb/config/events.d/11.routing b/ctdb/config/events/legacy/11.routing
similarity index 100%
rename from ctdb/config/events.d/11.routing
rename to ctdb/config/events/legacy/11.routing

diff --git a/ctdb/config/events.d/13.per_ip_routing b/ctdb/config/events/legacy/13.per_ip_routing
similarity index 100%
rename from ctdb/config/events.d/13.per_ip_routing
rename to ctdb/config/events/legacy/13.per_ip_routing

diff --git a/ctdb/config/events.d/20.multipathd b/ctdb/config/events/legacy/20.multipathd
similarity index 100%
rename from ctdb/config/events.d/20.multipathd
rename to ctdb/config/events/legacy/20.multipathd

diff --git a/ctdb/config/events.d/31.clamd b/ctdb/config/events/legacy/31.clamd
similarity index 100%
rename from ctdb/config/events.d/31.clamd
rename to ctdb/config/events/legacy/31.clamd

diff --git a/ctdb/config/events.d/40.vsftpd b/ctdb/config/events/legacy/40.vsftpd
similarity index 100%
rename from ctdb/config/events.d/40.vsftpd
rename to ctdb/config/events/legacy/40.vsftpd

diff --git a/ctdb/config/events.d/41.httpd b/ctdb/config/events/legacy/41.httpd
similarity index 100%
rename from ctdb/config/events.d/41.httpd
rename to ctdb/config/events/legacy/41.httpd

diff --git a/ctdb/config/events.d/49.winbind b/ctdb/config/events/legacy/49.winbind
similarity index 100%
rename from ctdb/config/events.d/49.winbind
rename to ctdb/config/events/legacy/49.winbind

diff --git a/ctdb/config/events.d/50.samba b/ctdb/config/events/legacy/50.samba
similarity index 100%
rename from ctdb/config/events.d/50.samba
rename to ctdb/config/events/legacy/50.samba

diff --git a/ctdb/config/events.d/60.nfs b/ctdb/config/events/legacy/60.nfs
similarity index 100%
rename from ctdb/config/events.d/60.nfs
rename to ctdb/config/events/legacy/60.nfs

diff --git a/ctdb/config/events.d/70.iscsi b/ctdb/config/events/legacy/70.iscsi
similarity index 100%
rename from ctdb/config/events.d/70.iscsi
rename to ctdb/config/events/legacy/70.iscsi

diff --git a/ctdb/config/events.d/91.lvs b/ctdb/config/events/legacy/91.lvs
similarity index 100%
rename from ctdb/config/events.d/91.lvs
rename to ctdb/config/events/legacy/91.lvs

diff --git a/ctdb/config/events.d/99.timeout b/ctdb/config/events/legacy/99.timeout
similarity index 100%
rename from ctdb/config/events.d/99.timeout
rename to ctdb/config/events/legacy/99.timeout

diff --git a/ctdb/config/functions b/ctdb/config/functions
index 30afcdec9623eb23a27073756612cf48f33870cc..5cc995adf3fea7b6997560417383c4d252824c3b 100755 (executable)
--- a/ctdb/config/functions
+++ b/ctdb/config/functions
@@ -64,7 +64,7 @@ load_script_options ()
        fi
 
        if [ -n "$_script" ] ; then
-               _s="${CTDB_BASE}/events.d/${_script}"
+               _s="${CTDB_BASE}/events/legacy/${_script}"
        else
                _s="${0%.script}"
        fi

diff --git a/ctdb/packaging/RPM/ctdb.spec.in b/ctdb/packaging/RPM/ctdb.spec.in
index 55a0175a7745014197b73ff0b56e7257e8896ab2..40871d3d8f269a53eab0a3a8703a5b929b2752b9 100644 (file)
--- a/ctdb/packaging/RPM/ctdb.spec.in
+++ b/ctdb/packaging/RPM/ctdb.spec.in
@@ -131,8 +131,8 @@ install -m755 config/ctdb.init $RPM_BUILD_ROOT%{initdir}/ctdb
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/ctdb/notify.d
 
 # This is a hack. All documents should be installed in /usr/share/doc.
-rm -f $RPM_BUILD_ROOT%{_sysconfdir}/ctdb/events.d/README
-cp config/events.d/README README.eventscripts
+rm -f $RPM_BUILD_ROOT%{_sysconfdir}/ctdb/events/README
+cp config/events/README README.eventscripts
 rm -f $RPM_BUILD_ROOT%{_sysconfdir}/ctdb/nfs-checks.d/README
 cp config/nfs-checks.d/README README.nfs-checks.d
 cp config/notify.d.README README.notify.d
@@ -179,8 +179,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_sysconfdir}/sudoers.d/ctdb
 %dir %{_sysconfdir}/ctdb
 %{_sysconfdir}/ctdb/functions
-%dir %{_sysconfdir}/ctdb/events.d
-%{_sysconfdir}/ctdb/events.d/*
+%dir %{_sysconfdir}/ctdb/events
+%{_sysconfdir}/ctdb/events/*
 %dir %{_sysconfdir}/ctdb/nfs-checks.d
 %config(noreplace) %{_sysconfdir}/ctdb/nfs-checks.d/00.portmapper.check
 %config(noreplace) %{_sysconfdir}/ctdb/nfs-checks.d/10.status.check

diff --git a/ctdb/server/ctdbd.c b/ctdb/server/ctdbd.c
index 5290165a2a4694c2cec7a8775d79d8c84f366a16..93aedf2e4d97b9e329633058abf6bb39431b940d 100644 (file)
--- a/ctdb/server/ctdbd.c
+++ b/ctdb/server/ctdbd.c
@@ -350,7 +350,7 @@ int main(int argc, const char *argv[])
        ctdb_tunables_set_defaults(ctdb);
 
        ctdb->event_script_dir = talloc_asprintf(ctdb,
-                                                "%s/events.d",
+                                                "%s/events/legacy",
                                                 ctdb_base);
        if (ctdb->event_script_dir == NULL) {
                DBG_ERR("Out of memory\n");

diff --git a/ctdb/tests/complex/90_debug_hung_script.sh b/ctdb/tests/complex/90_debug_hung_script.sh
index b2518df6fdb34c209bfea2ee10f46a262a9c84e4..fc44bad8cb90dd006ecae3ee91ac71f9253b5c94 100755 (executable)
--- a/ctdb/tests/complex/90_debug_hung_script.sh
+++ b/ctdb/tests/complex/90_debug_hung_script.sh
@@ -84,7 +84,7 @@ done <<'EOF'
 ===== Start of hung script debug for PID=".*", event="monitor" =====
 ===== End of hung script debug for PID=".*", event="monitor" =====
 pstree -p -a .*:
-99\\.timeout,.* /etc/ctdb/events.d/99.timeout monitor
+99\\.timeout,.* /etc/ctdb/events/legacy/99.timeout monitor
  *\`-sleep,.*
 ---- Stack trace of interesting process [0-9]*\\[sleep\\] ----
 [<[0-9a-f]*>] .*sleep+.*

diff --git a/ctdb/tests/eventscripts/scripts/local.sh b/ctdb/tests/eventscripts/scripts/local.sh
index d34135eba35cf54a991bc6ccdd8c41924a69e48e..3f6bf16b5bc09a1dca7376ca5be1ef6a53fcce02 100644 (file)
--- a/ctdb/tests/eventscripts/scripts/local.sh
+++ b/ctdb/tests/eventscripts/scripts/local.sh
@@ -40,7 +40,7 @@ else
 fi
 
 setup_ctdb_base "$EVENTSCRIPTS_TESTS_VAR_DIR" "etc-ctdb" \
-               events.d \
+               events \
                functions \
                nfs-checks.d \
                nfs-linux-kernel-callout \
@@ -85,7 +85,7 @@ setup_script_options ()
        fi
 
        if [ -n "$_script" ] ; then
-               _options="${CTDB_BASE}/events.d/${_script}.options"
+               _options="${CTDB_BASE}/events/legacy/${_script}.options"
        else
                _options="${script_dir}/${script%.script}.options"
        fi
@@ -458,12 +458,12 @@ define_test ()
        [0-9][0-9].*.*)
            script="${_f%.*}"
            event="${_f##*.}"
-           script_dir="${CTDB_BASE}/events.d"
+           script_dir="${CTDB_BASE}/events/legacy"
            ;;
        [0-9][0-9].*)
            script="$_f"
            unset event
-           script_dir="${CTDB_BASE}/events.d"
+           script_dir="${CTDB_BASE}/events/legacy"
            ;;
        *.*)
            script="${_f%.*}"

diff --git a/ctdb/tests/shellcheck/event_scripts.sh b/ctdb/tests/shellcheck/event_scripts.sh
index b8a2b7844a3095bb00e5dd6cded078dfbb1100fb..b64c93649c8480b41b249eae331ba93cdd8b1fae 100755 (executable)
--- a/ctdb/tests/shellcheck/event_scripts.sh
+++ b/ctdb/tests/shellcheck/event_scripts.sh
@@ -4,4 +4,4 @@
 
 define_test "event scripts"
 
-shellcheck_test "${CTDB_SCRIPTS_BASE}/events.d"/[0-9][0-9].*
+shellcheck_test "${CTDB_SCRIPTS_BASE}/events/"*/[0-9][0-9].*

diff --git a/ctdb/tests/simple/etc-ctdb/events.d/00.test b/ctdb/tests/simple/etc-ctdb/events/legacy/00.test
similarity index 100%
rename from ctdb/tests/simple/etc-ctdb/events.d/00.test
rename to ctdb/tests/simple/etc-ctdb/events/legacy/00.test

diff --git a/ctdb/tests/simple/scripts/local_daemons.bash b/ctdb/tests/simple/scripts/local_daemons.bash
index b3d0087888c7d3d59a6693a100b3eb473261e8a8..f681b18f6f1b6fd161decdc31b5e62a067d9ceb8 100644 (file)
--- a/ctdb/tests/simple/scripts/local_daemons.bash
+++ b/ctdb/tests/simple/scripts/local_daemons.bash
@@ -137,7 +137,7 @@ setup_ctdb ()
                done
 
                if $no_event_scripts ; then
-                       rm -vf "${CTDB_BASE}/events.d/"*
+                       rm -vf "${CTDB_BASE}/events/legacy/"*
                fi
 
                cat >"${CTDB_BASE}/ctdb.conf" <<EOF

diff --git a/ctdb/wscript b/ctdb/wscript
index 22f1b2677cd85bf012318b2a6a36cbdb4cb2890f..59c69aea4e6640f6f6704241c7ec703e5074cefa 100644 (file)
--- a/ctdb/wscript
+++ b/ctdb/wscript
@@ -731,7 +731,7 @@ def build(bld):
         return pd['file_list']
 
     etc_subdirs = [
-        'events.d',
+        'events/legacy',
         'nfs-checks.d'
     ]