]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
qa/workunits/cephtool/test.sh: use jq instead of awk to select the require element
authorKefu Chai <kchai@redhat.com>
Fri, 19 May 2017 09:50:02 +0000 (17:50 +0800)
committerSage Weil <sage@redhat.com>
Fri, 2 Jun 2017 17:02:46 +0000 (13:02 -0400)
Signed-off-by: Kefu Chai <kchai@redhat.com>
qa/workunits/cephtool/test.sh

index c91f143fd3ae0981b89393201db065b9ccea6788..aa9d61d5e014d83c1f34d1a15435eb68d2f947d3 100755 (executable)
@@ -2066,8 +2066,9 @@ function test_mon_cephdf_commands()
   # "rados ls" goes straight to osd, but "ceph df" is served by mon. so we need
   # to sync mon with osd
   flush_pg_stats
-  cal_raw_used_size=`ceph df detail | grep cephdf_for_test | awk -F ' ' '{printf "%d\n", 2 * $3}'`
-  raw_used_size=`ceph df detail | grep cephdf_for_test | awk -F ' '  '{print $10}'`
+  local jq_filter='.pools | .[] | select(.name == "cephdf_for_test") | .stats'
+  cal_raw_used_size=`ceph df detail --format=json | jq "$jq_filter.raw_bytes_used"`
+  raw_used_size=`ceph df detail --format=json | jq "$jq_filter.bytes_used * 2"`
 
   ceph osd pool delete cephdf_for_test cephdf_for_test --yes-i-really-really-mean-it
   rm ./cephdf_for_test