From: Loic Dachary <ldachary@redhat.com>
Date: Thu, 16 Apr 2015 21:12:42 +0000 (+0200)
Subject: tests: uncomment tiering agent tests
X-Git-Tag: v9.0.2~149^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b2c40d5e765e668ae2d8da5384e65059cc637a59;p=ceph.git

tests: uncomment tiering agent tests

http://tracker.ceph.com/issues/11359 Refs: #11359

Signed-off-by: Loic Dachary <ldachary@redhat.com>
---

diff --git a/qa/workunits/cephtool/test.sh b/qa/workunits/cephtool/test.sh
index 0a8282bfedb2..f1beb0f7426b 100755
--- a/qa/workunits/cephtool/test.sh
+++ b/qa/workunits/cephtool/test.sh
@@ -356,32 +356,31 @@ function test_tiering()
   ceph osd pool delete cachepool cachepool --yes-i-really-really-mean-it
   ceph osd pool delete datapool datapool --yes-i-really-really-mean-it
 
-  # commented out pending http://tracker.ceph.com/issues/11359
   ## check health check
-  # ceph osd pool create datapool 2
-  # ceph osd pool create cache4 2
-  # ceph osd tier add-cache datapool cache4 1024000
-  # ceph osd tier cache-mode cache4 writeback
-  # tmpfile=$(mktemp|grep tmp)
-  # dd if=/dev/zero of=$tmpfile  bs=4K count=1
-  # ceph osd pool set cache4 target_max_objects 5
-  # #4096 * 5 = 20480, 20480 near/at 21000,
-  # ceph osd pool set cache4 target_max_bytes 21000
-  # for f in `seq 1 5` ; do
-  #   rados -p cache4 put foo$f $tmpfile
-  # done
-  # rm -f $tmpfile
-  # while ! ceph df | grep cache4 | grep ' 5 ' ; do
-  #   echo waiting for pg stats to flush
-  #   sleep 2
-  # done
-  # ceph health | grep WARN | grep cache4
-  # ceph health detail | grep cache4 | grep 'target max' | grep objects
-  # ceph health detail | grep cache4 | grep 'target max' | grep 'B'
-  # ceph osd tier remove-overlay datapool
-  # ceph osd tier remove datapool cache4
-  # ceph osd pool delete cache4 cache4 --yes-i-really-really-mean-it
-  # ceph osd pool delete datapool datapool --yes-i-really-really-mean-it
+  ceph osd pool create datapool 2
+  ceph osd pool create cache4 2
+  ceph osd tier add-cache datapool cache4 1024000
+  ceph osd tier cache-mode cache4 writeback
+  tmpfile=$(mktemp|grep tmp)
+  dd if=/dev/zero of=$tmpfile  bs=4K count=1
+  ceph osd pool set cache4 target_max_objects 5
+  #4096 * 5 = 20480, 20480 near/at 21000,
+  ceph osd pool set cache4 target_max_bytes 21000
+  for f in `seq 1 5` ; do
+    rados -p cache4 put foo$f $tmpfile
+  done
+  rm -f $tmpfile
+  while ! ceph df | grep cache4 | grep ' 5 ' ; do
+    echo waiting for pg stats to flush
+    sleep 2
+  done
+  ceph health | grep WARN | grep cache4
+  ceph health detail | grep cache4 | grep 'target max' | grep objects
+  ceph health detail | grep cache4 | grep 'target max' | grep 'B'
+  ceph osd tier remove-overlay datapool
+  ceph osd tier remove datapool cache4
+  ceph osd pool delete cache4 cache4 --yes-i-really-really-mean-it
+  ceph osd pool delete datapool datapool --yes-i-really-really-mean-it
 
 
   # make sure 'tier remove' behaves as we expect