ctdb-tests: Drop ctdb tool debug level to NOTICE

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

diff --git a/ctdb/tests/tool/ctdb.reloadnodes.001.sh b/ctdb/tests/tool/ctdb.reloadnodes.001.sh
index 24cd94af76cf63ace66a4fd36a6632360ee66ed3..68d6cfb5b3b192676f8e1184a2ced1c29cb8cff5 100755 (executable)
--- a/ctdb/tests/tool/ctdb.reloadnodes.001.sh
+++ b/ctdb/tests/tool/ctdb.reloadnodes.001.sh
@@ -18,9 +18,6 @@ NODEMAP
 EOF
 
 ok <<EOF
-Node 0 is unchanged
-Node 1 is unchanged
-Node 2 is unchanged
 No change in nodes file, skipping unnecessary reload
 EOF
 

diff --git a/ctdb/tests/tool/ctdb.reloadnodes.011.sh b/ctdb/tests/tool/ctdb.reloadnodes.011.sh
index 41a5566af9146ec01254e7945f53f4af6ac5726f..261962e97e28b2e8f358e9cb08afb2921808c22f 100755 (executable)
--- a/ctdb/tests/tool/ctdb.reloadnodes.011.sh
+++ b/ctdb/tests/tool/ctdb.reloadnodes.011.sh
@@ -19,13 +19,7 @@ NODEMAP
 EOF
 
 required_result 0 <<EOF
-Node 0 is unchanged
-Node 1 is unchanged
-Node 2 is unchanged
 Node 3 is NEW
-Reloading nodes file on node 0
-Reloading nodes file on node 1
-Reloading nodes file on node 2
 EOF
 
 simple_test

diff --git a/ctdb/tests/tool/ctdb.reloadnodes.012.sh b/ctdb/tests/tool/ctdb.reloadnodes.012.sh
index 4ebb6aed740ecf2bed4d18aa8e4933b0eccbe9c8..c3ca0fe39113eea53d978cd57487a635620c0f93 100755 (executable)
--- a/ctdb/tests/tool/ctdb.reloadnodes.012.sh
+++ b/ctdb/tests/tool/ctdb.reloadnodes.012.sh
@@ -18,11 +18,7 @@ NODEMAP
 EOF
 
 required_result 0 <<EOF
-Node 0 is unchanged
-Node 1 is unchanged
 Node 2 is DELETED
-Reloading nodes file on node 0
-Reloading nodes file on node 1
 EOF
 
 simple_test

diff --git a/ctdb/tests/tool/ctdb.reloadnodes.013.sh b/ctdb/tests/tool/ctdb.reloadnodes.013.sh
index 4156839a00bee98984d4529d5a5058bd173351ee..1402b9dcb6d297ae6c9f317673dc05ce0f1bc966 100755 (executable)
--- a/ctdb/tests/tool/ctdb.reloadnodes.013.sh
+++ b/ctdb/tests/tool/ctdb.reloadnodes.013.sh
@@ -18,8 +18,6 @@ NODEMAP
 EOF
 
 required_result 1 <<EOF
-Node 0 is unchanged
-Node 1 is unchanged
 Node 2 is DELETED
 ERROR: Node 2 is still connected
 ERROR: Nodes will not be reloaded due to previous error

diff --git a/ctdb/tests/tool/ctdb.reloadnodes.014.sh b/ctdb/tests/tool/ctdb.reloadnodes.014.sh
index 1a005a164bcc0a632d4aa7e7083378c694a06968..30e51485b6f1159807cfd062b1d51eb2ffd746db 100755 (executable)
--- a/ctdb/tests/tool/ctdb.reloadnodes.014.sh
+++ b/ctdb/tests/tool/ctdb.reloadnodes.014.sh
@@ -19,10 +19,6 @@ EOF
 
 required_result 0 <<EOF
 Node 0 is DELETED
-Node 1 is unchanged
-Node 2 is unchanged
-Reloading nodes file on node 1
-Reloading nodes file on node 2
 EOF
 
 simple_test

