From: Brad Hubbard <bhubbard@redhat.com>
Date: Wed, 26 Mar 2025 02:45:02 +0000 (+1000)
Subject: OSDMonitor: Make sure pcm is initialised
X-Git-Tag: v20.1.0-pre.ibm.0~55^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ffae53310bdb3c8d91199d580c3a6497e9bfc946;p=ceph-ci.git

OSDMonitor: Make sure pcm is initialised

If mon_memory_target is set in the config database and
mon_memory_autotune is left at default the mon_memory_target change can
be lost. Make sure _set_cache_autotuning() is explicity called any time
pcm related settings are changed.

Fixes: https://tracker.ceph.com/issues/70645

Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
(cherry picked from commit b3316073b0f64b4dc49b4fd959a7cbbb21b5778f)
---

diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index 0a9107c8839..6c4a2b5747e 100644
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@ -503,6 +503,7 @@ void OSDMonitor::handle_conf_change(const ConfigProxy& conf,
   }
   if (changed.count("mon_memory_target") ||
       changed.count("rocksdb_cache_size")) {
+    _set_cache_autotuning();
     int r = _update_mon_cache_settings();
     if (r < 0) {
       derr << __func__ << " mon_memory_target:"