ctdb-tests: Use symbolic debug levels in takeover tests

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

diff --git a/ctdb/tests/takeover/lcp2.001.sh b/ctdb/tests/takeover/lcp2.001.sh
index 8772318d6e3ff07e1bfed4ba927cb204ddf9ab8d..ee5b795bbb52edae0d06478752f0e8a204fb3ee1 100755 (executable)
--- a/ctdb/tests/takeover/lcp2.001.sh
+++ b/ctdb/tests/takeover/lcp2.001.sh
@@ -4,7 +4,7 @@
 
 define_test "3 nodes, 3 -> 1 healthy"
 
-export CTDB_TEST_LOGLEVEL=0
+export CTDB_TEST_LOGLEVEL=ERR
 
 required_result <<EOF
 192.168.21.254 2

diff --git a/ctdb/tests/takeover/lcp2.002.sh b/ctdb/tests/takeover/lcp2.002.sh
index f3f6f0a6b1a67ea4d9431c95339babdbe5e05d89..6489388bd8e27bbf0577066aa235df376d6c529d 100755 (executable)
--- a/ctdb/tests/takeover/lcp2.002.sh
+++ b/ctdb/tests/takeover/lcp2.002.sh
@@ -4,7 +4,7 @@
 
 define_test "3 nodes, 3 -> 2 healthy"
 
-export CTDB_TEST_LOGLEVEL=0
+export CTDB_TEST_LOGLEVEL=ERR
 
 required_result <<EOF
 192.168.21.254 2

diff --git a/ctdb/tests/takeover/lcp2.003.sh b/ctdb/tests/takeover/lcp2.003.sh
index f6cfe57b2d9a778e53ca6680745969922766aa71..bdf2699d3143508b6232be916e411b20e33bfbb8 100755 (executable)
--- a/ctdb/tests/takeover/lcp2.003.sh
+++ b/ctdb/tests/takeover/lcp2.003.sh
@@ -4,7 +4,7 @@
 
 define_test "3 nodes, 1 -> all healthy"
 
-export CTDB_TEST_LOGLEVEL=0
+export CTDB_TEST_LOGLEVEL=ERR
 
 required_result <<EOF
 192.168.21.254 2

diff --git a/ctdb/tests/takeover/lcp2.004.sh b/ctdb/tests/takeover/lcp2.004.sh
index e8bfb292b02db9dcc48f75ac4ed50622aaaf9dab..7ce97c3d945497c65166ebcc9ecded60456cfefb 100755 (executable)
--- a/ctdb/tests/takeover/lcp2.004.sh
+++ b/ctdb/tests/takeover/lcp2.004.sh
@@ -4,7 +4,7 @@
 
 define_test "3 nodes, 1 -> all healthy, info logging"
 
-export CTDB_TEST_LOGLEVEL=3
+export CTDB_TEST_LOGLEVEL=INFO
 
 required_result <<EOF
 ${TEST_DATE_STAMP}1 [-121363] -> 192.168.20.253 -> 0 [+0]

diff --git a/ctdb/tests/takeover/lcp2.005.sh b/ctdb/tests/takeover/lcp2.005.sh
index 2ac56523043c08dbf7adad556237635f2a560a35..f579a948474938ff3bfb1145415752c5826bdc48 100755 (executable)
--- a/ctdb/tests/takeover/lcp2.005.sh
+++ b/ctdb/tests/takeover/lcp2.005.sh
@@ -4,7 +4,7 @@
 
 define_test "3 nodes, 1 -> all healthy, debug logging"
 
-export CTDB_TEST_LOGLEVEL=4
+export CTDB_TEST_LOGLEVEL=DEBUG
 
 required_result <<EOF
 ${TEST_DATE_STAMP} ----------------------------------------

diff --git a/ctdb/tests/takeover/lcp2.006.sh b/ctdb/tests/takeover/lcp2.006.sh
index 13bb40fd69caf31aead464c54cacb7b63c81182d..c527992281cb35fbbc55fbfa7f779fc893e584cf 100755 (executable)
--- a/ctdb/tests/takeover/lcp2.006.sh
+++ b/ctdb/tests/takeover/lcp2.006.sh
@@ -4,7 +4,7 @@
 
 define_test "3 nodes, 0 -> 1 healthy"
 
