From 9c0d42fe99f545937103eb0efdbbb556da9988d5 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Mon, 11 Apr 2011 09:36:25 -0700 Subject: [PATCH] osd: only log scrub errors (not ok's) Otherwise we fill up the error log with "foo is ok!" messages. Signed-off-by: Sage Weil --- src/osd/PG.cc | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/osd/PG.cc b/src/osd/PG.cc index fbd9779b812e3..be99bc61bb913 100644 --- a/src/osd/PG.cc +++ b/src/osd/PG.cc @@ -3406,8 +3406,6 @@ bool PG::_compare_scrub_objects(ScrubMap::object &auth, errorstream << "extra attr " << i->first; } } - if (ok) - errorstream << " is ok!"; return ok; } @@ -3442,14 +3440,14 @@ void PG::_compare_scrubmaps(const map &maps, auth = j; } else { // Compare - errorstream << info.pgid << " osd" << acting[j->first] - << ": soid " << *k; + stringstream ss; if (!_compare_scrub_objects(auth->second->objects[*k], j->second->objects[*k], - errorstream)) { + ss)) { cur_inconsistent.insert(j->first); + errorstream << info.pgid << " osd" << acting[j->first] + << ": soid " << *k << ss.str() << std::endl; } - errorstream << std::endl; } } else { cur_missing.insert(j->first); -- 2.39.5