From: Josh Durgin <jdurgin@redhat.com>
Date: Wed, 15 Feb 2017 01:03:19 +0000 (-0800)
Subject: qa/tasks/rados: test sparse reads with ec overwrites
X-Git-Tag: v12.0.2~8^2~8
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a219319137e8ea269c7a8ca2652b68918c1c4c15;p=ceph.git

qa/tasks/rados: test sparse reads with ec overwrites

Signed-off-by: Josh Durgin <jdurgin@redhat.com>
---

diff --git a/qa/tasks/rados.py b/qa/tasks/rados.py
index 4e4f746cb05e..2ef542fd2785 100644
--- a/qa/tasks/rados.py
+++ b/qa/tasks/rados.py
@@ -137,9 +137,7 @@ def task(ctx, config):
         'ceph_test_rados']
     if config.get('ec_pool', False):
         args.extend(['--no-omap'])
-        if config.get('erasure_code_use_overwrites', False):
-            args.extend(['--no-sparse'])
-        else:
+        if not config.get('erasure_code_use_overwrites', False):
             args.extend(['--ec-pool'])
     if config.get('write_fadvise_dontneed', False):
         args.extend(['--write-fadvise-dontneed'])
diff --git a/qa/workunits/cephtool/test.sh b/qa/workunits/cephtool/test.sh
index 8390c4222933..94c11aeebf24 100755
--- a/qa/workunits/cephtool/test.sh
+++ b/qa/workunits/cephtool/test.sh
@@ -989,7 +989,7 @@ function test_mon_mds()
 
   # We should be permitted to use an EC pool with overwrites enabled
   # as the data pool...
-  ceph osd pool set mds-ec-pool debug_white_box_testing_ec_overwrites true --yes-i-really-mean-it
+  ceph osd pool set mds-ec-pool allow_ec_overwrites true
   ceph fs new $FS_NAME fs_metadata mds-ec-pool --force 2>$TMPFILE
   fail_all_mds $FS_NAME
   ceph fs rm $FS_NAME --yes-i-really-mean-it