]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
mon: send "osd create" output to stdout; tests rely on it
authorDan Mick <dan.mick@inktank.com>
Mon, 10 Jun 2013 20:26:06 +0000 (13:26 -0700)
committerDan Mick <dan.mick@inktank.com>
Tue, 11 Jun 2013 00:06:04 +0000 (17:06 -0700)
Signed-off-by: Dan Mick <dan.mick@inktank.com>
Reviewed-by: Sage Weil <sage@inktank.com>
src/mon/OSDMonitor.cc

index 0a8451fc3ea82a9eb265931e2ffb8b1e74eee6ba..d6e2e1cb56065dadaba25a4eb8c1fbf063641685 100644 (file)
@@ -3115,8 +3115,8 @@ done:
     if (!uuid.is_zero())
       pending_inc.new_uuid[i] = uuid;
     ss << i;
-    getline(ss, rs);
-    wait_for_finished_proposal(new Monitor::C_Command(mon, m, 0, rs, get_version()));
+    rdata.append(ss);
+    wait_for_finished_proposal(new Monitor::C_Command(mon, m, 0, rs, rdata, get_version()));
     return true;
 
   } else if (prefix == "osd blacklist") {