From 9ef455baceb075d2646ba495b065485478eb61f7 Mon Sep 17 00:00:00 2001 From: Neha Ojha Date: Thu, 18 Jun 2020 21:59:40 +0000 Subject: [PATCH] mgr/DaemonServer.cc: make 'config show' on fsid work This follows 5661dd75efd48251b7f433b1ffe01c9c52906e96, which added special handling for "config get" to work on fsid. Fixes: https://tracker.ceph.com/issues/46123 Signed-off-by: Neha Ojha (cherry picked from commit 3ca2c482e0fb5af9e8f13c212d60aaf55a033a94) Conflicts: src/mgr/DaemonServer.cc - trivial resolution --- src/mgr/DaemonServer.cc | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/mgr/DaemonServer.cc b/src/mgr/DaemonServer.cc index 0e7a795be8a24..c547bff1dfeab 100644 --- a/src/mgr/DaemonServer.cc +++ b/src/mgr/DaemonServer.cc @@ -1835,6 +1835,12 @@ bool DaemonServer::_handle_command( std::lock_guard l(daemon->lock); if (cmd_getval(g_ceph_context, cmdctx->cmdmap, "key", name)) { + // handle special options + if (name == "fsid") { + cmdctx->odata.append(stringify(monc->get_fsid()) + "\n"); + cmdctx->reply(r, ss); + return true; + } auto p = daemon->config.find(name); if (p != daemon->config.end() && !p->second.empty()) { -- 2.39.5