From: John Spray <john.spray@redhat.com>
Date: Wed, 9 May 2018 14:19:18 +0000 (+0100)
Subject: osd: write "bench" output to stdout
X-Git-Tag: v14.0.0~143^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=23583ccc25a33c1d997cff9d65a48569eac1392c;p=ceph.git

osd: write "bench" output to stdout

...not stderr.  Seems more reasonable as this
command is essentially feeding back a measurement result,
rather than just commenting on its status

Fixes: http://tracker.ceph.com/issues/24022
Signed-off-by: John Spray <john.spray@redhat.com>
---

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index 409085430895..9d47589871b0 100644
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -6124,9 +6124,9 @@ void OSD::do_command(Connection *con, ceph_tid_t tid, vector<string>& cmd, buffe
       f->dump_int("blocksize", bsize);
       f->dump_unsigned("bytes_per_sec", rate);
       f->close_section();
-      f->flush(ss);
+      f->flush(ds);
     } else {
-      ss << "bench: wrote " << byte_u_t(count)
+      ds << "bench: wrote " << byte_u_t(count)
 	 << " in blocks of " << byte_u_t(bsize) << " in "
 	 << (end-start) << " sec at " << byte_u_t(rate) << "/sec";
     }