Merge pull request ceph#52266 from amathuria/wip-crimson-amat-fix-config-show

crimson/mgr: Fix config show command

Reviewed-by: Matan Breizman <[email protected]>
Reviewed-by: Samuel Just <[email protected]>

Author: Matan-B

src/crimson/common/config_proxy.h

@@ -96,6 +96,15 @@ class ConfigProxy : public seastar::peering_sharded_service<ConfigProxy>
     return values.get();
   }
 
+  void get_config_bl(uint64_t have_version,
+		     ceph::buffer::list *bl,
+		     uint64_t *got_version) {
+    get_config().get_config_bl(get_config_values(), have_version,
+                               bl, got_version);
+  }
+  void get_defaults_bl(ceph::buffer::list *bl) {
+    get_config().get_defaults_bl(get_config_values(), bl);
+  }
   // required by sharded<>
   seastar::future<> start();
   seastar::future<> stop() {

src/crimson/mgr/client.cc

@@ -75,6 +75,8 @@ void Client::ms_handle_connect(
       // ask for the mgrconfigure message
       auto m = crimson::make_message<MMgrOpen>();
       m->daemon_name = local_conf()->name.get_id();
+      local_conf().get_config_bl(0, &m->config_bl, &last_config_bl_version);
+      local_conf().get_defaults_bl(&m->config_defaults_bl);
       return conn->send(std::move(m));
     } else {
       return seastar::now();

src/crimson/mgr/client.h

@@ -56,6 +56,7 @@ class Client : public crimson::net::Dispatcher {
   crimson::net::ConnectionRef conn;
   seastar::timer<seastar::lowres_clock> report_timer;
   crimson::common::Gated gate;
+  uint64_t last_config_bl_version = 0;
 };
 
 inline std::ostream& operator<<(std::ostream& out, const Client& client) {