From 682116023d22c6aa1668aa7297635d4ff20c116d Mon Sep 17 00:00:00 2001 From: Guillaume Abrioux Date: Wed, 10 Feb 2021 15:49:38 +0100 Subject: [PATCH] tests: increase `mon_max_pg_per_osd` we aren't deploying enough OSD daemon, so it fails like following: ``` stderr: 'Error ERANGE: pool id 10 pg_num 256 size 2 would mean 1536 total pgs, which exceeds max 1500 (mon_max_pg_per_osd 250 * num_in_osds 6)' ``` Let's increase the value of `mon_max_pg_per_osd` in order to get around this issue in the CI. Signed-off-by: Guillaume Abrioux --- tests/functional/all-in-one/container/group_vars/all | 1 + tests/functional/all-in-one/group_vars/all | 1 + tests/functional/all_daemons/ceph-override.json | 3 ++- tests/functional/all_daemons/container/group_vars/all | 1 + tests/functional/all_daemons/group_vars/all | 1 + tests/functional/collocation/container/group_vars/all | 1 + tests/functional/collocation/group_vars/all | 1 + 7 files changed, 8 insertions(+), 1 deletion(-) diff --git a/tests/functional/all-in-one/container/group_vars/all b/tests/functional/all-in-one/container/group_vars/all index dafb610c5..eb58e0327 100644 --- a/tests/functional/all-in-one/container/group_vars/all +++ b/tests/functional/all-in-one/container/group_vars/all @@ -20,6 +20,7 @@ ceph_conf_overrides: mon_allow_pool_size_one: true mon_warn_on_pool_no_redundancy: false osd_pool_default_size: 1 + mon_max_pg_per_osd: 300 handler_health_mon_check_delay: 10 handler_health_osd_check_delay: 10 rgw_create_pools: diff --git a/tests/functional/all-in-one/group_vars/all b/tests/functional/all-in-one/group_vars/all index d0caa26c3..0eef25098 100644 --- a/tests/functional/all-in-one/group_vars/all +++ b/tests/functional/all-in-one/group_vars/all @@ -17,6 +17,7 @@ ceph_conf_overrides: mon_allow_pool_size_one: true mon_warn_on_pool_no_redundancy: false osd_pool_default_size: 1 + mon_max_pg_per_osd: 300 handler_health_mon_check_delay: 10 handler_health_osd_check_delay: 10 osd_objectstore: "bluestore" diff --git a/tests/functional/all_daemons/ceph-override.json b/tests/functional/all_daemons/ceph-override.json index f17dacc24..acf8b1217 100644 --- a/tests/functional/all_daemons/ceph-override.json +++ b/tests/functional/all_daemons/ceph-override.json @@ -4,7 +4,8 @@ "osd_pool_default_pg_num": 12, "osd_pool_default_size": 1, "mon_allow_pool_size_one": true, - "mon_warn_on_pool_no_redundancy": false + "mon_warn_on_pool_no_redundancy": false, + "mon_max_pg_per_osd": 300 } }, "cephfs_pools": [ diff --git a/tests/functional/all_daemons/container/group_vars/all b/tests/functional/all_daemons/container/group_vars/all index d16abaf27..d3fb25ed9 100644 --- a/tests/functional/all_daemons/container/group_vars/all +++ b/tests/functional/all_daemons/container/group_vars/all @@ -16,6 +16,7 @@ ceph_conf_overrides: mon_allow_pool_size_one: true mon_warn_on_pool_no_redundancy: false osd_pool_default_size: 1 + mon_max_pg_per_osd: 300 openstack_config: True openstack_glance_pool: name: "images" diff --git a/tests/functional/all_daemons/group_vars/all b/tests/functional/all_daemons/group_vars/all index 15943304d..ae3b46b05 100644 --- a/tests/functional/all_daemons/group_vars/all +++ b/tests/functional/all_daemons/group_vars/all @@ -9,6 +9,7 @@ ceph_conf_overrides: mon_allow_pool_size_one: true mon_warn_on_pool_no_redundancy: false osd_pool_default_size: 1 + mon_max_pg_per_osd: 300 openstack_config: True openstack_glance_pool: name: "images" diff --git a/tests/functional/collocation/container/group_vars/all b/tests/functional/collocation/container/group_vars/all index 1bdc042a8..9b5c3365d 100644 --- a/tests/functional/collocation/container/group_vars/all +++ b/tests/functional/collocation/container/group_vars/all @@ -18,6 +18,7 @@ ceph_conf_overrides: mon_allow_pool_size_one: true mon_warn_on_pool_no_redundancy: false osd_pool_default_size: 1 + mon_max_pg_per_osd: 300 handler_health_mon_check_delay: 10 handler_health_osd_check_delay: 10 dashboard_admin_password: $sX!cD$rYU6qR^B! diff --git a/tests/functional/collocation/group_vars/all b/tests/functional/collocation/group_vars/all index 440c0b781..cee908e23 100644 --- a/tests/functional/collocation/group_vars/all +++ b/tests/functional/collocation/group_vars/all @@ -15,6 +15,7 @@ ceph_conf_overrides: mon_allow_pool_size_one: true mon_warn_on_pool_no_redundancy: false osd_pool_default_size: 1 + mon_max_pg_per_osd: 300 handler_health_mon_check_delay: 10 handler_health_osd_check_delay: 10 dashboard_admin_password: $sX!cD$rYU6qR^B! -- 2.47.3