]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
OSDMonitor: Make sure pcm is initialised
authorBrad Hubbard <bhubbard@redhat.com>
Wed, 26 Mar 2025 02:45:02 +0000 (12:45 +1000)
committerBrad Hubbard <bhubbard@redhat.com>
Mon, 9 Jun 2025 02:34:41 +0000 (12:34 +1000)
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)

src/mon/OSDMonitor.cc

index 5608538224ec7da54bc7ae4c9bb08460650cf6e2..46618a3be3a8671c52b95c21e580df21d3797909 100644 (file)
@@ -502,6 +502,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:"