qa: don't configure ec data pool with memstore

Fixes: http://tracker.ceph.com/issues/22436
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit b2284f23b813399613f8540efd2d426b3c6f9839)

diff --git a/qa/suites/fs/basic_functional/tasks/mds-full.yaml b/qa/suites/fs/basic_functional/tasks/mds-full.yaml
index 53735001963939c6ce75d2c70e23a0fea5c719e1..35c69c790d350f2f3d00ae33322c6438a6a8bb80 100644 (file)
--- a/qa/suites/fs/basic_functional/tasks/mds-full.yaml
+++ b/qa/suites/fs/basic_functional/tasks/mds-full.yaml
@@ -1,6 +1,8 @@
 
 overrides:
   ceph:
+    cephfs_ec_profile:
+      - disabled
     log-whitelist:
       - OSD full dropping all updates
       - OSD near full

diff --git a/qa/tasks/cephfs/filesystem.py b/qa/tasks/cephfs/filesystem.py
index 9638fd55c96ab02f9651d3cbf33d802d449a3949..e109a277596a4ba1e1a9ac0a2c4a75df7280f91f 100644 (file)
--- a/qa/tasks/cephfs/filesystem.py
+++ b/qa/tasks/cephfs/filesystem.py
@@ -475,7 +475,7 @@ class Filesystem(MDSCluster):
                                              self.name, self.metadata_pool_name, data_pool_name,
                                              '--allow-dangerous-metadata-overlay')
         else:
-            if self.ec_profile:
+            if self.ec_profile and 'disabled' not in self.ec_profile:
                 log.info("EC profile is %s", self.ec_profile)
                 cmd = ['osd', 'erasure-code-profile', 'set', data_pool_name]
                 cmd.extend(self.ec_profile)