ctdb-event: Switch to ETIMEDOUT instead of ETIME

BUG: https://bugzilla.samba.org/show_bug.cgi?id=13520

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

diff --git a/ctdb/event/event_cmd.c b/ctdb/event/event_cmd.c
index c116341668700f16084989d40421b2bcc337807e..db39e4d881cbe420300dcdf163573571a7438556 100644 (file)
--- a/ctdb/event/event_cmd.c
+++ b/ctdb/event/event_cmd.c
@@ -130,8 +130,8 @@ static void event_cmd_run_done(struct tevent_req *subreq)
                goto done;
        }
 
-       if (script_list->summary == -ETIME) {
-               state->reply->result = ETIME;
+       if (script_list->summary == -ETIMEDOUT) {
+               state->reply->result = ETIMEDOUT;
        } else if (script_list->summary != 0) {
                state->reply->result = ENOEXEC;
        }

diff --git a/ctdb/event/event_tool.c b/ctdb/event/event_tool.c
index 3a99de50ece4dc5330639da41fa4bfec2d098583..9f755852742921d108e26224dc8d18d991b0b5c5 100644 (file)
--- a/ctdb/event/event_tool.c
+++ b/ctdb/event/event_tool.c
@@ -145,7 +145,7 @@ static int event_command_run(TALLOC_CTX *mem_ctx,
 
        if (result == ENOENT) {
                printf("Event dir for %s does not exist\n", argv[1]);
-       } else if (result == ETIME) {
+       } else if (result == ETIMEDOUT) {
                printf("Event %s in %s timed out\n", argv[2], argv[1]);
        } else if (result == ECANCELED) {
                printf("Event %s in %s got cancelled\n", argv[2], argv[1]);
@@ -170,7 +170,7 @@ static double timeval_delta(struct timeval *tv2, struct timeval *tv)
 
 static void print_status_one(struct ctdb_event_script *script)
 {
-       if (script->result == -ETIME) {
+       if (script->result == -ETIMEDOUT) {
                printf("%-20s %-10s %s",
                       script->name,
                       "TIMEDOUT",

diff --git a/ctdb/tests/eventd/eventd_001.sh b/ctdb/tests/eventd/eventd_001.sh
index 106f6b8e75cd216e34a574609f44be1043b891e9..3f4e8e46857a1c1a18180cf623e512073daedf7f 100755 (executable)
--- a/ctdb/tests/eventd/eventd_001.sh
+++ b/ctdb/tests/eventd/eventd_001.sh
@@ -6,17 +6,17 @@ define_test "non-existent eventscript directory"
 
 setup_eventd
 
-required_result 2 <<EOF
+required_error ENOENT <<EOF
 Event dir for foobar does not exist
 EOF
 simple_test status foobar monitor
 
-required_result 2 <<EOF
+required_error ENOENT <<EOF
 Event dir for foobar does not exist
 EOF
 simple_test run 10 foobar monitor
 
-required_result 2 <<EOF
+required_error ENOENT <<EOF
 Script 01.test does not exist in foobar
 EOF
 simple_test script enable foobar 01.test

diff --git a/ctdb/tests/eventd/eventd_002.sh b/ctdb/tests/eventd/eventd_002.sh
index b5fd2df7df6ccce1862620bbdd8deef3bc9a4692..ba75b1c0e55f8b3cfe2cfd0a7a306fdb17111e6a 100755 (executable)
--- a/ctdb/tests/eventd/eventd_002.sh
+++ b/ctdb/tests/eventd/eventd_002.sh
@@ -6,16 +6,14 @@ define_test "empty eventscript directory"
 
 setup_eventd
 
-required_result 22 <<EOF
+required_error EINVAL <<EOF
 Event monitor has never run in empty
 EOF
 simple_test status empty monitor
 
-ok <<EOF
-EOF
+ok_null
 simple_test run 10 empty monitor
 
-ok <<EOF
-EOF
+ok_null
 simple_test status empty monitor
 

diff --git a/ctdb/tests/eventd/eventd_003.sh b/ctdb/tests/eventd/eventd_003.sh
index e138eb14919fa615ba0739fd4cfe5642f09e8832..772caef583c9c7e388052ddec23e1414bebcc31e 100755 (executable)
--- a/ctdb/tests/eventd/eventd_003.sh
+++ b/ctdb/tests/eventd/eventd_003.sh
@@ -6,28 +6,27 @@ define_test "eventscript directory with random files"
 
 setup_eventd
 
-required_result 22 <<EOF
+required_error EINVAL <<EOF
 Script README is invalid in random
 EOF
 simple_test script enable random README
 
-required_result 22 <<EOF
+required_error EINVAL <<EOF
 Script a is invalid in random
 EOF
 simple_test script disable random a
 
-required_result 2 <<EOF
+required_error ENOENT <<EOF
 Script 00.foobar does not exist in random
 EOF
 simple_test script enable random 00.foobar
 
-required_result 22 <<EOF
+required_error EINVAL <<EOF
 Event monitor has never run in random
 EOF
 simple_test status random monitor
 
-ok <<EOF
-EOF
+ok_null
 simple_test run 10 random monitor
 
 ok <<EOF

diff --git a/ctdb/tests/eventd/eventd_004.sh b/ctdb/tests/eventd/eventd_004.sh
index 3a7163fed7fd49d67278df5aedae54b76e15c4ef..fe69d1d1a0c48744652aa96bbaa096f2a1eeac1d 100755 (executable)
--- a/ctdb/tests/eventd/eventd_004.sh
+++ b/ctdb/tests/eventd/eventd_004.sh
@@ -18,7 +18,7 @@ simple_test script enable random 01.disabled
 ok_null
 simple_test script disable random 01.disabled
 
-required_result 22 <<EOF
+required_error EINVAL <<EOF
 Event monitor has never run in random
 EOF
 simple_test status random monitor

diff --git a/ctdb/tests/eventd/eventd_006.sh b/ctdb/tests/eventd/eventd_006.sh
index 5d21a154d4b4a7730590b94648c635434cea1769..a7a2d41d3b7b15dcce7d9f930043c38c69306030 100755 (executable)
--- a/ctdb/tests/eventd/eventd_006.sh
+++ b/ctdb/tests/eventd/eventd_006.sh
@@ -6,7 +6,7 @@ define_test "failing event script"
 
 setup_eventd
 
-required_result 8 <<EOF
+required_error ENOEXEC <<EOF
 Event failure in random failed
 EOF
 simple_test run 10 random failure

diff --git a/ctdb/tests/eventd/eventd_007.sh b/ctdb/tests/eventd/eventd_007.sh
index 9fa0d42923ddb2f60260ec0e99a421c153895aec..e8ee403d993d5a12ae2e7e43d431bb2c62141793 100755 (executable)
--- a/ctdb/tests/eventd/eventd_007.sh
+++ b/ctdb/tests/eventd/eventd_007.sh
@@ -6,12 +6,12 @@ define_test "timing out event script"
 
 setup_eventd
 
-required_result 62 <<EOF
+required_error ETIMEDOUT <<EOF
 Event timeout in random timed out
 EOF
 simple_test run 5 random timeout
 
-required_result 62 <<EOF
+required_error ETIMEDOUT <<EOF
 01.disabled          DISABLED  
 02.enabled           TIMEDOUT   DATETIME
   OUTPUT: 

diff --git a/ctdb/tests/eventd/eventd_011.sh b/ctdb/tests/eventd/eventd_011.sh
index 8d90e2cbe95f91ea3cc8af237156af7c43bb73e4..ce7561356ff70ac90f685aa7e76004f115aba4a9 100755 (executable)
--- a/ctdb/tests/eventd/eventd_011.sh
+++ b/ctdb/tests/eventd/eventd_011.sh
@@ -15,7 +15,7 @@ ok <<EOF
 EOF
 simple_test status random monitor
 
-required_result 8 <<EOF
+required_error ENOEXEC <<EOF
 Event failure in random failed
 EOF
 simple_test run 10 random failure
@@ -27,7 +27,7 @@ required_result 1 <<EOF
 EOF
 simple_test status random failure
 
-required_result 8 <<EOF
+required_error ENOEXEC <<EOF
 Event verbosefailure in random failed
 EOF
 simple_test run 10 random verbosefailure

diff --git a/ctdb/tests/eventd/eventd_012.sh b/ctdb/tests/eventd/eventd_012.sh
index fd828c4d547943d8028b3148f87985c4a520b278..5e6857bff268034d5636472c9252856400109fbd 100755 (executable)
--- a/ctdb/tests/eventd/eventd_012.sh
+++ b/ctdb/tests/eventd/eventd_012.sh
@@ -9,7 +9,7 @@ setup_eventd
 ok_null
 simple_test_background run 10 multi startup
 
-required_result 125 <<EOF
+required_error ECANCELED <<EOF
 Event monitor in multi got cancelled
 EOF
 simple_test run 10 multi monitor
@@ -21,7 +21,7 @@ ok <<EOF
 EOF
 simple_test status multi startup
 
-required_result 22 <<EOF
+required_error EINVAL <<EOF
 Event monitor has never run in multi
 EOF
 simple_test status multi monitor

diff --git a/ctdb/tests/eventd/eventd_013.sh b/ctdb/tests/eventd/eventd_013.sh
index 14afd0c0c3a57c4ba35109465ae9e31441a56ec0..5bbb4dc00122685ebc08444a94688ac9f494e754 100755 (executable)
--- a/ctdb/tests/eventd/eventd_013.sh
+++ b/ctdb/tests/eventd/eventd_013.sh
@@ -6,7 +6,7 @@ define_test "cancel running monitor event"
 
 setup_eventd
 
-required_result 125 <<EOF
+required_error ECANCELED <<EOF
 Event monitor in multi got cancelled
 EOF
 simple_test_background run 10 multi monitor
@@ -21,7 +21,7 @@ ok <<EOF
 EOF
 simple_test status multi startup
 
-required_result 22 <<EOF
+required_error EINVAL <<EOF
 Event monitor has never run in multi
 EOF
 simple_test status multi monitor

diff --git a/ctdb/tests/eventd/eventd_021.sh b/ctdb/tests/eventd/eventd_021.sh
index c39afa9b1485f3ae7760d71c7c75b7be513a4df9..935373ac45ef7527a5ec897ab2977a30335ac1c3 100755 (executable)
--- a/ctdb/tests/eventd/eventd_021.sh
+++ b/ctdb/tests/eventd/eventd_021.sh
@@ -12,7 +12,7 @@ result_filter ()
        sed -e "s| ${_pid}| PID|"
 }
 
-required_result 62 <<EOF
+required_error ETIMEDOUT <<EOF
 Event timeout in random timed out
 EOF
 simple_test run 5 random timeout

diff --git a/ctdb/tests/eventd/eventd_022.sh b/ctdb/tests/eventd/eventd_022.sh
index dc9455aec186102cad135cbba579e05c6fde4d4a..149aa471e9eafb1ab38dab0ab1b5bad55ea31a75 100755 (executable)
--- a/ctdb/tests/eventd/eventd_022.sh
+++ b/ctdb/tests/eventd/eventd_022.sh
@@ -6,7 +6,7 @@ define_test "status output in debug script"
 
 setup_eventd
 
-required_result 62 <<EOF
+required_error ETIMEDOUT <<EOF
 Event verbosetimeout in random timed out
 EOF
 simple_test run 5 random verbosetimeout

diff --git a/ctdb/tests/eventd/eventd_023.sh b/ctdb/tests/eventd/eventd_023.sh
index 3d86aab42915dd2f63c51ce27ecb6fbdb06095c7..891421864f46e3020dc7a618660078068cfd2e88 100755 (executable)
--- a/ctdb/tests/eventd/eventd_023.sh
+++ b/ctdb/tests/eventd/eventd_023.sh
@@ -6,7 +6,7 @@ define_test "redirected status output in debug script"
 
 setup_eventd
 
-required_result 62 <<EOF
+required_error ETIMEDOUT <<EOF
 Event verbosetimeout2 in random timed out
 EOF
 simple_test run 5 random verbosetimeout2

diff --git a/ctdb/tests/eventd/eventd_024.sh b/ctdb/tests/eventd/eventd_024.sh
index 10016a1e2de9b0b65383f80c0dc5465e091fbe59..db68d01977913845f7d45417596bde8b9bcd67e8 100755 (executable)
--- a/ctdb/tests/eventd/eventd_024.sh
+++ b/ctdb/tests/eventd/eventd_024.sh
@@ -12,7 +12,7 @@ result_filter()
        sed -e "s|${_pid}|PID|"
 }
 
-required_result 62 <<EOF
+required_error ETIMEDOUT <<EOF
 Event timeout in random timed out
 EOF
 simple_test run 5 random timeout

diff --git a/ctdb/tests/eventd/eventd_032.sh b/ctdb/tests/eventd/eventd_032.sh
index e8cb4f89af78dee908b48154dba930556bdaaee9..778acdb272a259b5e475552570885b32ee6d3a7d 100755 (executable)
--- a/ctdb/tests/eventd/eventd_032.sh
+++ b/ctdb/tests/eventd/eventd_032.sh
@@ -6,7 +6,7 @@ define_test "failures with multiple scripts"
 
 setup_eventd
 
-required_result 8 <<EOF
+required_error ENOEXEC <<EOF
 Event event1 in multi failed
 EOF
 simple_test run 10 multi event1
@@ -18,7 +18,7 @@ required_result 1 <<EOF
 EOF
 simple_test status multi event1
 
-required_result 8 <<EOF
+required_error ENOEXEC <<EOF
 Event event2 in multi failed
 EOF
 simple_test run 10 multi event2
@@ -31,7 +31,7 @@ required_result 2 <<EOF
 EOF
 simple_test status multi event2
 
-required_result 8 <<EOF
+required_error ENOEXEC <<EOF
 Event event3 in multi failed
 EOF
 simple_test run 10 multi event3

diff --git a/ctdb/tests/eventd/eventd_033.sh b/ctdb/tests/eventd/eventd_033.sh
index 368bd585b00ce9a0a2ba9404d787ab06b3585951..ba99b1100bcbe70698922176b27b0df1ca91af27 100755 (executable)
--- a/ctdb/tests/eventd/eventd_033.sh
+++ b/ctdb/tests/eventd/eventd_033.sh
@@ -6,35 +6,35 @@ define_test "timeouts with multiple scripts"
 
 setup_eventd
 
-required_result 62 <<EOF
+required_error ETIMEDOUT <<EOF
 Event timeout1 in multi timed out
 EOF
 simple_test run 5 multi timeout1
 
-required_result 62 <<EOF
+required_error ETIMEDOUT <<EOF
 01.test              TIMEDOUT   DATETIME
   OUTPUT: 
 EOF
 simple_test status multi timeout1
 
-required_result 62 <<EOF
+required_error ETIMEDOUT <<EOF
 Event timeout2 in multi timed out
 EOF
 simple_test run 5 multi timeout2
 
-required_result 62 <<EOF
+required_error ETIMEDOUT <<EOF
 01.test              OK         DURATION DATETIME
 02.test              TIMEDOUT   DATETIME
   OUTPUT: 
 EOF
 simple_test status multi timeout2
 
-required_result 62 <<EOF
+required_error ETIMEDOUT <<EOF
 Event timeout3 in multi timed out
 EOF
 simple_test run 5 multi timeout3
 
-required_result 62 <<EOF
+required_error ETIMEDOUT <<EOF
 01.test              OK         DURATION DATETIME
 02.test              OK         DURATION DATETIME
 03.test              TIMEDOUT   DATETIME

diff --git a/ctdb/tests/eventd/eventd_042.sh b/ctdb/tests/eventd/eventd_042.sh
index 7b5373991248d80d28790a941447a094c3fa58d6..862cf6c695329b877c1227c9c7d1f64c5ba5429a 100755 (executable)
--- a/ctdb/tests/eventd/eventd_042.sh
+++ b/ctdb/tests/eventd/eventd_042.sh
@@ -9,7 +9,7 @@ setup_eventd
 ok_null
 simple_test_background run 10 multi monitor
 
-required_result 8 <<EOF
+required_error ENOEXEC <<EOF
 Event failure in random failed
 EOF
 simple_test run 10 random failure

diff --git a/ctdb/tests/eventd/eventd_043.sh b/ctdb/tests/eventd/eventd_043.sh
index acf4775602e41df2eca32cb7e5616e2dee503b00..2304d232bf8be30a89ed0f7ba2c01a412e0200c6 100755 (executable)
--- a/ctdb/tests/eventd/eventd_043.sh
+++ b/ctdb/tests/eventd/eventd_043.sh
@@ -9,7 +9,7 @@ setup_eventd
 ok_null
 simple_test_background run 10 multi monitor
 
-required_result 62 <<EOF
+required_error ETIMEDOUT <<EOF
 Event timeout in random timed out
 EOF
 simple_test run 10 random timeout
@@ -21,7 +21,7 @@ ok <<EOF
 EOF
 simple_test status multi monitor
 
-required_result 62 <<EOF
+required_error ETIMEDOUT <<EOF
 01.disabled          DISABLED  
 02.enabled           TIMEDOUT   DATETIME
   OUTPUT: 

diff --git a/ctdb/tests/eventd/eventd_052.sh b/ctdb/tests/eventd/eventd_052.sh
index 6d99d512f742cd064d9bc442f8aec6635b260485..75f9572ae50a35a16d9000ae8bd794776f10d0dd 100755 (executable)
--- a/ctdb/tests/eventd/eventd_052.sh
+++ b/ctdb/tests/eventd/eventd_052.sh
@@ -8,7 +8,7 @@ setup_eventd
 
 export CTDB_EVENT_RUN_ALL=1
 
-required_result 8 <<EOF
+required_error ENOEXEC <<EOF
 Event event1 in multi failed
 EOF
 simple_test run 10 multi event1
@@ -21,7 +21,7 @@ required_result 1 <<EOF
 EOF
 simple_test status multi event1
 
-required_result 8 <<EOF
+required_error ENOEXEC <<EOF
 Event event2 in multi failed
 EOF
 simple_test run 10 multi event2