]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
qa/standalone/mon/osd-pool-df.sh: fix test to check for the right values
authorNeha Ojha <nojha@redhat.com>
Thu, 9 Apr 2020 01:06:57 +0000 (01:06 +0000)
committerNeha Ojha <nojha@redhat.com>
Tue, 14 Apr 2020 00:05:02 +0000 (00:05 +0000)
Though the test passed, we weren't checking for the correct values:

.../qa/standalone/mon/osd-pool-df.sh:62: TEST_ceph_df:  ceph df -f json
.../qa/standalone/mon/osd-pool-df.sh:62: TEST_ceph_df:  jq .stats.total_avail_bytes
../qa/standalone/mon/osd-pool-df.sh:62: TEST_ceph_df:  local global_avail=0
.../qa/standalone/mon/osd-pool-df.sh:63: TEST_ceph_df:  ceph df -f json
.../qa/standalone/mon/osd-pool-df.sh:63: TEST_ceph_df:  jq '.pools | map(select(.name == "$rep_poolname"))[0].stats.max_avail'
../qa/standalone/mon/osd-pool-df.sh:63: TEST_ceph_df:  local rep_avail=null
.../qa/standalone/mon/osd-pool-df.sh:64: TEST_ceph_df:  ceph df -f json
.../qa/standalone/mon/osd-pool-df.sh:64: TEST_ceph_df:  jq '.pools | map(select(.name == "$ec_poolname"))[0].stats.max_avail'
../qa/standalone/mon/osd-pool-df.sh:64: TEST_ceph_df:  local ec_avail=null
../qa/standalone/mon/osd-pool-df.sh:66: TEST_ceph_df:  echo '0 >= null*3'
../qa/standalone/mon/osd-pool-df.sh:66: TEST_ceph_df:  bc
1
../qa/standalone/mon/osd-pool-df.sh:67: TEST_ceph_df:  echo '0 >= null*1.5'
../qa/standalone/mon/osd-pool-df.sh:67: TEST_ceph_df:  bc
1

Signed-off-by: Neha Ojha <nojha@redhat.com>
qa/standalone/mon/osd-pool-df.sh

index 3ed169d8c04412c01d3e845f2cbcc59e6ea3fcaf..49cc66f1c92ba02eaf26eee64071cb9c067986d0 100755 (executable)
@@ -58,10 +58,11 @@ function TEST_ceph_df() {
     local ec_poolname=testcephdf_erasurecode
     create_pool $rep_poolname 6 6 replicated
     create_pool $ec_poolname 6 6 erasure ec42profile
+    sleep 2
 
     local global_avail=`ceph df -f json | jq '.stats.total_avail_bytes'`
-    local rep_avail=`ceph df -f json | jq '.pools | map(select(.name == "$rep_poolname"))[0].stats.max_avail'`
-    local ec_avail=`ceph df -f json | jq '.pools | map(select(.name == "$ec_poolname"))[0].stats.max_avail'`
+    local rep_avail=`ceph df -f json | jq '.pools | map(select(.name == "'$rep_poolname'"))[0].stats.max_avail'`
+    local ec_avail=`ceph df -f json | jq '.pools | map(select(.name == "'$ec_poolname'"))[0].stats.max_avail'`
 
     echo "${global_avail} >= ${rep_avail}*3" | bc || return 1
     echo "${global_avail} >= ${ec_avail}*1.5" | bc || return 1