-export CTDB_TEST_LOGLEVEL=0
+export CTDB_TEST_LOGLEVEL=ERR
 
 required_result <<EOF
 192.168.21.254 1

diff --git a/ctdb/tests/takeover/lcp2.007.sh b/ctdb/tests/takeover/lcp2.007.sh
index 76fa06e212a0c44d17712c6f59cb9fa512c3ff93..a5140256d9df194ada4ca90ca25630c2bcbb1aa0 100755 (executable)
--- a/ctdb/tests/takeover/lcp2.007.sh
+++ b/ctdb/tests/takeover/lcp2.007.sh
@@ -4,7 +4,7 @@
 
 define_test "3 nodes, 0 -> 2 healthy"
 
-export CTDB_TEST_LOGLEVEL=0
+export CTDB_TEST_LOGLEVEL=ERR
 
 required_result <<EOF
 192.168.21.254 1

diff --git a/ctdb/tests/takeover/lcp2.008.sh b/ctdb/tests/takeover/lcp2.008.sh
index f5c0af3a7c684ffd7676aee4671534be3df70860..6387223cced7972d4fcaafd3a9f21dae609ea8dc 100755 (executable)
--- a/ctdb/tests/takeover/lcp2.008.sh
+++ b/ctdb/tests/takeover/lcp2.008.sh
@@ -4,7 +4,7 @@
 
 define_test "3 nodes, 0 -> all healthy"
 
-export CTDB_TEST_LOGLEVEL=0
+export CTDB_TEST_LOGLEVEL=ERR
 
 required_result <<EOF
 192.168.21.254 0

diff --git a/ctdb/tests/takeover/lcp2.009.sh b/ctdb/tests/takeover/lcp2.009.sh
index e862c928070a6c1c2ebf561a0dc298b839b0b4fb..1b0c350ca98287de63df6073f2495fa95963fd30 100755 (executable)
--- a/ctdb/tests/takeover/lcp2.009.sh
+++ b/ctdb/tests/takeover/lcp2.009.sh
@@ -4,7 +4,7 @@
 
 define_test "3 nodes, 3 healthy -> all disconnected"
 
-export CTDB_TEST_LOGLEVEL=0
+export CTDB_TEST_LOGLEVEL=ERR
 
 required_result <<EOF
 192.168.21.254 -1

diff --git a/ctdb/tests/takeover/lcp2.010.sh b/ctdb/tests/takeover/lcp2.010.sh
index 20b1c98e65e6fa35072f0ffaf7b60e7aa1e27b29..f7dabdd03e9076841276e994d272b2bb9061b20c 100755 (executable)
--- a/ctdb/tests/takeover/lcp2.010.sh
+++ b/ctdb/tests/takeover/lcp2.010.sh
@@ -11,7 +11,7 @@ define_test "2 disjoint groups of nodes/addresses, a node becomes healthy"
 # group has 6 addresses then the "necessarily" goes away and the
 # smaller group won't be rebalanced.
 
-export CTDB_TEST_LOGLEVEL=0
+export CTDB_TEST_LOGLEVEL=ERR
 
 required_result <<EOF
 192.168.209.102 3

diff --git a/ctdb/tests/takeover/lcp2.011.sh b/ctdb/tests/takeover/lcp2.011.sh
index f752aa345e38ba955a9d05b6d402093c0f04c880..1f10bd16c11fd60f88b8ccc68d230619b9c7a7ab 100755 (executable)
--- a/ctdb/tests/takeover/lcp2.011.sh
+++ b/ctdb/tests/takeover/lcp2.011.sh
@@ -6,7 +6,7 @@ define_test "2 disjoint groups of nodes/addresses, continue a stopped node"
 
 # Another LCP2 1.0 bug
 
-export CTDB_TEST_LOGLEVEL=0
+export CTDB_TEST_LOGLEVEL=ERR
 
 required_result <<EOF
 10.11.19.46 3

