From: Sage Weil <sage@inktank.com>
Date: Thu, 14 Feb 2013 18:44:31 +0000 (-0800)
Subject: osd: fix read_log error/warning messages to mon
X-Git-Tag: v0.58~68
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=971b1612ccb9c70c55a0000498f908736ed43008;p=ceph.git

osd: fix read_log error/warning messages to mon

Signed-off-by: Sage Weil <sage@inktank.com>
---

diff --git a/src/osd/PG.cc b/src/osd/PG.cc
index 9e5efba63bd6..db613bbd29cc 100644
--- a/src/osd/PG.cc
+++ b/src/osd/PG.cc
@@ -2722,7 +2722,7 @@ void PG::read_state(ObjectStore *store, bufferlist &bl)
     ostringstream oss;
     read_log(store, coll, log_oid, info, ondisklog, log, missing, oss, this);
     if (oss.str().length())
-      osd->clog.error() << oss;
+      osd->clog.error() << oss.str();
   }
   catch (const buffer::error &e) {
     string cr_log_coll_name(get_corrupt_pg_log_name());
@@ -5248,8 +5248,8 @@ void PG::read_log(ObjectStore *store, coll_t coll, hobject_t log_oid,
       // [repair] at end of log?
       if (!p.end() && e.version == info.last_update) {
 	oss << info.pgid << " log has extra data at "
-	   << endpos << "~" << (ondisklog.head-endpos) << " after "
-	   << info.last_update << "\n";
+	    << endpos << "~" << (ondisklog.head-endpos) << " after "
+	    << info.last_update << "\n";
 
 	dout(0) << "read_log " << endpos << " *** extra gunk at end of log, "
 	        << "adjusting ondisklog.head" << dendl;