From: Greg Farnum <greg@inktank.com>
Date: Fri, 18 Apr 2014 18:01:40 +0000 (-0700)
Subject: test: handle the create-pg delay when testing cache split syntax
X-Git-Tag: v0.80-rc1~20
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=82edda23aadb93213adc0229b844587b2d760fa7;p=ceph.git

test: handle the create-pg delay when testing cache split syntax

Signed-off-by: Greg Farnum <greg@inktank.com>
Reviewed-by: Samuel Just <sam.just@inktank.com>
---

diff --git a/qa/workunits/cephtool/test.sh b/qa/workunits/cephtool/test.sh
index 63d6b365fd0..b893dfedde9 100755
--- a/qa/workunits/cephtool/test.sh
+++ b/qa/workunits/cephtool/test.sh
@@ -61,7 +61,9 @@ expect_false ceph osd tier add metadata cache
 ceph osd tier cache-mode cache writeback
 ceph osd tier cache-mode cache readonly
 expect_false ceph osd pool set cache pg_num 3
-ceph osd pool set cache pg_num 3 --yes-i-really-mean-it
+set +e
+ceph osd pool set cache pg_num 3 --yes-i-really-mean-it 2>$TMPFILE ; check_response 'currently creating pgs' $? 16
+set -e
 ceph osd tier cache-mode cache none
 ceph osd tier set-overlay data cache
 expect_false ceph osd tier set-overlay data cache2