]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
mgr/DaemonServer.cc: make 'config show' on fsid work
authorNeha Ojha <nojha@redhat.com>
Thu, 18 Jun 2020 21:59:40 +0000 (21:59 +0000)
committerNeha Ojha <nojha@redhat.com>
Mon, 22 Jun 2020 16:41:24 +0000 (16:41 +0000)
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 <nojha@redhat.com>
src/mgr/DaemonServer.cc

index c6f5779158b02a086345e042e2c9e2532e95ff8f..1fc57233e39cd709c3f2c1f5e4852badc4b444d8 100644 (file)
@@ -1855,6 +1855,12 @@ bool DaemonServer::_handle_command(
     int r = 0;
     string name;
     if (cmd_getval(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()) {