ctdb-tests: nfs_iterate_test() marks RPC service down

If an RPC service is given, it is automatically marked down.  This
avoids repetition in test cases and loosens coupling.

Signed-off-by: Martin Schwenke <mschwenke@ddn.com>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>

diff --git a/ctdb/tests/UNIT/eventscripts/60.nfs.monitor.106.sh b/ctdb/tests/UNIT/eventscripts/60.nfs.monitor.106.sh
index 43d6b2f03ec87e06bba0b37c602cd805045fe6a0..9cd716baaac18f53cd5b34a0874cc9db6ae7f124 100755 (executable)
--- a/ctdb/tests/UNIT/eventscripts/60.nfs.monitor.106.sh
+++ b/ctdb/tests/UNIT/eventscripts/60.nfs.monitor.106.sh
@@ -6,6 +6,4 @@ define_test "portmapper down, 2 iterations"
 
 setup
 
-rpc_services_down "portmapper"
-
 nfs_iterate_test 2 "portmapper"

diff --git a/ctdb/tests/UNIT/eventscripts/60.nfs.monitor.112.sh b/ctdb/tests/UNIT/eventscripts/60.nfs.monitor.112.sh
index 4000b5d8435ded37dc28039ea6f512f19a63627b..1885c943312155a9671a3180f2bdb80593e27f22 100755 (executable)
--- a/ctdb/tests/UNIT/eventscripts/60.nfs.monitor.112.sh
+++ b/ctdb/tests/UNIT/eventscripts/60.nfs.monitor.112.sh
@@ -8,6 +8,4 @@ define_test "knfsd down, 10 iterations"
 
 setup
 
-rpc_services_down "nfs"
-
 nfs_iterate_test 10 "nfs"

diff --git a/ctdb/tests/UNIT/eventscripts/60.nfs.monitor.113.sh b/ctdb/tests/UNIT/eventscripts/60.nfs.monitor.113.sh
index 744966c94c7fd59b71ff12d53d8a2b309a28f4d5..764ef30826f3a12c5ddd21b0106533f7493cfdac 100755 (executable)
--- a/ctdb/tests/UNIT/eventscripts/60.nfs.monitor.113.sh
+++ b/ctdb/tests/UNIT/eventscripts/60.nfs.monitor.113.sh
@@ -7,8 +7,6 @@ define_test "knfsd down, 10 iterations, no hung threads"
 # knfsd fails and attempts to restart it fail.
 setup
 
-rpc_services_down "nfs"
-
 nfs_setup_fake_threads "nfsd"
 
 nfs_iterate_test 10 "nfs"

diff --git a/ctdb/tests/UNIT/eventscripts/60.nfs.monitor.114.sh b/ctdb/tests/UNIT/eventscripts/60.nfs.monitor.114.sh
index 7170fff64724602d02d472d47f7ef0ed074c0704..aba348742b6e8f43d88d42333c3022b9938dd4d2 100755 (executable)
--- a/ctdb/tests/UNIT/eventscripts/60.nfs.monitor.114.sh
+++ b/ctdb/tests/UNIT/eventscripts/60.nfs.monitor.114.sh
@@ -7,8 +7,6 @@ define_test "knfsd down, 10 iterations, 3 hung threads"
 # knfsd fails and attempts to restart it fail.
 setup
 
-rpc_services_down "nfs"
-
 nfs_setup_fake_threads "nfsd" 1001 1002 1003
 
 nfs_iterate_test 10 "nfs"

diff --git a/ctdb/tests/UNIT/eventscripts/60.nfs.monitor.115.sh b/ctdb/tests/UNIT/eventscripts/60.nfs.monitor.115.sh
index 860436328d434b549af0b099fd86ab70a2cd395f..b51e20d0740202f668992ea5071a465346ebfa62 100755 (executable)
--- a/ctdb/tests/UNIT/eventscripts/60.nfs.monitor.115.sh
+++ b/ctdb/tests/UNIT/eventscripts/60.nfs.monitor.115.sh
@@ -21,6 +21,4 @@ EOF
 # Test flag to indicate that stats are expected to change
 nfs_stats_set_changed "nfs" "status"
 
-rpc_services_down "nfs"
-
 nfs_iterate_test 10 "nfs"

diff --git a/ctdb/tests/UNIT/eventscripts/60.nfs.monitor.116.sh b/ctdb/tests/UNIT/eventscripts/60.nfs.monitor.116.sh
index 1bdd29e73ec62456746afbc77a8c569def6498c0..6865c9eca9800946febcf2adeefa59d7feba6fea 100755 (executable)
--- a/ctdb/tests/UNIT/eventscripts/60.nfs.monitor.116.sh
+++ b/ctdb/tests/UNIT/eventscripts/60.nfs.monitor.116.sh
@@ -21,6 +21,4 @@ EOF
 # Test flag to indicate that stats are expected to change
 nfs_stats_set_changed "status"
 