diff --git a/ctdb/tests/takeover/lcp2.012.sh b/ctdb/tests/takeover/lcp2.012.sh
index 8f5c537e967bc87aca62e7b4b02472795c9ad1bb..6f95f0bef02b4f58769eedb97144f3a4b113fb9d 100755 (executable)
--- a/ctdb/tests/takeover/lcp2.012.sh
+++ b/ctdb/tests/takeover/lcp2.012.sh
@@ -4,7 +4,7 @@
 
 define_test "Node with NODE_FLAGS_NOIPTAKEOVER doesn't gain IPs"
 
-export CTDB_TEST_LOGLEVEL=0
+export CTDB_TEST_LOGLEVEL=ERR
 
 required_result <<EOF
 192.168.21.254 1

diff --git a/ctdb/tests/takeover/lcp2.013.sh b/ctdb/tests/takeover/lcp2.013.sh
index fb9d724e35f08b6297b917b94287cb135ef18d9f..bc2116aff6b6e7b519f2d7667ef26676f698a94a 100755 (executable)
--- a/ctdb/tests/takeover/lcp2.013.sh
+++ b/ctdb/tests/takeover/lcp2.013.sh
@@ -4,7 +4,7 @@
 
 define_test "Node with NODE_FLAGS_NOIPTAKEOVER doesn't lose IPs"
 
-export CTDB_TEST_LOGLEVEL=0
+export CTDB_TEST_LOGLEVEL=ERR
 
 required_result <<EOF
 192.168.21.254 2

diff --git a/ctdb/tests/takeover/lcp2.014.sh b/ctdb/tests/takeover/lcp2.014.sh
index 36eda9284b4b413ce78964e1095a83e94a2a488a..0fc7c00fdb021b6d6f4c5d13367e970cedb1256b 100755 (executable)
--- a/ctdb/tests/takeover/lcp2.014.sh
+++ b/ctdb/tests/takeover/lcp2.014.sh
@@ -4,7 +4,7 @@
 
 define_test "3 nodes, no IPs assigned, all unhealthy"
 
-export CTDB_TEST_LOGLEVEL=0
+export CTDB_TEST_LOGLEVEL=ERR
 
 required_result <<EOF
 192.168.21.254 0

diff --git a/ctdb/tests/takeover/lcp2.015.sh b/ctdb/tests/takeover/lcp2.015.sh
index a2569e05b23ae3130a73b3907455d65261b83165..b8f8172cf377b9ec8ca9f9e309e7acada3f48f5f 100755 (executable)
--- a/ctdb/tests/takeover/lcp2.015.sh
+++ b/ctdb/tests/takeover/lcp2.015.sh
@@ -4,7 +4,7 @@
 
 define_test "3 nodes, all IPs assigned, all unhealthy"
 
-export CTDB_TEST_LOGLEVEL=0
+export CTDB_TEST_LOGLEVEL=ERR
 
 required_result <<EOF
 192.168.21.254 2

diff --git a/ctdb/tests/takeover/lcp2.016.sh b/ctdb/tests/takeover/lcp2.016.sh
index 2e2df1b9d0ed8ca889c29fe140be6c9b324e5682..a4e369253fa7e64b3db7d918b94665f9d682731d 100755 (executable)
--- a/ctdb/tests/takeover/lcp2.016.sh
+++ b/ctdb/tests/takeover/lcp2.016.sh
@@ -4,7 +4,7 @@
 
 define_test "3 nodes, all IPs assigned, 2->3 unhealthy"
 
-export CTDB_TEST_LOGLEVEL=0
+export CTDB_TEST_LOGLEVEL=ERR
 
 required_result <<EOF
 192.168.21.254 1

diff --git a/ctdb/tests/takeover/lcp2.017.sh b/ctdb/tests/takeover/lcp2.017.sh
index 07b22fb9f99e9854ca620b22070d682c85075b48..2490d649d686edcb4195dafe13e00d268c00365e 100755 (executable)
--- a/ctdb/tests/takeover/lcp2.017.sh
+++ b/ctdb/tests/takeover/lcp2.017.sh
@@ -4,7 +4,7 @@
 
 define_test "3 nodes, no IPs assigned, all unhealthy, NoIPHostOnAllDisabled"
 
