]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
OSDMonitor: Make sure pcm is initialised 63803/head
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:26:40 +0000 (12:26 +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 0a9107c88392e0bf3654ad1a9c2351677cf571cb..6c4a2b5747e3d56e982be3665e6576e6ff928170 100644 (file)
@@ -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:"