From 847fcb1ecbfe7613a67a78ec697063829254ddf2 Mon Sep 17 00:00:00 2001 From: Patrick Donnelly Date: Wed, 9 Oct 2019 10:41:35 -0700 Subject: [PATCH] qa: use small default pg count for CephFS pools The pg count needs to be a power-of-two since dff5697464edb9931d5dfa08cd4a30f85c1f237e. Also, mon_pg_warn_min_per_osd is disabled by default now (or set to a low value in vstart/testing) so there's no need to base the pg count on this value. Ideally someday we can remove this so that the default cluster value is used but we need to keep this for deployments of older versions of Ceph. Fixes: https://tracker.ceph.com/issues/42228 Signed-off-by: Patrick Donnelly (cherry picked from commit fc88e6c6c55402120a432ea47f05f321ba4c9bb1) Conflicts: qa/tasks/cephfs/filesystem.py: this commit was orignally backported by #34055, but it failed to cherry-pick all necessary bits. in this change, the missing bit is picked up. --- qa/tasks/cephfs/filesystem.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qa/tasks/cephfs/filesystem.py b/qa/tasks/cephfs/filesystem.py index 6667863486a3..09dfc121af28 100644 --- a/qa/tasks/cephfs/filesystem.py +++ b/qa/tasks/cephfs/filesystem.py @@ -635,7 +635,7 @@ class Filesystem(MDSCluster): def add_data_pool(self, name, create=True): if create: - self.mon_manager.raw_cluster_cmd('osd', 'pool', 'create', name, self.pgs_per_fs_pool().__str__()) + self.mon_manager.raw_cluster_cmd('osd', 'pool', 'create', name, self.pgs_per_fs_pool.__str__()) self.mon_manager.raw_cluster_cmd('fs', 'add_data_pool', self.name, name) self.get_pool_names(refresh = True) for poolid, fs_name in self.data_pools.items(): -- 2.47.3