-export CTDB_TEST_LOGLEVEL=0
+export CTDB_TEST_LOGLEVEL=ERR
 export CTDB_SET_NoIPHostOnAllDisabled=1
 
 required_result <<EOF

diff --git a/ctdb/tests/takeover/lcp2.018.sh b/ctdb/tests/takeover/lcp2.018.sh
index 4a797f78c62e1d5a179e9aacea56dc5519db00db..f6fc4ceaa385176fac3c60a9acaf4e4661ec9ca6 100755 (executable)
--- a/ctdb/tests/takeover/lcp2.018.sh
+++ b/ctdb/tests/takeover/lcp2.018.sh
@@ -4,7 +4,7 @@
 
 define_test "3 nodes, all IPs assigned, all unhealthy, NoIPHostOnAllDisabled"
 
-export CTDB_TEST_LOGLEVEL=0
+export CTDB_TEST_LOGLEVEL=ERR
 export CTDB_SET_NoIPHostOnAllDisabled=1
 
 required_result <<EOF

diff --git a/ctdb/tests/takeover/lcp2.019.sh b/ctdb/tests/takeover/lcp2.019.sh
index 0d8937cdc54e4805e0b7a20e1ffaf50dc6c4bf79..6309bd5bd9f46048e6f29b590589a23b61aa2033 100755 (executable)
--- a/ctdb/tests/takeover/lcp2.019.sh
+++ b/ctdb/tests/takeover/lcp2.019.sh
@@ -4,7 +4,7 @@
 
 define_test "3 nodes, all IPs assigned, 2->3 unhealthy, NoIPHostOnAllDisabled"
 
-export CTDB_TEST_LOGLEVEL=0
+export CTDB_TEST_LOGLEVEL=ERR
 export CTDB_SET_NoIPHostOnAllDisabled=1
 
 required_result <<EOF

diff --git a/ctdb/tests/takeover/lcp2.020.sh b/ctdb/tests/takeover/lcp2.020.sh
index e3fe3c4e405761f80c4253f45b05f3aba34ce3bf..a8897e05a2a12bc43068bb243f1ac824ae9618df 100755 (executable)
--- a/ctdb/tests/takeover/lcp2.020.sh
+++ b/ctdb/tests/takeover/lcp2.020.sh
@@ -4,7 +4,7 @@
 
 define_test "3 nodes, all IPs assigned, 2->3 unhealthy, NoIPHostOnAllDisabled on 2"
 
-export CTDB_TEST_LOGLEVEL=0
+export CTDB_TEST_LOGLEVEL=ERR
 
 required_result <<EOF
 192.168.21.254 2

diff --git a/ctdb/tests/takeover/lcp2.021.sh b/ctdb/tests/takeover/lcp2.021.sh
index 7dcddb14ee8595d286203288b852cde9d0457a62..4d185f2477b5c076ed37151c372b07d7026ecb4f 100755 (executable)
--- a/ctdb/tests/takeover/lcp2.021.sh
+++ b/ctdb/tests/takeover/lcp2.021.sh
@@ -4,7 +4,7 @@
 
 define_test "3 nodes, no IPs assigned, 3->2 unhealthy, NoIPHostOnAllDisabled on 2 others"
 
-export CTDB_TEST_LOGLEVEL=0
+export CTDB_TEST_LOGLEVEL=ERR
 
 required_result <<EOF
 192.168.21.254 0

diff --git a/ctdb/tests/takeover/lcp2.022.sh b/ctdb/tests/takeover/lcp2.022.sh
index 01aa13aa27a6cddf679af4104948a5c88cf85f18..77089b03cebb1e50f208d6565b7874143a088947 100755 (executable)
--- a/ctdb/tests/takeover/lcp2.022.sh
+++ b/ctdb/tests/takeover/lcp2.022.sh
@@ -4,7 +4,7 @@
 
 define_test "3 nodes, 2->3 unhealthy, all IPs assigned, split NoIPTakeover"
 
-export CTDB_TEST_LOGLEVEL=0
+export CTDB_TEST_LOGLEVEL=ERR
 
 # We expect 1/2 the IPs to move, but the rest to stay (as opposed to
 # NoIPHostOnAllDisabled)

