From: Sage Weil <sage@redhat.com>
Date: Fri, 27 Mar 2015 17:04:00 +0000 (-0700)
Subject: osd: fix condition for loggin scrub errors
X-Git-Tag: v0.94.4~79^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=455eb2a89197e9609c5bb510112d661d388b4c85;p=ceph.git

osd: fix condition for loggin scrub errors

We may have an error to log even though the authoritative map is empty:
when we have a digest that doesn't match all replicas.

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit d23766be902080ffb29528acb5a00d70beb97a9f)
---

diff --git a/src/osd/PG.cc b/src/osd/PG.cc
index ee8557fd255..8625d85b28f 100644
--- a/src/osd/PG.cc
+++ b/src/osd/PG.cc
@@ -4207,7 +4207,7 @@ void PG::scrub_compare_maps()
       ss);
     dout(2) << ss.str() << dendl;
 
-    if (!authoritative.empty()) {
+    if (!ss.str().empty()) {
       osd->clog->error(ss);
     }