Merge pull request #24180 from colletj/wip-35914-mmgrconfigure-osd-query

mgr: update MMgrConfigure message to include optional OSD perf queries

Reviewed-by: Jason Dillaman <dillaman@redhat.com>

diff --cc src/mgr/DaemonServer.cc
index 00f480a239c4a698b97c2e2d9f53aa25e7caa581,e1b621b6534d8cd0b7c99e10257627523d65793e..b071b21cf05615df2689b1901a4770d835aec8f3
--- 1/src/mgr/DaemonServer.cc
--- 2/src/mgr/DaemonServer.cc
+++ b/src/mgr/DaemonServer.cc
@@@ -2506,8 -2318,10 +2506,10 @@@ void DaemonServer::handle_conf_change(c
  
  void DaemonServer::_send_configure(ConnectionRef c)
  {
 -  assert(lock.is_locked_by_me());
 +  ceph_assert(lock.is_locked_by_me());
  
+   OSDPerfMetricQuery query;
+ 
    auto configure = new MMgrConfigure();
    configure->stats_period = g_conf().get_val<int64_t>("mgr_stats_period");
    configure->stats_threshold = g_conf().get_val<int64_t>("mgr_stats_threshold");

diff --cc src/mgr/MgrClient.cc
Simple merge

diff --cc src/osd/OSD.cc
Simple merge

diff --cc src/osd/OSD.h
Simple merge