diff --git a/ctdb/tests/takeover/lcp2.023.sh b/ctdb/tests/takeover/lcp2.023.sh
index c29546e849ba1c9423048247662c62203a41fa06..0935083f1dab7324e0537ceacf05f502e387a972 100755 (executable)
--- a/ctdb/tests/takeover/lcp2.023.sh
+++ b/ctdb/tests/takeover/lcp2.023.sh
@@ -4,7 +4,7 @@
 
 define_test "3 nodes, all IPs assigned, 1->3 unhealthy"
 
-export CTDB_TEST_LOGLEVEL=4
+export CTDB_TEST_LOGLEVEL=DEBUG
 
 required_result <<EOF
 ${TEST_DATE_STAMP} ----------------------------------------

diff --git a/ctdb/tests/takeover/lcp2.024.sh b/ctdb/tests/takeover/lcp2.024.sh
index f76bc83df4123971e9181ce1facdb2c8d7387da8..d297084adb463b4577edd68d536550db5515b025 100755 (executable)
--- a/ctdb/tests/takeover/lcp2.024.sh
+++ b/ctdb/tests/takeover/lcp2.024.sh
@@ -4,7 +4,7 @@
 
 define_test "3 nodes, no IPs assigned, all healthy, all in STARTUP runstate"
 
-export CTDB_TEST_LOGLEVEL=2
+export CTDB_TEST_LOGLEVEL=NOTICE
 
 required_result <<EOF
 ${TEST_DATE_STAMP}Failed to find node to cover ip 192.168.21.254

diff --git a/ctdb/tests/takeover/lcp2.025.sh b/ctdb/tests/takeover/lcp2.025.sh
index 44b8583edc0ac7e4945db10ca14ad56c5528b40d..f52282eef2e5352bfb38fdfcd52cdd99db1b81a8 100755 (executable)
--- a/ctdb/tests/takeover/lcp2.025.sh
+++ b/ctdb/tests/takeover/lcp2.025.sh
@@ -4,7 +4,7 @@
 
 define_test "3 nodes, no IPs assigned, all healthy, 1 in STARTUP runstate"
 
-export CTDB_TEST_LOGLEVEL=2
+export CTDB_TEST_LOGLEVEL=NOTICE
 
 required_result <<EOF
 192.168.21.254 1

diff --git a/ctdb/tests/takeover/lcp2.026.sh b/ctdb/tests/takeover/lcp2.026.sh
index 4c22ba56074f52deef522bad635657503a3ebd77..a6e7a94ebb2d9c435be98cee26d02f4148f6e535 100755 (executable)
--- a/ctdb/tests/takeover/lcp2.026.sh
+++ b/ctdb/tests/takeover/lcp2.026.sh
@@ -4,7 +4,7 @@
 
 define_test "3 nodes, no IPs assigned, all unhealthy, 1 in STARTUP runstate"
 
-export CTDB_TEST_LOGLEVEL=2
+export CTDB_TEST_LOGLEVEL=NOTICE
 
 required_result <<EOF
 192.168.21.254 1

diff --git a/ctdb/tests/takeover/lcp2.027.sh b/ctdb/tests/takeover/lcp2.027.sh
index 20e0f28f950495252e48296d324e86a1bcb8c304..f572b47f6200146b33a06bc31e02308e2617c505 100755 (executable)
--- a/ctdb/tests/takeover/lcp2.027.sh
+++ b/ctdb/tests/takeover/lcp2.027.sh
@@ -4,7 +4,7 @@
 
 define_test "4 nodes, all IPs assigned, 3->4 unhealthy"
 
-export CTDB_TEST_LOGLEVEL=0
+export CTDB_TEST_LOGLEVEL=ERR
 
 required_result <<EOF
 130.216.30.181 0