-rpc_services_down "nfs"
-
 nfs_iterate_test 10 "nfs"

diff --git a/ctdb/tests/UNIT/eventscripts/60.nfs.monitor.121.sh b/ctdb/tests/UNIT/eventscripts/60.nfs.monitor.121.sh
index 1cda2765c386df1d3c7eda20c3c050eb1b73a36d..ab336654a5897cce3e85ab5a123be1c70307a70c 100755 (executable)
--- a/ctdb/tests/UNIT/eventscripts/60.nfs.monitor.121.sh
+++ b/ctdb/tests/UNIT/eventscripts/60.nfs.monitor.121.sh
@@ -10,6 +10,4 @@ define_test "lockd down, 7 iterations"
 
 setup
 
-rpc_services_down "nlockmgr"
-
 nfs_iterate_test 7 "nlockmgr"

diff --git a/ctdb/tests/UNIT/eventscripts/60.nfs.monitor.122.sh b/ctdb/tests/UNIT/eventscripts/60.nfs.monitor.122.sh
index eae7ca0b42af940c9d784ee413b6b77d2b94c9fc..783bafe89b51eebf44bcb4e8875c3cb88df55518 100755 (executable)
--- a/ctdb/tests/UNIT/eventscripts/60.nfs.monitor.122.sh
+++ b/ctdb/tests/UNIT/eventscripts/60.nfs.monitor.122.sh
@@ -9,8 +9,6 @@ define_test "lockd down, 7 iterations, back up after 2"
 
 setup
 
-rpc_services_down "nlockmgr"
-
 # Iteration 2 should try to restart rpc.lockd.  However, our test
 # stub rpc.lockd does nothing, so we have to explicitly flag it as up.
 

diff --git a/ctdb/tests/UNIT/eventscripts/60.nfs.monitor.131.sh b/ctdb/tests/UNIT/eventscripts/60.nfs.monitor.131.sh
index 33e1cf47499866bbe9ee229df0cd8615637b0908..174ae9e06c393461afc67908e3b6008646b5ad6b 100755 (executable)
--- a/ctdb/tests/UNIT/eventscripts/60.nfs.monitor.131.sh
+++ b/ctdb/tests/UNIT/eventscripts/60.nfs.monitor.131.sh
@@ -6,6 +6,4 @@ define_test "rquotad down, 7 iterations"
 
 setup
 
-rpc_services_down "rquotad"
-
 nfs_iterate_test 7 "rquotad"

diff --git a/ctdb/tests/UNIT/eventscripts/60.nfs.monitor.132.sh b/ctdb/tests/UNIT/eventscripts/60.nfs.monitor.132.sh
index 207d872c24fc512f1b1a548db72d3b60ec93ea4d..97af413f6311186c7611108d444625bb1213528d 100755 (executable)
--- a/ctdb/tests/UNIT/eventscripts/60.nfs.monitor.132.sh
+++ b/ctdb/tests/UNIT/eventscripts/60.nfs.monitor.132.sh
@@ -9,7 +9,5 @@ define_test "rquotad down, 7 iterations, back up after 2"
 
 setup
 
-rpc_services_down "rquotad"
-
 nfs_iterate_test 7 "rquotad" \
     3 'rpc_services_up "rquotad"'

diff --git a/ctdb/tests/UNIT/eventscripts/60.nfs.monitor.141.sh b/ctdb/tests/UNIT/eventscripts/60.nfs.monitor.141.sh
index 5a8c5ce75a791d08d35bdebe2d7c76174bd45b0a..a436edbb13842ed2bbfbb553a5d8433506a7c138 100755 (executable)
--- a/ctdb/tests/UNIT/eventscripts/60.nfs.monitor.141.sh
+++ b/ctdb/tests/UNIT/eventscripts/60.nfs.monitor.141.sh
@@ -8,6 +8,4 @@ define_test "statd down, 7 iterations"
 
 setup
 
-rpc_services_down "status"
-
 nfs_iterate_test 7 "status"

diff --git a/ctdb/tests/UNIT/eventscripts/60.nfs.monitor.142.sh b/ctdb/tests/UNIT/eventscripts/60.nfs.monitor.142.sh
index 694bf928b7eead5cae6a3bd2d9a9978098944258..266c52fe73ca78320bb2727a8d6f8f5236fe8206 100755 (executable)
--- a/ctdb/tests/UNIT/eventscripts/60.nfs.monitor.142.sh
+++ b/ctdb/tests/UNIT/eventscripts/60.nfs.monitor.142.sh
@@ -8,7 +8,5 @@ define_test "statd down, 7 iterations, back up after 2"
 
 setup
 
-rpc_services_down "status"
-
 nfs_iterate_test 7 "status" \
     3 'rpc_services_up "status"'

