From 417d66b2f3fbbf0db908f93482dc99696e05c0a5 Mon Sep 17 00:00:00 2001
From: Aishwarya Mathuria <amathuri@redhat.com>
Date: Wed, 28 Jun 2023 16:55:03 +0530
Subject: [PATCH] crimson/mgr: Fix config show command

Update the MMgrOpen message to include config_bl and config_defaults_bl

Fixes: https://tracker.ceph.com/issues/61846
Signed-off-by: Aishwarya Mathuria <amathuri@redhat.com>
(cherry picked from commit 249a6ddedb3840a91cc17708eba3a72f8b22d267)
---
 src/crimson/common/config_proxy.h | 9 +++++++++
 src/crimson/mgr/client.cc         | 2 ++
 src/crimson/mgr/client.h          | 1 +
 3 files changed, 12 insertions(+)

diff --git a/src/crimson/common/config_proxy.h b/src/crimson/common/config_proxy.h
index e27db9b5bedf3..4013046401879 100644
--- a/src/crimson/common/config_proxy.h
+++ b/src/crimson/common/config_proxy.h
@@ -96,6 +96,15 @@ public:
     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() {
diff --git a/src/crimson/mgr/client.cc b/src/crimson/mgr/client.cc
index 6e3d7cdd848c0..629c6ac03714f 100644
--- a/src/crimson/mgr/client.cc
+++ b/src/crimson/mgr/client.cc
@@ -72,6 +72,8 @@ void Client::ms_handle_connect(crimson::net::ConnectionRef c)
       // 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();
diff --git a/src/crimson/mgr/client.h b/src/crimson/mgr/client.h
index e845754330568..0ce1d00876df0 100644
--- a/src/crimson/mgr/client.h
+++ b/src/crimson/mgr/client.h
@@ -56,6 +56,7 @@ private:
   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) {
-- 
2.39.5