mon: OSDMonitor: don't output to stdout in plain text if json is specified

Fixes: #3748
Signed-off-by: Joao Eduardo Luis <joao.luis@inktank.com>
Reviewed-by: Sage Weil <sage@inktank.com>

diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index ad17d1aa2a4e018f04617d77bd789bc58aad478a..449b9f48cdf40bd3916c5a860390f2c4f1afde6c 100644 (file)
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@ -1753,7 +1753,8 @@ bool OSDMonitor::preprocess_command(MMonCommand *m)
          }
          if (r == 0) {
            rdata.append(ds);
-           ss << "dumped osdmap epoch " << p->get_epoch();
+            if (format != "json")
+              ss << " ";
          }
        } else if (cmd == "ls") {
          stringstream ds;