mon/OSDMonitor: change 'osd find' output to list all addrs

Signed-off-by: Sage Weil <sage@redhat.com>

diff --git a/PendingReleaseNotes b/PendingReleaseNotes
index 4ffdf12f8e16473c091951206abe6f3573a24d45..2761c198e7f4f9333aabecbef4e6651876354999 100644 (file)
--- a/PendingReleaseNotes
+++ b/PendingReleaseNotes
@@ -14,3 +14,7 @@
 * If the cluster log is directed at syslog, the entries are now
   prefixed by both the string-form name and the rank-form name (e.g.,
   ``mgr.x mgr.12345 ...`` instead of just ``mgr.12345 ...``).
+
+* The JSON output of the ``osd find`` command has replaced the ``ip``
+  field with an ``addrs`` section to reflect that OSDs may bind to
+  multiple addresses.

diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index d544b8e007f9bbeaf6edd7f84687a482bcd9b48a..7a451604ff1c9a953787b622a5aa3f311eb7ffa6 100644 (file)
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@ -4501,7 +4501,7 @@ bool OSDMonitor::preprocess_command(MonOpRequestRef op)
     boost::scoped_ptr<Formatter> f(Formatter::create(format, "json-pretty", "json-pretty"));
     f->open_object_section("osd_location");
     f->dump_int("osd", osd);
-    f->dump_stream("ip") << osdmap.get_addr(osd);
+    f->dump_object("addrs", osdmap.get_addrs(osd));
     f->open_object_section("crush_location");
     map<string,string> loc = osdmap.crush->get_full_location(osd);
     for (map<string,string>::iterator p = loc.begin(); p != loc.end(); ++p)