From: Patrick Donnelly <pdonnell@redhat.com>
Date: Fri, 20 Dec 2019 20:57:31 +0000 (-0800)
Subject: qa: force creation of fs with EC default data pool
X-Git-Tag: v14.2.8~64^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=83e9e9c7f2fb63d0fbb84ee9fa0094437533a9ce;p=ceph.git

qa: force creation of fs with EC default data pool

In the future, we should add the EC data pool as a supplementary data
pool but that requires a mount to setup which is awkward in the code
here. When cephfs-shell is more widely available, this will be easier.

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit 6e448f9aa0e71f1e820f4bd1b53e067268e4b67a)
---

diff --git a/qa/tasks/cephfs/filesystem.py b/qa/tasks/cephfs/filesystem.py
index ca153ed4a2a8..3cdcee054b64 100644
--- a/qa/tasks/cephfs/filesystem.py
+++ b/qa/tasks/cephfs/filesystem.py
@@ -563,7 +563,10 @@ class Filesystem(MDSCluster):
                     'osd', 'pool', 'create',
                     data_pool_name, pgs_per_fs_pool.__str__())
             self.mon_manager.raw_cluster_cmd('fs', 'new',
-                                             self.name, self.metadata_pool_name, data_pool_name)
+                                             self.name,
+                                             self.metadata_pool_name,
+                                             data_pool_name,
+                                             "--force")
         self.check_pool_application(self.metadata_pool_name)
         self.check_pool_application(data_pool_name)
         # Turn off spurious standby count warnings from modifying max_mds in tests.