OSDMonitor: Make sure pcm is initialised

badone · badone · commit b3316073b0f6 · 2025-03-27T13:09:12.000+10:00
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>
diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
@@ -501,6 +501,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:"

Original file line number	Diff line number	Diff line change
`@@ -501,6 +501,7 @@ void OSDMonitor::handle_conf_change(const ConfigProxy& conf,`
`501`	`501`	`}`
`502`	`502`	`if (changed.count("mon_memory_target") \|\|`
`503`	`503`	`changed.count("rocksdb_cache_size")) {`
	`504`	`+ _set_cache_autotuning();`
`504`	`505`	`int r = _update_mon_cache_settings();`
`505`	`506`	`if (r < 0) {`
`506`	`507`	`derr << __func__ << " mon_memory_target:"`