diff --git a/ctdb/tests/tool/ctdb.reloadnodes.015.sh b/ctdb/tests/tool/ctdb.reloadnodes.015.sh
index 14c3c314668277a465a256c7ae2c04c5b4e96988..5fad9ded59034ec9f0f4419f198d74b68ca0a600 100755 (executable)
--- a/ctdb/tests/tool/ctdb.reloadnodes.015.sh
+++ b/ctdb/tests/tool/ctdb.reloadnodes.015.sh
@@ -20,8 +20,6 @@ EOF
 required_result 1 <<EOF
 Node 0 is DELETED
 ERROR: Node 0 is still connected
-Node 1 is unchanged
-Node 2 is unchanged
 ERROR: Nodes will not be reloaded due to previous error
 EOF
 

diff --git a/ctdb/tests/tool/ctdb.reloadnodes.016.sh b/ctdb/tests/tool/ctdb.reloadnodes.016.sh
index a239a7cf1519b4bfd53099012351e9d06112c7e9..d444a46c85f0aa27ff819e4a98403dbb460b9c3d 100755 (executable)
--- a/ctdb/tests/tool/ctdb.reloadnodes.016.sh
+++ b/ctdb/tests/tool/ctdb.reloadnodes.016.sh
@@ -18,11 +18,7 @@ NODEMAP
 EOF
 
 required_result 0 <<EOF
-Node 0 is unchanged
 Node 1 is DELETED
-Node 2 is unchanged
-Reloading nodes file on node 0
-Reloading nodes file on node 2
 EOF
 
 simple_test

diff --git a/ctdb/tests/tool/ctdb.reloadnodes.017.sh b/ctdb/tests/tool/ctdb.reloadnodes.017.sh
index e5f203013577b16c69359797479f3d19c1390130..b9a969410f67ebbe3ffbe38e5f31892c126a87a7 100755 (executable)
--- a/ctdb/tests/tool/ctdb.reloadnodes.017.sh
+++ b/ctdb/tests/tool/ctdb.reloadnodes.017.sh
@@ -18,10 +18,8 @@ NODEMAP
 EOF
 
 required_result 1 <<EOF
-Node 0 is unchanged
 Node 1 is DELETED
 ERROR: Node 1 is still connected
-Node 2 is unchanged
 ERROR: Nodes will not be reloaded due to previous error
 EOF
 

diff --git a/ctdb/tests/tool/ctdb.reloadnodes.018.sh b/ctdb/tests/tool/ctdb.reloadnodes.018.sh
index 5f994d1fb3a91f585b4e166904ee28eee5e5417e..30be59615525e33e6c8fff0b206a7c217a727cdc 100755 (executable)
--- a/ctdb/tests/tool/ctdb.reloadnodes.018.sh
+++ b/ctdb/tests/tool/ctdb.reloadnodes.018.sh
@@ -21,15 +21,9 @@ NODEMAP
 EOF
 
 required_result 0 <<EOF
-Node 0 is unchanged
-Node 1 is unchanged
-Node 2 is unchanged
 Node 3 is NEW
 Node 4 is NEW
 Node 5 is NEW
-Reloading nodes file on node 0
-Reloading nodes file on node 1
-Reloading nodes file on node 2
 EOF
 
 simple_test

diff --git a/ctdb/tests/tool/ctdb.reloadnodes.019.sh b/ctdb/tests/tool/ctdb.reloadnodes.019.sh
index c40ae52fad044e312a69d847ae23a8224f30edbe..5069485b81156529f479d7c5f4ff888fc6752b69 100755 (executable)
--- a/ctdb/tests/tool/ctdb.reloadnodes.019.sh
+++ b/ctdb/tests/tool/ctdb.reloadnodes.019.sh
@@ -20,13 +20,9 @@ NODEMAP
 EOF
 
 required_result 0 <<EOF
-Node 0 is unchanged
 Node 1 is DELETED
-Node 2 is unchanged
 Node 3 is NEW
 Node 4 is NEW
-Reloading nodes file on node 0
-Reloading nodes file on node 2
 EOF
 
 simple_test

