From: Samuel Just <sjust@redhat.com>
Date: Wed, 28 Feb 2024 01:52:27 +0000 (-0800)
Subject: mgr/DaemonServer: decouple adjust_pgs max from mon_osd_max_creating_pgs
X-Git-Tag: testing/wip-batrick-testing-20240411.154038~76^2~1
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=2af36160b01ee1b6ceead47096ea7cc97c4e9501;p=ceph-ci.git

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 <sjust@redhat.com>
---

diff --git a/src/common/options/mgr.yaml.in b/src/common/options/mgr.yaml.in
index 7d7b68035b7..f29182930b2 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 29a9acea533..7f9775c9352 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<int64_t>(1, g_conf()->mon_osd_max_creating_pgs);
+  uint64_t max = std::max<uint64_t>(
+    1,
+    g_conf().get_val<uint64_t>("mgr_max_pg_creating"));
   double max_misplaced = g_conf().get_val<double>("target_max_misplaced_ratio");
   bool aggro = g_conf().get_val<bool>("mgr_debug_aggressive_pg_num_changes");