From: Dan Mick <dan.mick@inktank.com>
Date: Fri, 7 Jun 2013 23:39:34 +0000 (-0700)
Subject: ceph: old daemons output to outs and outbuf, combine
X-Git-Tag: v0.65~128
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=359f456a7083f05e2b24ef36f31984f871eadb68;p=ceph.git

ceph: old daemons output to outs and outbuf, combine

When talking to old daemons, if a command succeeds, there may be
output on outs, outbuf, or both; combine them if there's no error,
and clear outs so it's not treated as stderr fodder.

Signed-off-by: Dan Mick <dan.mick@inktank.com>
Reviewed-by: Sage Weil <sage@inktank.com>
---

diff --git a/src/ceph.in b/src/ceph.in
index 74a76acfcb18..ad2df9ad35d2 100755
--- a/src/ceph.in
+++ b/src/ceph.in
@@ -1426,7 +1426,8 @@ def main():
             # try old mon
             ret, outbuf, outs = send_command(cmd=['status'])
             # old mon returns status to outs...ick
-            outbuf = outs
+            if ret == 0:
+                outbuf += outs
         if ret:
             print >> sys.stderr, "status query failed: ", outs
             return ret
@@ -1487,6 +1488,11 @@ def main():
         if verbose:
             print '{0} to old {1}'.format(' '.join(childargs), target[0])
         ret, outbuf, outs = send_command(target, childargs, inbuf)
+        # combine nonerror outbuf and outs; either may have cmd output
+        if ret == 0:
+            outbuf += outs
+            # clear outs so generic code below doesn't print it to stderr
+            outs = ''
     elif ret:
         if ret < 0:
             ret = -ret