diff --git a/ctdb/tests/tool/ctdb.reloadnodes.020.sh b/ctdb/tests/tool/ctdb.reloadnodes.020.sh
index da197a5ad5243b061d43e42c560f2061fefde192..66384c935bb89a159bd1d41c1c54bae6c36041a8 100755 (executable)
--- a/ctdb/tests/tool/ctdb.reloadnodes.020.sh
+++ b/ctdb/tests/tool/ctdb.reloadnodes.020.sh
@@ -20,13 +20,9 @@ NODEMAP
 EOF
 
 required_result 0 <<EOF
-Node 0 is unchanged
-Node 1 is unchanged
 Node 2 is DELETED
 Node 3 is NEW
 Node 4 is NEW
-Reloading nodes file on node 0
-Reloading nodes file on node 1
 EOF
 
 simple_test

diff --git a/ctdb/tests/tool/ctdb.reloadnodes.021.sh b/ctdb/tests/tool/ctdb.reloadnodes.021.sh
index 8ec51e85b5a84b2e9da2d5c2642ecae240b6b864..0f5f0d58d46536ac51760105f8d48d569bd7baa2 100755 (executable)
--- a/ctdb/tests/tool/ctdb.reloadnodes.021.sh
+++ b/ctdb/tests/tool/ctdb.reloadnodes.021.sh
@@ -19,13 +19,8 @@ NODEMAP
 EOF
 
 required_result 0 <<EOF
-Node 0 is unchanged
-Node 1 is unchanged
 WARNING: Node 1 is disconnected. You MUST fix this node manually!
-Node 2 is unchanged
 Node 3 is NEW
-Reloading nodes file on node 0
-Reloading nodes file on node 2
 EOF
 
 simple_test

diff --git a/ctdb/tests/tool/ctdb.reloadnodes.023.sh b/ctdb/tests/tool/ctdb.reloadnodes.023.sh
index 931ba38c794c66453ca4ce48ee37fb8cdac21b90..b3823d30be4c66625a81bbc4db61989c73c75574 100755 (executable)
--- a/ctdb/tests/tool/ctdb.reloadnodes.023.sh
+++ b/ctdb/tests/tool/ctdb.reloadnodes.023.sh
@@ -18,11 +18,7 @@ NODEMAP
 EOF
 
 ok <<EOF
-Node 0 is unchanged
 Node 1 is UNDELETED
-Node 2 is unchanged
-Reloading nodes file on node 0
-Reloading nodes file on node 2
 EOF
 
 simple_test

diff --git a/ctdb/tests/tool/ctdb.reloadnodes.024.sh b/ctdb/tests/tool/ctdb.reloadnodes.024.sh
index cf6cd9bbc861b9eca162385f5289ff9c12db377a..9aa0d4255e692d92b51b11af7af66e031794151b 100755 (executable)
--- a/ctdb/tests/tool/ctdb.reloadnodes.024.sh
+++ b/ctdb/tests/tool/ctdb.reloadnodes.024.sh
@@ -18,9 +18,6 @@ NODEMAP
 EOF
 
 ok <<EOF
-Node 0 is unchanged
-Node 1 is unchanged (DELETED)
-Node 2 is unchanged
 No change in nodes file, skipping unnecessary reload
 EOF
 

diff --git a/ctdb/tests/tool/scripts/local.sh b/ctdb/tests/tool/scripts/local.sh
index 1c88d8121309e7b6064ba0049c7bc68b13385785..1230b1121b91e756f3a1a4030083ccf7ac36c031 100644 (file)
--- a/ctdb/tests/tool/scripts/local.sh
+++ b/ctdb/tests/tool/scripts/local.sh
@@ -20,7 +20,7 @@ define_test ()
            _cmd="${_f#ctdb.}"
            _cmd="${_cmd%.*}" # Strip test number
            export CTDB="$VALGRIND ctdb --socket $ctdbd_socket"
-           export CTDB_DEBUGLEVEL=3
+           export CTDB_DEBUGLEVEL=2
            test_args="$_cmd"
            ;;
        *)