From 595c1e5650e4c2390806bbd8cdfb97b1b72951b0 Mon Sep 17 00:00:00 2001 From: Mykola Golub Date: Tue, 10 Nov 2015 09:22:09 +0200 Subject: [PATCH] tests: rbd/admin_socket: use xmlstarlet when parsing perf dump Signed-off-by: Mykola Golub --- qa/workunits/rbd/test_admin_socket.sh | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/qa/workunits/rbd/test_admin_socket.sh b/qa/workunits/rbd/test_admin_socket.sh index aefb9e2c093e..7a0fc5f8c85a 100755 --- a/qa/workunits/rbd/test_admin_socket.sh +++ b/qa/workunits/rbd/test_admin_socket.sh @@ -36,9 +36,15 @@ function rbd_get_perfcounter() { local image=$1 local counter=$2 + local name - ceph --admin-daemon $(rbd_watch_asok ${image}) perf dump | - sed -ne 's/^.*"'${counter}'": \([0-9]*\).*$/\1/p' + name=$(ceph --format xml --admin-daemon $(rbd_watch_asok ${image}) \ + perf schema | $XMLSTARLET el -d3 | + grep "/librbd-.*-${image}/${counter}\$") + test -n "${name}" || return 1 + + ceph --format xml --admin-daemon $(rbd_watch_asok ${image}) perf dump | + $XMLSTARLET sel -t -m "${name}" -v . } function rbd_check_perfcounter() -- 2.47.3