From: Dan Mick <dan.mick@inktank.com>
Date: Thu, 13 Jun 2013 03:59:08 +0000 (-0700)
Subject: OSDMonitor: osd id when id already exists needs to come to stdout too
X-Git-Tag: v0.65~89
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c618cf937bd2731e3af4b77cac22b0afaecfdc54;p=ceph.git

OSDMonitor: osd id when id already exists needs to come to stdout too

Found by qa/workunits/mon/osd.sh

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

diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index d6c017f0d9c..214b0e7a926 100644
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@ -3079,7 +3079,7 @@ bool OSDMonitor::prepare_command(MMonCommand *m)
 	// osd already exists
 	err = 0;
 	ss << i;
-	getline(ss, rs);
+	rdata.append(ss);
 	goto reply;
       }
       i = pending_inc.identify_osd(uuid);