From: Zhiqiang Wang <zhiqiang.wang@intel.com>
Date: Wed, 17 Jun 2015 04:26:36 +0000 (+0800)
Subject: test: change the test_tiering test case accordingly for proxy write
X-Git-Tag: v9.1.0~345^2~6
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=61c86a1281c4096a08b3a0f74ded1729be8a7c8c;p=ceph.git

test: change the test_tiering test case accordingly for proxy write

When an object is first created, it's proxied to base tier, need to
change the behavior of the test_tiering test case accordingly.

Signed-off-by: Zhiqiang Wang <zhiqiang.wang@intel.com>
---

diff --git a/qa/workunits/cephtool/test.sh b/qa/workunits/cephtool/test.sh
index f84031aa44f07..a6eaacaf95922 100755
--- a/qa/workunits/cephtool/test.sh
+++ b/qa/workunits/cephtool/test.sh
@@ -370,14 +370,7 @@ function test_tiering()
   rados -p cache4 put foo2 $tmpfile
   rm -f $tmpfile
   ceph tell osd.\* flush_pg_stats || true
-  ceph df | grep cache4 | grep ' 2 '
-  local max_objects=1
-  ceph osd pool set cache4 target_max_objects $max_objects
-  local max_bytes=1024
-  ceph osd pool set cache4 target_max_bytes $max_bytes
-  ceph health | grep WARN | grep cache4
-  ceph health detail | grep cache4 | grep 'target max' | grep "${max_objects} objects"
-  ceph health detail | grep cache4 | grep 'target max' | grep "${max_bytes}B"
+  ceph df | grep datapool | grep ' 2 '
   ceph osd tier remove-overlay datapool
   ceph osd tier remove datapool cache4
   ceph osd pool delete cache4 cache4 --yes-i-really-really-mean-it