From: Mykola Golub <mgolub@mirantis.com>
Date: Tue, 10 Nov 2015 07:22:09 +0000 (+0200)
Subject: tests: rbd/admin_socket: use xmlstarlet when parsing perf dump
X-Git-Tag: v10.0.1~99^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F6516%2Fhead;p=ceph.git

tests: rbd/admin_socket: use xmlstarlet when parsing perf dump

Signed-off-by: Mykola Golub <mgolub@mirantis.com>
---

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()