From: Kefu Chai Date: Fri, 19 May 2017 09:50:02 +0000 (+0800) Subject: qa/workunits/cephtool/test.sh: use jq instead of awk to select the require element X-Git-Tag: ses5-milestone6~8^2~19^2~62 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3c12465f965def815ea304a49820596ffeae9918;p=ceph.git qa/workunits/cephtool/test.sh: use jq instead of awk to select the require element Signed-off-by: Kefu Chai --- diff --git a/qa/workunits/cephtool/test.sh b/qa/workunits/cephtool/test.sh index c91f143fd3ae..aa9d61d5e014 100755 --- a/qa/workunits/cephtool/test.sh +++ b/qa/workunits/cephtool/test.sh @@ -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