Merge pull request #6699 from dachary/wip-ceph-helpers

tests: ceph-helpers assert success getting backfills Reviewed-by: Kefu Chai <kchai@redhat.com>
ceph · Nov 26, 2015 · 1bf0239 · 1bf0239
2 parents 891e985 + 15b2aca
commit 1bf0239
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/qa/workunits/ceph-helpers.sh b/qa/workunits/ceph-helpers.sh
@@ -422,6 +422,7 @@ function test_run_osd() {
     run_osd $dir 0 || return 1
     local backfills=$(CEPH_ARGS='' ceph --format=json daemon $dir//ceph-osd.0.asok \
         config get osd_max_backfills)
+    echo "$backfills" | grep --quiet 'osd_max_backfills' || return 1
 
     run_osd $dir 1 --osd-max-backfills 20 || return 1
     local backfills=$(CEPH_ARGS='' ceph --format=json daemon $dir//ceph-osd.1.asok \
@@ -523,6 +524,7 @@ function test_activate_osd() {
     run_osd $dir 0 || return 1
     local backfills=$(CEPH_ARGS='' ceph --format=json daemon $dir//ceph-osd.0.asok \
         config get osd_max_backfills)
+    echo "$backfills" | grep --quiet 'osd_max_backfills' || return 1
 
     kill_daemons $dir TERM osd || return 1
 
@@ -670,6 +672,8 @@ function test_get_config() {
     teardown $dir || return 1
 }
 
+#######################################################################
+
 ##
 # Set the **config** to specified **value**, via the config set command
 # of the admin socket of **daemon**.**id**