From 0a442eeb1420f982f6fb0d59940bebdf4dfa36f3 Mon Sep 17 00:00:00 2001
From: Loic Dachary <ldachary@redhat.com>
Date: Fri, 10 Apr 2015 20:00:13 +0200
Subject: [PATCH] tests: comment out unstable tiering tests

So that make check does not randomly fails.

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

Signed-off-by: Loic Dachary <ldachary@redhat.com>
---
 qa/workunits/cephtool/test.sh | 52 ++++++++++++++++++-----------------
 1 file changed, 27 insertions(+), 25 deletions(-)

diff --git a/qa/workunits/cephtool/test.sh b/qa/workunits/cephtool/test.sh
index c596362f332ae..4a2e90ea0fc50 100755
--- a/qa/workunits/cephtool/test.sh
+++ b/qa/workunits/cephtool/test.sh
@@ -359,31 +359,33 @@ 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
 
-  # 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
+  # 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
+
 
   # make sure 'tier remove' behaves as we expect
   # i.e., removing a tier from a pool that's not its base pool only
-- 
2.39.5