ctdb-tools: Simplify "ctdb getdebug" output format

Print just the debug level as a description, for both human and
machine readable.

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

diff --git a/ctdb/tests/simple/12_ctdb_getdebug.sh b/ctdb/tests/simple/12_ctdb_getdebug.sh
index 39028ac8e3bbcf693e76cea4b0e0449bbad791a6..226184813c0fec65993c6ab62c5963dd7418cf4d 100755 (executable)
--- a/ctdb/tests/simple/12_ctdb_getdebug.sh
+++ b/ctdb/tests/simple/12_ctdb_getdebug.sh
@@ -36,7 +36,7 @@ getdebug_onnode="$out"
 
 sanity_check_output \
     $num_nodes \
-    '^Node [[:digit:]]+ is at debug level [[:alpha:]]+ \([[:digit:]]+\)$' \
+    '^(ERROR|WARNING|NOTICE|INFO|DEBUG)$' \
     "$out"
 
 cmd=""
@@ -62,15 +62,3 @@ while read line ; do
     t=$(echo "$line" | sed -r -e 's@Node [[:digit:]]+ is at debug level ([[:alpha:]]+) \((-?[[:digit:]]+)\)$@\|\1\|\2|@')
     seps="${seps}${seps:+${nl}}|Name|Level|${nl}${t}"
 done <<<"$getdebug_onnode"
-
-cmd="onnode -q all $CTDB -X getdebug"
-echo "Checking that \"$cmd\" produces expected output..."
-
-try_command_on_node 1 "$cmd"
-if [ "$out" = "$seps" ] ; then
-    echo "Yep, looks good!"
-else
-    echo "Nope, it looks like this:"
-    echo "$out"
-    testfailures=1
-fi

diff --git a/ctdb/tests/simple/13_ctdb_setdebug.sh b/ctdb/tests/simple/13_ctdb_setdebug.sh
index ad6f45363827a17b6635e27184b6a3c211431a92..34baf50aa2ef42442b2f93a07a706d7418131d92 100755 (executable)
--- a/ctdb/tests/simple/13_ctdb_setdebug.sh
+++ b/ctdb/tests/simple/13_ctdb_setdebug.sh
@@ -27,10 +27,9 @@ get_debug ()
     local node="$1"
 
     local out
-    
+
     try_command_on_node -v $node "$CTDB getdebug"
-    check_debug=$(echo "$out" |
-       sed -r -e 's@Node [[:digit:]]+ is at debug level ([[:alpha:]]+) \(-?[[:digit:]]+\)$@\1@')
+    check_debug="$out"
 }
 
 set_and_check_debug ()

diff --git a/ctdb/tools/ctdb.c b/ctdb/tools/ctdb.c
index 917b84d533b8d409a868fdf01231bce6415caec9..c61a881a2425e1a3c8a616a25b96fa8790603b9f 100644 (file)
--- a/ctdb/tools/ctdb.c
+++ b/ctdb/tools/ctdb.c
@@ -4184,13 +4184,7 @@ static int control_getdebug(struct ctdb_context *ctdb, int argc, const char **ar
                        /* This should never happen */
                        desc = "Unknown";
                }
-               if (options.machinereadable){
-                       printm(":Name:Level:\n");
-                       printm(":%s:%d:\n", desc, level);
-               } else {
-                       printf("Node %u is at debug level %s (%d)\n",
-                              options.pnn, desc, level);
-               }
+               printf("%s\n", desc);
        }
        return 0;
 }