ctdb-tools: Simplify "ctdb getpid" output format

No preamble, just the PID.

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

diff --git a/ctdb/tests/simple/06_ctdb_getpid.sh b/ctdb/tests/simple/06_ctdb_getpid.sh
index 30137343140571d89095e613503ec44e806a960f..21a6e552e55c204e04bd4573df5c605a0b901cde 100755 (executable)
--- a/ctdb/tests/simple/06_ctdb_getpid.sh
+++ b/ctdb/tests/simple/06_ctdb_getpid.sh
@@ -59,8 +59,7 @@ echo "Checking each PID for validity"
 
 n=0
 while [ $n -lt $num_nodes ] ; do
-    read line
-    pid=${line#Pid:}
+    read pid
     try_command_on_node $n "ls -l /proc/${pid}/exe | sed -e 's@.*/@@'"
     echo -n "Node ${n}, PID ${pid} looks to be running \"$out\" - "
     if [ "$out" = "ctdbd" ] ; then

diff --git a/ctdb/tools/ctdb.c b/ctdb/tools/ctdb.c
index dd009762b5f26fb64db148fa928d9378e89adf8b..e65cbf8c783cd2cbf80966614eb7f42d8b3ee13d 100644 (file)
--- a/ctdb/tools/ctdb.c
+++ b/ctdb/tools/ctdb.c
@@ -2630,7 +2630,7 @@ static int control_getpid(struct ctdb_context *ctdb, int argc, const char **argv
                DEBUG(DEBUG_ERR, ("Unable to get daemon pid from node %u\n", options.pnn));
                return ret;
        }
-       printf("Pid:%d\n", pid);
+       printf("%u\n", pid);
 
        return 0;
 }