diff --git a/ctdb/tests/UNIT/eventscripts/60.nfs.monitor.143.sh b/ctdb/tests/UNIT/eventscripts/60.nfs.monitor.143.sh
index d17277ea88d6f9de9f703205777f7cf601dfe298..d2e42fcbaeed90237b8bd3290b89a55db083320e 100755 (executable)
--- a/ctdb/tests/UNIT/eventscripts/60.nfs.monitor.143.sh
+++ b/ctdb/tests/UNIT/eventscripts/60.nfs.monitor.143.sh
@@ -8,7 +8,6 @@ define_test "statd down, 2 iterations, stuck process"
 
 setup
 
-rpc_services_down "status"
 nfs_setup_fake_threads "rpc.status" 1001
 
 nfs_iterate_test 2 "status"

diff --git a/ctdb/tests/UNIT/eventscripts/60.nfs.monitor.144.sh b/ctdb/tests/UNIT/eventscripts/60.nfs.monitor.144.sh
index 5a8c5ce75a791d08d35bdebe2d7c76174bd45b0a..a436edbb13842ed2bbfbb553a5d8433506a7c138 100755 (executable)
--- a/ctdb/tests/UNIT/eventscripts/60.nfs.monitor.144.sh
+++ b/ctdb/tests/UNIT/eventscripts/60.nfs.monitor.144.sh
@@ -8,6 +8,4 @@ define_test "statd down, 7 iterations"
 
 setup
 
-rpc_services_down "status"
-
 nfs_iterate_test 7 "status"

diff --git a/ctdb/tests/UNIT/eventscripts/60.nfs.monitor.152.sh b/ctdb/tests/UNIT/eventscripts/60.nfs.monitor.152.sh
index c3a6b8bbf305c004ece025a9ec9e09a987ffaf62..c1db405f051c91f0f06d287bb44c6388671384ef 100755 (executable)
--- a/ctdb/tests/UNIT/eventscripts/60.nfs.monitor.152.sh
+++ b/ctdb/tests/UNIT/eventscripts/60.nfs.monitor.152.sh
@@ -10,6 +10,4 @@ define_test "mountd down, 7 iterations"
 
 setup
 
-rpc_services_down "mountd"
-
 nfs_iterate_test 7 "mountd"

diff --git a/ctdb/tests/UNIT/eventscripts/60.nfs.monitor.153.sh b/ctdb/tests/UNIT/eventscripts/60.nfs.monitor.153.sh
index a09315bcac505c170e5747f917e767a3485ebcf0..f105976702e99bc54e98370dee0a1f28d0964956 100755 (executable)
--- a/ctdb/tests/UNIT/eventscripts/60.nfs.monitor.153.sh
+++ b/ctdb/tests/UNIT/eventscripts/60.nfs.monitor.153.sh
@@ -6,8 +6,6 @@ define_test "mountd down, 7 iterations, back up after 2"
 
 setup
 
-rpc_services_down "mountd"
-
 # Iteration 2 should try to restart rpc.mountd.  However, our test
 # stub rpc.mountd does nothing, so we have to explicitly flag it as
 # up.

diff --git a/ctdb/tests/UNIT/eventscripts/scripts/60.nfs.sh b/ctdb/tests/UNIT/eventscripts/scripts/60.nfs.sh
index 1a8dab73ded271e184cf2fa0784655b66232c863..a09f4b6a1482a0b01217fca7f6d78ea5d2c77871 100644 (file)
--- a/ctdb/tests/UNIT/eventscripts/scripts/60.nfs.sh
+++ b/ctdb/tests/UNIT/eventscripts/scripts/60.nfs.sh
@@ -387,12 +387,14 @@ program_stack_traces()
 #
 # - 2nd argument is the NFS/RPC service being tested
 #
-#   rpcinfo is used on each iteration to test the availability of the
-#   service
+#   This service is marked down before the 1st iteration.
 #
-#   If this is not set or null then no RPC service is checked and the
-#   required output is not reset on each iteration.  This is useful in
-#   baseline tests to confirm that the eventscript and test
+#   rpcinfo is then used on each iteration to test the availability of
+#   the service.
+#
+#   If this is not set or null it is assumed all services are healthy
+#   and no output or non-zero return codes are generated.  This is
+#   useful in baseline tests to confirm that the eventscript and test
 #   infrastructure is working correctly.
 #
 # - Subsequent arguments come in pairs: an iteration number and
@@ -414,6 +416,16 @@ nfs_iterate_test()
                shift
        fi
 
+       if [ -n "$_rpc_service" ]; then
+               debug <<EOF
+--------------------------------------------------
+EOF
+               rpc_services_down "$_rpc_service"
+       fi
+
+       debug <<EOF
+--------------------------------------------------
+EOF
        # shellcheck disable=SC2154
        # Variables defined in define_test()
        echo "Running $_repeats iterations of \"$script $event\" $args"