From 79fd227639e87b5d1195ee14c042ece9528c5022 Mon Sep 17 00:00:00 2001 From: Igor Fedotov Date: Sat, 20 Oct 2018 01:07:50 +0300 Subject: [PATCH] qa: replace raw_bytes_used field access in QA test cases Signed-off-by: Igor Fedotov --- qa/standalone/ceph-helpers.sh | 8 ++++---- qa/workunits/cephtool/test.sh | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/qa/standalone/ceph-helpers.sh b/qa/standalone/ceph-helpers.sh index c0f808ca3d6..9cbd78c11a1 100755 --- a/qa/standalone/ceph-helpers.sh +++ b/qa/standalone/ceph-helpers.sh @@ -1933,10 +1933,10 @@ function test_flush_pg_stats() rados -p rbd put obj /etc/group flush_pg_stats || return 1 local jq_filter='.pools | .[] | select(.name == "rbd") | .stats' - raw_bytes_used=`ceph df detail --format=json | jq "$jq_filter.raw_bytes_used"` - bytes_used=`ceph df detail --format=json | jq "$jq_filter.bytes_used"` - test $raw_bytes_used -gt 0 || return 1 - test $raw_bytes_used == $bytes_used || return 1 + stored=`ceph df detail --format=json | jq "$jq_filter.stored"` + stored_raw=`ceph df detail --format=json | jq "$jq_filter.stored_raw"` + test $stored -gt 0 || return 1 + test $stored == $stored_raw || return 1 teardown $dir } diff --git a/qa/workunits/cephtool/test.sh b/qa/workunits/cephtool/test.sh index a75f98740ca..ee311e473eb 100755 --- a/qa/workunits/cephtool/test.sh +++ b/qa/workunits/cephtool/test.sh @@ -2400,13 +2400,13 @@ function test_mon_cephdf_commands() # to sync mon with osd flush_pg_stats 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"` + stored=`ceph df detail --format=json | jq "$jq_filter.stored * 2"` + stored_raw=`ceph df detail --format=json | jq "$jq_filter.stored_raw"` ceph osd pool delete cephdf_for_test cephdf_for_test --yes-i-really-really-mean-it rm ./cephdf_for_test - expect_false test $cal_raw_used_size != $raw_used_size + expect_false test $stored != $stored_raw } function test_mon_pool_application() -- 2.39.5