ctdb-scripts: Event scripts must end with ".script" suffix

Preparation for recommending configuration for each script next to the
actual script.

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

diff --git a/ctdb/common/run_event.c b/ctdb/common/run_event.c
index e230b12f151ab0b16a3b0792d9ffa1aab23e4b6a..b1b50ecf9be3b5627100c8555a41ccd730dc02f9 100644 (file)
--- a/ctdb/common/run_event.c
+++ b/ctdb/common/run_event.c
@@ -20,7 +20,7 @@
 #include "replace.h"
 #include "system/filesys.h"
 #include "system/dir.h"
-#include "system/locale.h"
+#include "system/glob.h"
 #include "system/wait.h"
 
 #include <talloc.h>
@@ -39,34 +39,15 @@
 
 static int script_filter(const struct dirent *de)
 {
-       size_t namelen = strlen(de->d_name);
-       char *ptr;
-
-       /* Ignore . and .. */
-       if (namelen < 3) {
-               return 0;
-       }
-
-       /* Skip filenames with ~ */
-       ptr = strchr(de->d_name, '~');
-       if (ptr != NULL) {
-               return 0;
-       }
-
-       /* Filename should start with [0-9][0-9]. */
-       if ((! isdigit(de->d_name[0])) ||
-           (! isdigit(de->d_name[1])) ||
-           (de->d_name[2] != '.')) {
-               return 0;
-       }
+       int ret;
 
-       /* Ignore filenames with multiple '.'s */
-       ptr = index(&de->d_name[3], '.');
-       if (ptr != NULL) {
-               return 0;
+       /* Match a script pattern */
+       ret = fnmatch("[0-9][0-9].*.script", de->d_name, 0);
+       if (ret == 0) {
+               return 1;
        }
 
-       return 1;
+       return 0;
 }
 
 static int get_script_list(TALLOC_CTX *mem_ctx,
@@ -75,6 +56,7 @@ static int get_script_list(TALLOC_CTX *mem_ctx,
 {
        struct dirent **namelist = NULL;
        struct run_event_script_list *script_list;
+       size_t ls;
        int count, ret;
        int i;
 
@@ -113,10 +95,13 @@ static int get_script_list(TALLOC_CTX *mem_ctx,
                goto done;
        }
 
+       ls = strlen(".script");
        for (i=0; i<count; i++) {
                struct run_event_script *s = &script_list->script[i];
 
-               s->name = talloc_strdup(script_list, namelist[i]->d_name);
+               s->name = talloc_strndup(script_list,
+                                        namelist[i]->d_name,
+                                        strlen(namelist[i]->d_name) - ls);
                if (s->name == NULL) {
                        ret = ENOMEM;
                        talloc_free(script_list);
@@ -142,12 +127,21 @@ static int script_chmod(TALLOC_CTX *mem_ctx, const char *script_dir,
 {
        DIR *dirp;
        struct dirent *de;
+       char script_file[PATH_MAX];
        int ret, new_mode;
        char *filename;
        struct stat st;
        bool found;
        int fd = -1;
 
+       ret = snprintf(script_file,
+                      sizeof(script_file),
+                      "%s.script",
+                      script_name);
+       if (ret >= sizeof(script_file)) {
+               return ENAMETOOLONG;
+       }
+
        dirp = opendir(script_dir);
        if (dirp == NULL) {
                return errno;
@@ -155,7 +149,7 @@ static int script_chmod(TALLOC_CTX *mem_ctx, const char *script_dir,
 
        found = false;
        while ((de = readdir(dirp)) != NULL) {
-               if (strcmp(de->d_name, script_name) == 0) {
+               if (strcmp(de->d_name, script_file) == 0) {
 
                        /* check for valid script names */
                        ret = script_filter(de);
@@ -174,7 +168,7 @@ static int script_chmod(TALLOC_CTX *mem_ctx, const char *script_dir,
                return ENOENT;
        }
 
-       filename = talloc_asprintf(mem_ctx, "%s/%s", script_dir, script_name);
+       filename = talloc_asprintf(mem_ctx, "%s/%s", script_dir, script_file);
        if (filename == NULL) {
                return ENOMEM;
        }
@@ -422,7 +416,7 @@ int run_event_script_list(struct run_event_context *run_ctx,
                struct stat st;
                char *path = NULL;
 
-               path = talloc_asprintf(mem_ctx, "%s/%s",
+               path = talloc_asprintf(mem_ctx, "%s/%s.script",
                                       run_event_script_dir(run_ctx),
                                       script->name);
                if (path == NULL) {
@@ -779,7 +773,7 @@ static struct tevent_req *run_event_run_script(struct tevent_req *req)
 
        script = &state->script_list->script[state->index];
 
-       path = talloc_asprintf(state, "%s/%s",
+       path = talloc_asprintf(state, "%s/%s.script",
                               run_event_script_dir(state->run_ctx),
                               script->name);
        if (path == NULL) {

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

diff --git a/ctdb/tests/complex/90_debug_hung_script.sh b/ctdb/tests/complex/90_debug_hung_script.sh
index fc44bad8cb90dd006ecae3ee91ac71f9253b5c94..797f007e106813b33e434f95145bcfd65633ad6a 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/legacy/99.timeout monitor
+99\\.timeout\\.scri,.* /etc/ctdb/events/legacy/99\\.timeout\\.script monitor
  *\`-sleep,.*
 ---- Stack trace of interesting process [0-9]*\\[sleep\\] ----
 [<[0-9a-f]*>] .*sleep+.*

diff --git a/ctdb/tests/cunit/run_event_001.sh b/ctdb/tests/cunit/run_event_001.sh
index 35c256b6fcd16d5088391eba5f7fa5e50a3f6b5c..f8f74fbf23acda375fe008a72096ef92707c1752 100755 (executable)
--- a/ctdb/tests/cunit/run_event_001.sh
+++ b/ctdb/tests/cunit/run_event_001.sh
@@ -22,14 +22,15 @@ cat > "$scriptdir/prog" <<EOF
 echo hello
 EOF
 
-# Invalid script
+# Invalid script, doesn't end in ".script"
 ok <<EOF
 No event scripts found
 EOF
 unit_test run_event_test "$scriptdir" list
 
+# Is not found because enabling "prog" actually looks for "prog.script"
 ok <<EOF
-Script enable prog completed with result=22
+Script enable prog completed with result=2
 EOF
 unit_test run_event_test "$scriptdir" enable prog
 
@@ -37,28 +38,7 @@ required_result 1 <<EOF
 EOF
 unit_test test -x "${scriptdir}/prog"
 
-cat > "$scriptdir/10.test.rpmnew" <<EOF
-#!/bin/sh
-
-echo hello
-EOF
-chmod +x "$scriptdir/10.test.rpmnew"
-
-# Invalid script with multiple '.'s
-ok <<EOF
-No event scripts found
-EOF
-unit_test run_event_test "$scriptdir" list
-
-ok <<EOF
-Script disable 10.test.rpmnew completed with result=22
-EOF
-unit_test run_event_test "$scriptdir" disable 10.test.rpmnew
-
-ok_null
-unit_test test -x "${scriptdir}/10.test.rpmnew"
-
-cat > "$scriptdir/11.foo" <<EOF
+cat > "$scriptdir/11.foo.script" <<EOF
 #!/bin/sh
 
 echo hello
@@ -77,7 +57,7 @@ unit_test run_event_test "$scriptdir" enable 11.foo
 
 ok <<EOF
 EOF
-unit_test test -x "${scriptdir}/11.foo"
+unit_test test -x "${scriptdir}/11.foo.script"
 
 ok <<EOF
 11.foo: hello
@@ -86,7 +66,7 @@ Event monitor completed with result=0
 EOF
 unit_test run_event_test "$scriptdir" run 10 monitor
 
-cat > "$scriptdir/22.bar" <<EOF
+cat > "$scriptdir/22.bar.script" <<EOF
 #!/bin/sh
 
 exit 1
@@ -120,7 +100,7 @@ unit_test run_event_test "$scriptdir" disable 22.bar
 
 required_result 1 <<EOF
 EOF
-unit_test test -x "${scriptdir}/22.bar"
+unit_test test -x "${scriptdir}/22.bar.script"
 
 ok <<EOF
 11.foo: hello
@@ -130,7 +110,7 @@ Event monitor completed with result=0
 EOF
 unit_test run_event_test "$scriptdir" run 10 monitor
 
-cat > "$scriptdir/22.bar" <<EOF
+cat > "$scriptdir/22.bar.script" <<EOF
 #!/bin/sh
 
 sleep 10
@@ -152,4 +132,3 @@ unit_test run_event_test "$scriptdir" run 5 monitor
 
 rm -rf "$scriptdir"
 exit 0
-

diff --git a/ctdb/tests/eventd/eventd_002.sh b/ctdb/tests/eventd/eventd_002.sh
index f4af69286e3f106181121b24cde96bbbae0cd3de..ee0f8f36689c0134ec94d739611d4094ce65bfee 100755 (executable)
--- a/ctdb/tests/eventd/eventd_002.sh
+++ b/ctdb/tests/eventd/eventd_002.sh
@@ -6,9 +6,9 @@ define_test "eventscript directory with random files"
 
 setup_eventd
 
-touch "$eventd_scriptdir/README"
+touch "$eventd_scriptdir/README.script"
 
-cat > "$eventd_scriptdir/a.sh" <<EOF
+cat > "$eventd_scriptdir/a.script" <<EOF
 #!/bin/sh
 
 exit 1
@@ -25,9 +25,9 @@ EOF
 simple_test script enable README
 
 required_result 22 <<EOF
-Script name a.sh is invalid
+Script name a is invalid
 EOF
-simple_test script disable a.sh
+simple_test script disable a
 
 required_result 2 <<EOF
 Script 00.test does not exist

diff --git a/ctdb/tests/eventd/eventd_003.sh b/ctdb/tests/eventd/eventd_003.sh
index 49f1d324235faac92a7749626068210cdd220e7a..8f087f848fb14c794a9d8a85f2c0f7772cfe7f33 100755 (executable)
--- a/ctdb/tests/eventd/eventd_003.sh
+++ b/ctdb/tests/eventd/eventd_003.sh
@@ -6,7 +6,7 @@ define_test "disabled event script"
 
 setup_eventd
 
-cat > "$eventd_scriptdir/01.test" <<EOF
+cat > "$eventd_scriptdir/01.test.script" <<EOF
 #!/bin/sh
 
 exit 0

diff --git a/ctdb/tests/eventd/eventd_004.sh b/ctdb/tests/eventd/eventd_004.sh
index 74aa82c9d2fc4c446a47094e91a0a117558e2f4f..31af397d1b49f37b67bf1a9257acbdcab5de63e5 100755 (executable)
--- a/ctdb/tests/eventd/eventd_004.sh
+++ b/ctdb/tests/eventd/eventd_004.sh
@@ -6,7 +6,7 @@ define_test "enabled event script"
 
 setup_eventd
 
-cat > "$eventd_scriptdir/01.test" <<EOF
+cat > "$eventd_scriptdir/01.test.script" <<EOF
 #!/bin/sh
 
 exit 0

diff --git a/ctdb/tests/eventd/eventd_005.sh b/ctdb/tests/eventd/eventd_005.sh
index 0b803aed62f50b41b28ad5ff4d7e392bab02f598..0097bc5e24e77895e2cf237d0341dcfba9b10a7c 100755 (executable)
--- a/ctdb/tests/eventd/eventd_005.sh
+++ b/ctdb/tests/eventd/eventd_005.sh
@@ -6,12 +6,12 @@ define_test "failing event script"
 
 setup_eventd
 
-cat > "$eventd_scriptdir/01.test" <<EOF
+cat > "$eventd_scriptdir/01.test.script" <<EOF
 #!/bin/sh
 
 exit 1
 EOF
-chmod +x "$eventd_scriptdir/01.test"
+chmod +x "$eventd_scriptdir/01.test.script"
 
 required_result 1 <<EOF
 Failed to run event monitor, result=1

diff --git a/ctdb/tests/eventd/eventd_006.sh b/ctdb/tests/eventd/eventd_006.sh
index c540bf3bc38b644b1ac19329bf798386edbeaa62..09d8813aa4e662e5d8af1f3ad552f2a04516460d 100755 (executable)
--- a/ctdb/tests/eventd/eventd_006.sh
+++ b/ctdb/tests/eventd/eventd_006.sh
@@ -6,13 +6,13 @@ define_test "timing out event script"
 
 setup_eventd
 
-cat > "$eventd_scriptdir/01.test" <<EOF
+cat > "$eventd_scriptdir/01.test.script" <<EOF
 #!/bin/sh
 
 sleep 10
 exit 0
 EOF
-chmod +x "$eventd_scriptdir/01.test"
+chmod +x "$eventd_scriptdir/01.test.script"
 
 required_result 62 <<EOF
 Event monitor timed out

diff --git a/ctdb/tests/eventd/eventd_007.sh b/ctdb/tests/eventd/eventd_007.sh
index fee60fe4dc36156d9979a8c9ba6c734762b008fd..2c990461df9ed09a783941b466d45f33ecce31ed 100755 (executable)
--- a/ctdb/tests/eventd/eventd_007.sh
+++ b/ctdb/tests/eventd/eventd_007.sh
@@ -6,13 +6,13 @@ define_test "capture event script output"
 
 setup_eventd
 
-cat > "$eventd_scriptdir/01.test" <<EOF
+cat > "$eventd_scriptdir/01.test.script" <<EOF
 #!/bin/sh
 
 echo "args: \$*"
 exit 1
 EOF
-chmod +x "$eventd_scriptdir/01.test"
+chmod +x "$eventd_scriptdir/01.test.script"
 
 required_result 1 <<EOF
 Failed to run event monitor, result=1

diff --git a/ctdb/tests/eventd/eventd_011.sh b/ctdb/tests/eventd/eventd_011.sh
index d600e4f6035f3e854dae2412c03f4ee9474ca481..d05de531901359f8f5271413dca6c0c8199f2ab3 100755 (executable)
--- a/ctdb/tests/eventd/eventd_011.sh
+++ b/ctdb/tests/eventd/eventd_011.sh
@@ -6,7 +6,7 @@ define_test "multiple events"
 
 setup_eventd
 
-cat > "$eventd_scriptdir/01.test" <<EOF
+cat > "$eventd_scriptdir/01.test.script" <<EOF
 #!/bin/sh
 
 echo "args: \$*"
@@ -20,7 +20,7 @@ monitor)
        ;;
 esac
 EOF
-chmod +x "$eventd_scriptdir/01.test"
+chmod +x "$eventd_scriptdir/01.test.script"
 
 required_result 0 <<EOF
 EOF

diff --git a/ctdb/tests/eventd/eventd_012.sh b/ctdb/tests/eventd/eventd_012.sh
index f750b191f83a28714aed5428039772eebce81c00..9154d8fd2a1f0a5d0902b71ce17e51db39c74470 100755 (executable)
--- a/ctdb/tests/eventd/eventd_012.sh
+++ b/ctdb/tests/eventd/eventd_012.sh
@@ -6,12 +6,12 @@ define_test "cancel new monitor event"
 
 setup_eventd
 
-cat > "$eventd_scriptdir/01.test" <<EOF
+cat > "$eventd_scriptdir/01.test.script" <<EOF
 #!/bin/sh
 
 sleep 5
 EOF
-chmod +x "$eventd_scriptdir/01.test"
+chmod +x "$eventd_scriptdir/01.test.script"
 
 required_result 0 <<EOF
 EOF

diff --git a/ctdb/tests/eventd/eventd_013.sh b/ctdb/tests/eventd/eventd_013.sh
index 0c581b33ef40b63631de43c6bf8a28462f7d2ed0..d80ecf007cf020790719131199d1d1a2a94802aa 100755 (executable)
--- a/ctdb/tests/eventd/eventd_013.sh
+++ b/ctdb/tests/eventd/eventd_013.sh
@@ -6,12 +6,12 @@ define_test "cancel running monitor event"
 
 setup_eventd
 
-cat > "$eventd_scriptdir/01.test" <<EOF
+cat > "$eventd_scriptdir/01.test.script" <<EOF
 #!/bin/sh
 
 sleep 5
 EOF
-chmod +x "$eventd_scriptdir/01.test"
+chmod +x "$eventd_scriptdir/01.test.script"
 
 required_result 125 <<EOF
 Event monitor got cancelled

diff --git a/ctdb/tests/eventd/eventd_014.sh b/ctdb/tests/eventd/eventd_014.sh
index 1069d75b691a841f0997431397d92d3ed4271d9e..56e728cfa0651562f2b6b99d81d809b092ecb02b 100755 (executable)
--- a/ctdb/tests/eventd/eventd_014.sh
+++ b/ctdb/tests/eventd/eventd_014.sh
@@ -6,12 +6,12 @@ define_test "queue events"
 
 setup_eventd
 
-cat > "$eventd_scriptdir/01.test" <<EOF
+cat > "$eventd_scriptdir/01.test.script" <<EOF
 #!/bin/sh
 
 sleep 5
 EOF
-chmod +x "$eventd_scriptdir/01.test"
+chmod +x "$eventd_scriptdir/01.test.script"
 
 required_result 0 <<EOF
 EOF

diff --git a/ctdb/tests/eventd/eventd_021.sh b/ctdb/tests/eventd/eventd_021.sh
index e2368b0b7865fa1457e969843eb095ac20004ac3..feaf868805b6977521c950ee68f60b249e307a5c 100755 (executable)
--- a/ctdb/tests/eventd/eventd_021.sh
+++ b/ctdb/tests/eventd/eventd_021.sh
@@ -4,12 +4,12 @@
 
 define_test "debug script"
 
-cat > "$eventd_scriptdir/01.test" <<EOF
+cat > "$eventd_scriptdir/01.test.script" <<EOF
 #!/bin/sh
 
 sleep 99
 EOF
-chmod +x "$eventd_scriptdir/01.test"
+chmod +x "$eventd_scriptdir/01.test.script"
 
 cat > "$eventd_scriptdir/debug.sh" <<EOF
 #!/bin/sh

diff --git a/ctdb/tests/eventd/eventd_022.sh b/ctdb/tests/eventd/eventd_022.sh
index ee74e885aa0a397d600f8c44e5bb4148e6f07d5d..f85b435f69e7f0c3e19cf6eeed1a85e331df0e2c 100755 (executable)
--- a/ctdb/tests/eventd/eventd_022.sh
+++ b/ctdb/tests/eventd/eventd_022.sh
@@ -4,13 +4,13 @@
 
 define_test "status output in debug script"
 
-cat > "$eventd_scriptdir/01.test" <<EOF
+cat > "$eventd_scriptdir/01.test.script" <<EOF
 #!/bin/sh
 
 echo "Sleeping for 99 seconds"
 sleep 99
 EOF
-chmod +x "$eventd_scriptdir/01.test"
+chmod +x "$eventd_scriptdir/01.test.script"
 
 cat > "$eventd_scriptdir/debug.sh" <<EOF
 #!/bin/sh
@@ -33,7 +33,7 @@ simple_test run monitor 5
 sleep 5
 
 required_result 0 <<EOF
-01.test,PID $eventd_scriptdir/01.test monitor
+01.test.script,PID $eventd_scriptdir/01.test.script monitor
   \`-sleep,PID 99
 01.test              TIMEDOUT   DATETIME
   OUTPUT: Sleeping for 99 seconds

diff --git a/ctdb/tests/eventd/eventd_023.sh b/ctdb/tests/eventd/eventd_023.sh
index 264a28194447446f5216a4bfc3f0ff474aa28ad2..9ed2f92b14c2ff3de8328ae4e000660383cc6474 100755 (executable)
--- a/ctdb/tests/eventd/eventd_023.sh
+++ b/ctdb/tests/eventd/eventd_023.sh
@@ -4,13 +4,13 @@
 
 define_test "redirected status output in debug script"
 
-cat > "$eventd_scriptdir/01.test" <<EOF
+cat > "$eventd_scriptdir/01.test.script" <<EOF
 #!/bin/sh
 
 echo "Sleeping for 99 seconds"
 sleep 99
 EOF
-chmod +x "$eventd_scriptdir/01.test"
+chmod +x "$eventd_scriptdir/01.test.script"
 
 cat > "$eventd_scriptdir/debug.sh" <<EOF
 #!/bin/sh

diff --git a/ctdb/tests/eventd/eventd_024.sh b/ctdb/tests/eventd/eventd_024.sh
index 04a5d00eed1ef19d5215c3bb168bb7c7737e4f1e..38ebfa91dc17a90cd79c683bede0fd7f9616e788 100755 (executable)
--- a/ctdb/tests/eventd/eventd_024.sh
+++ b/ctdb/tests/eventd/eventd_024.sh
@@ -4,13 +4,13 @@
 
 define_test "process terminated after debug"
 
-cat > "$eventd_scriptdir/01.test" <<EOF
+cat > "$eventd_scriptdir/01.test.script" <<EOF
 #!/bin/sh
 
 echo "Sleeping for 99 seconds"
 sleep 99
 EOF
-chmod +x "$eventd_scriptdir/01.test"
+chmod +x "$eventd_scriptdir/01.test.script"
 
 cat > "$eventd_scriptdir/debug.sh" <<EOF
 #!/bin/sh

diff --git a/ctdb/tests/eventd/eventd_031.sh b/ctdb/tests/eventd/eventd_031.sh
index 5157bce940f6fb16ef07832e2afff574930c6b7e..ab7d7adc5e01cd862ca8c93b925b767aa13b3ee4 100755 (executable)
--- a/ctdb/tests/eventd/eventd_031.sh
+++ b/ctdb/tests/eventd/eventd_031.sh
@@ -4,14 +4,14 @@
 
 define_test "multiple scripts"
 
-cat > "$eventd_scriptdir/01.test" <<EOF
+cat > "$eventd_scriptdir/01.test.script" <<EOF
 #!/bin/sh
 
 sleep 1
 EOF
 
-cp "$eventd_scriptdir/01.test" "$eventd_scriptdir/02.test"
-cp "$eventd_scriptdir/01.test" "$eventd_scriptdir/03.test"
+cp "$eventd_scriptdir/01.test.script" "$eventd_scriptdir/02.test.script"
+cp "$eventd_scriptdir/01.test.script" "$eventd_scriptdir/03.test.script"
 
 setup_eventd
 

diff --git a/ctdb/tests/eventd/eventd_032.sh b/ctdb/tests/eventd/eventd_032.sh
index 6d02283ffee629fc0d41abf7270db0469c287582..96b4d54273af2835174af3bd006c74f02ba15fc7 100755 (executable)
--- a/ctdb/tests/eventd/eventd_032.sh
+++ b/ctdb/tests/eventd/eventd_032.sh
@@ -4,7 +4,7 @@
 
 define_test "failures with multiple scripts"
 
-cat > "$eventd_scriptdir/01.test" <<EOF
+cat > "$eventd_scriptdir/01.test.script" <<EOF
 #!/bin/sh
 
 case "\$1" in
@@ -17,9 +17,9 @@ monitor|ipreallocated)
 esac
 
 EOF
-chmod +x "$eventd_scriptdir/01.test"
+chmod +x "$eventd_scriptdir/01.test.script"
 
-cat > "$eventd_scriptdir/02.test" <<EOF
+cat > "$eventd_scriptdir/02.test.script" <<EOF
 #!/bin/sh
 
 case "\$1" in
@@ -32,9 +32,9 @@ startup|ipreallocated)
 esac
 
 EOF
-chmod +x "$eventd_scriptdir/02.test"
+chmod +x "$eventd_scriptdir/02.test.script"
 
-cat > "$eventd_scriptdir/03.test" <<EOF
+cat > "$eventd_scriptdir/03.test.script" <<EOF
 #!/bin/sh
 
 case "\$1" in
@@ -47,7 +47,7 @@ startup|monitor)
 esac
 
 EOF
-chmod +x "$eventd_scriptdir/03.test"
+chmod +x "$eventd_scriptdir/03.test.script"
 
 setup_eventd
 

diff --git a/ctdb/tests/eventd/eventd_033.sh b/ctdb/tests/eventd/eventd_033.sh
index 6b6905567715ab9f0d7b9ee448e2faf19578c3af..724bdb3d973fd0cbb3d913bab804d3c8c49a9b85 100755 (executable)
--- a/ctdb/tests/eventd/eventd_033.sh
+++ b/ctdb/tests/eventd/eventd_033.sh
@@ -4,7 +4,7 @@
 
 define_test "timeouts with multiple scripts"
 
-cat > "$eventd_scriptdir/01.test" <<EOF
+cat > "$eventd_scriptdir/01.test.script" <<EOF
 #!/bin/sh
 
 case "\$1" in
@@ -17,9 +17,9 @@ monitor|ipreallocated)
 esac
 
 EOF
-chmod +x "$eventd_scriptdir/01.test"
+chmod +x "$eventd_scriptdir/01.test.script"
 
-cat > "$eventd_scriptdir/02.test" <<EOF
+cat > "$eventd_scriptdir/02.test.script" <<EOF
 #!/bin/sh
 
 case "\$1" in
@@ -32,9 +32,9 @@ startup|ipreallocated)
 esac
 
 EOF
-chmod +x "$eventd_scriptdir/02.test"
+chmod +x "$eventd_scriptdir/02.test.script"
 
-cat > "$eventd_scriptdir/03.test" <<EOF
+cat > "$eventd_scriptdir/03.test.script" <<EOF
 #!/bin/sh
 
 case "\$1" in
@@ -47,7 +47,7 @@ startup|monitor)
 esac
 
 EOF
-chmod +x "$eventd_scriptdir/03.test"
+chmod +x "$eventd_scriptdir/03.test.script"
 
 setup_eventd
 

diff --git a/ctdb/tests/eventd/eventd_041.sh b/ctdb/tests/eventd/eventd_041.sh
index a10926f9f457fcfe0dcffc168090201ddb7059e9..581f30c4d67692758743135dedbaa3213aa8b4e8 100755 (executable)
--- a/ctdb/tests/eventd/eventd_041.sh
+++ b/ctdb/tests/eventd/eventd_041.sh
@@ -4,7 +4,7 @@
 
 define_test "takeip event"
 
-cat > "$eventd_scriptdir/01.test" <<EOF
+cat > "$eventd_scriptdir/01.test.script" <<EOF
 #!/bin/sh
 
 echo \$*
@@ -14,7 +14,7 @@ if [ \$# -ne 4 ] ; then
 fi
 exit 0
 EOF
-chmod +x "$eventd_scriptdir/01.test"
+chmod +x "$eventd_scriptdir/01.test.script"
 
 setup_eventd
 

diff --git a/ctdb/tests/eventd/eventd_042.sh b/ctdb/tests/eventd/eventd_042.sh
index 19a30d7d538ae0061003eb1c5d531898fb38372a..c99832b80191eb7d5fce5dce3b4ce0a0481bf59c 100755 (executable)
--- a/ctdb/tests/eventd/eventd_042.sh
+++ b/ctdb/tests/eventd/eventd_042.sh
@@ -4,7 +4,7 @@
 
 define_test "releaseip event"
 
-cat > "$eventd_scriptdir/01.test" <<EOF
+cat > "$eventd_scriptdir/01.test.script" <<EOF
 #!/bin/sh
 
 echo \$*
@@ -14,7 +14,7 @@ if [ \$# -ne 4 ] ; then
 fi
 exit 0
 EOF
-chmod +x "$eventd_scriptdir/01.test"
+chmod +x "$eventd_scriptdir/01.test.script"
 
 setup_eventd
 

diff --git a/ctdb/tests/eventd/eventd_043.sh b/ctdb/tests/eventd/eventd_043.sh
index d347c6335f77075bbf0b85dfae2595371ac2a580..6ca409ff3d95a982f21958b5372bde338d315339 100755 (executable)
--- a/ctdb/tests/eventd/eventd_043.sh
+++ b/ctdb/tests/eventd/eventd_043.sh
@@ -4,7 +4,7 @@
 
 define_test "updateip event"
 
-cat > "$eventd_scriptdir/01.test" <<EOF
+cat > "$eventd_scriptdir/01.test.script" <<EOF
 #!/bin/sh
 
 echo \$*
@@ -14,7 +14,7 @@ if [ \$# -ne 5 ] ; then
 fi
 exit 0
 EOF
-chmod +x "$eventd_scriptdir/01.test"
+chmod +x "$eventd_scriptdir/01.test.script"
 
 setup_eventd
 

diff --git a/ctdb/tests/eventd/eventd_051.sh b/ctdb/tests/eventd/eventd_051.sh
index 46162de82c92222faf229d95691e305f4394131f..8993984aebc68a51cbfa016c2cbc7ee2da13424a 100755 (executable)
--- a/ctdb/tests/eventd/eventd_051.sh
+++ b/ctdb/tests/eventd/eventd_051.sh
@@ -4,12 +4,12 @@
 
 define_test "logging check"
 
-cat > "$eventd_scriptdir/01.test" <<EOF
+cat > "$eventd_scriptdir/01.test.script" <<EOF
 #!/bin/sh
 
 echo "Running event \$1"
 EOF
-chmod +x "$eventd_scriptdir/01.test"
+chmod +x "$eventd_scriptdir/01.test.script"
 
 setup_eventd
 

diff --git a/ctdb/tests/eventscripts/scripts/local.sh b/ctdb/tests/eventscripts/scripts/local.sh
index 3f6bf16b5bc09a1dca7376ca5be1ef6a53fcce02..e374dcdbe94ec5202d845a1d1893621e18338bb3 100644 (file)
--- a/ctdb/tests/eventscripts/scripts/local.sh
+++ b/ctdb/tests/eventscripts/scripts/local.sh
@@ -456,12 +456,12 @@ define_test ()
 
     case "$_f" in
        [0-9][0-9].*.*)
-           script="${_f%.*}"
+           script="${_f%.*}.script"
            event="${_f##*.}"
            script_dir="${CTDB_BASE}/events/legacy"
            ;;
        [0-9][0-9].*)
-           script="$_f"
+           script="${_f}.script"
            unset event
            script_dir="${CTDB_BASE}/events/legacy"
            ;;
@@ -479,9 +479,11 @@ define_test ()
     [ -r "${script_dir}/${script}" ] || \
        die "Internal error - unable to find script \"${script_dir}/${script}\""
 
-    printf "%-17s %-10s %-4s - %s\n\n" "$script" "$event" "$_num" "$desc"
+    script_short="${script%.script}"
+
+    printf "%-17s %-10s %-4s - %s\n\n" "$script_short" "$event" "$_num" "$desc"
 
-    _f="${TEST_SUBDIR}/scripts/${script}.sh"
+    _f="${TEST_SUBDIR}/scripts/${script_short}.sh"
     if [ -r "$_f" ] ; then
            . "$_f"
     fi

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