diff --git a/ctdb/tests/takeover/lcp2.028.sh b/ctdb/tests/takeover/lcp2.028.sh
index 60d22d9417497aa3f38778868cab5b413ca8ddfc..b0a8ef51c3b460fbd465702aa3dcff4dc836a17d 100755 (executable)
--- a/ctdb/tests/takeover/lcp2.028.sh
+++ b/ctdb/tests/takeover/lcp2.028.sh
@@ -4,7 +4,7 @@
 
 define_test "4 nodes, all healthy/assigned, stays unbalanced"
 
-export CTDB_TEST_LOGLEVEL=3
+export CTDB_TEST_LOGLEVEL=INFO
 
 required_result <<EOF
 130.216.30.181 0

diff --git a/ctdb/tests/takeover/lcp2.029.sh b/ctdb/tests/takeover/lcp2.029.sh
index fe4d246527957a0619b680173469c911c880f1d0..535496301329fcf721ced9fb86305c0a8991bb5f 100755 (executable)
--- a/ctdb/tests/takeover/lcp2.029.sh
+++ b/ctdb/tests/takeover/lcp2.029.sh
@@ -4,7 +4,7 @@
 
 define_test "4 nodes, some IPs unassigned on target nodes"
 
-export CTDB_TEST_LOGLEVEL=3
+export CTDB_TEST_LOGLEVEL=INFO
 
 required_result <<EOF
 ${TEST_DATE_STAMP} 10.19.99.251 -> 2 [+9216]

diff --git a/ctdb/tests/takeover/lcp2.030.sh b/ctdb/tests/takeover/lcp2.030.sh
index 739757b0b175bcbc880e233fa64c4b5608bf48ef..87a7f580110ea4b2b4aee4a3225ab3b78230e4e2 100755 (executable)
--- a/ctdb/tests/takeover/lcp2.030.sh
+++ b/ctdb/tests/takeover/lcp2.030.sh
@@ -4,7 +4,7 @@
 
 define_test "900 IPs, 5 nodes, 0 -> 5 healthy"
 
-export CTDB_TEST_LOGLEVEL=0
+export CTDB_TEST_LOGLEVEL=ERR
 
 required_result <<EOF
 192.168.10.90 0

diff --git a/ctdb/tests/takeover/lcp2.031.sh b/ctdb/tests/takeover/lcp2.031.sh
index be10866f53123a1a91d82afc405095b9106d3c8a..3a2cb79b2784e56823a4a890008e54bd06cf41bb 100755 (executable)
--- a/ctdb/tests/takeover/lcp2.031.sh
+++ b/ctdb/tests/takeover/lcp2.031.sh
@@ -4,7 +4,7 @@
 
 define_test "12+4 IPs, 4 nodes, 3 -> 4 healthy"
 
-export CTDB_TEST_LOGLEVEL=4
+export CTDB_TEST_LOGLEVEL=DEBUG
 
 required_result <<EOF
 ${TEST_DATE_STAMP} ----------------------------------------

diff --git a/ctdb/tests/takeover/lcp2.032.sh b/ctdb/tests/takeover/lcp2.032.sh
index e9df6eb95e68c62e3e0b7aa68574f1c17e799fec..fa032f48557fac361468a443776a281bf18945ca 100755 (executable)
--- a/ctdb/tests/takeover/lcp2.032.sh
+++ b/ctdb/tests/takeover/lcp2.032.sh
@@ -4,7 +4,7 @@
 
 define_test "12+4 IPs, 4 nodes, multiple transitions"
 
-export CTDB_TEST_LOGLEVEL=0
+export CTDB_TEST_LOGLEVEL=ERR
 
 set -e
 

diff --git a/ctdb/tests/takeover/lcp2.033.sh b/ctdb/tests/takeover/lcp2.033.sh
index a4f6e5f247a04ddfc9d74c62b6ac183758b3a5e1..206699a52acd81d17f873c67a97d6979e4dab9a5 100755 (executable)
--- a/ctdb/tests/takeover/lcp2.033.sh
+++ b/ctdb/tests/takeover/lcp2.033.sh
@@ -4,7 +4,7 @@
 
 define_test "12+4 IPs, 4 nodes, 2 -> 3 -> 4 healthy"
 
-export CTDB_TEST_LOGLEVEL=0
+export CTDB_TEST_LOGLEVEL=ERR
 
 set -e