From: Noah Watkins <noahwatkins@gmail.com>
Date: Thu, 17 Jan 2019 19:16:44 +0000 (-0800)
Subject: cli: dump osd-fsid as part of osd find <id>
X-Git-Tag: v14.1.0~343^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F26015%2Fhead;p=ceph.git

cli: dump osd-fsid as part of osd find <id>

Dumps the osd-fsid uuid as part of the `osd find <id>` command.
Currently this uuid is only available as part of `osd dump` but
ceph-ansible has a use case to interrogate a single osd without needing
the entire osdmap dump.

Signed-off-by: Noah Watkins <noahwatkins@gmail.com>
---

diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index 585927cbc684..0359653f08cb 100644
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@ -4814,6 +4814,7 @@ bool OSDMonitor::preprocess_command(MonOpRequestRef op)
     f->open_object_section("osd_location");
     f->dump_int("osd", osd);
     f->dump_object("addrs", osdmap.get_addrs(osd));
+    f->dump_stream("osd_fsid") << osdmap.get_uuid(osd);
 
     // try to identify host, pod/container name, etc.
     map<string,string> m;