From 2af36160b01ee1b6ceead47096ea7cc97c4e9501 Mon Sep 17 00:00:00 2001 From: Samuel Just Date: Tue, 27 Feb 2024 17:52:27 -0800 Subject: [PATCH] mgr/DaemonServer: decouple adjust_pgs max from mon_osd_max_creating_pgs The next commit will remove mon_osd_max_creating_pgs as it doesn't behave correctly in the context of OSDMonitor. Create a new mgr specific config to replace it here. Signed-off-by: Samuel Just --- src/common/options/mgr.yaml.in | 7 +++++++ src/mgr/DaemonServer.cc | 4 +++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/common/options/mgr.yaml.in b/src/common/options/mgr.yaml.in index 7d7b68035b7d2..f29182930b27b 100644 --- a/src/common/options/mgr.yaml.in +++ b/src/common/options/mgr.yaml.in @@ -103,6 +103,13 @@ options: services: - mgr with_legacy: true +- name: mgr_max_pg_creating + type: uint + level: advanced + desc: bound on max creating pgs when acting to create more pgs + default: 1024 + services: + - mgr - name: mgr_module_path type: str level: advanced diff --git a/src/mgr/DaemonServer.cc b/src/mgr/DaemonServer.cc index 29a9acea5332a..7f9775c93528a 100644 --- a/src/mgr/DaemonServer.cc +++ b/src/mgr/DaemonServer.cc @@ -2678,7 +2678,9 @@ void DaemonServer::send_report() void DaemonServer::adjust_pgs() { dout(20) << dendl; - unsigned max = std::max(1, g_conf()->mon_osd_max_creating_pgs); + uint64_t max = std::max( + 1, + g_conf().get_val("mgr_max_pg_creating")); double max_misplaced = g_conf().get_val("target_max_misplaced_ratio"); bool aggro = g_conf().get_val("mgr_debug_aggressive_pg_num_changes"); -- 2.39.5