From: Sage Weil <sage@redhat.com>
Date: Wed, 10 Dec 2014 00:37:33 +0000 (-0800)
Subject: osd: scrub: be explicit about whether bad digest is known bad
X-Git-Tag: v0.92~111^2~10
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=85f677a4aa2df115639219d064b064422873a18e;p=ceph.git

osd: scrub: be explicit about whether bad digest is known bad

The digest may just disagree with our best guess 'auth' shard, or it may
also disagree with the recorded oi digest.  Clarify which.

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

diff --git a/src/osd/PGBackend.cc b/src/osd/PGBackend.cc
index fcb7c09c8c7e..2f2f96965fb1 100644
--- a/src/osd/PGBackend.cc
+++ b/src/osd/PGBackend.cc
@@ -390,9 +390,11 @@ enum scrub_error_type PGBackend::be_compare_scrub_objects(
       if (error != CLEAN)
         errorstream << ", ";
       error = DEEP_ERROR;
-
-      errorstream << "digest " << candidate.digest
-                  << " != known digest " << auth.digest;
+      errorstream << "data_digest " << candidate.digest
+		  << " != "
+		  << (auth_oi.is_data_digest() && okseed ? "known" : "best guess")
+		  << " data_digest " << auth.digest
+		  << " from auth shard " << auth_shard;
     }
   }
   if (auth.omap_digest_present && candidate.omap_digest_present) {
@@ -400,9 +402,11 @@ enum scrub_error_type PGBackend::be_compare_scrub_objects(
       if (error != CLEAN)
         errorstream << ", ";
       error = DEEP_ERROR;
-
       errorstream << "omap_digest " << candidate.omap_digest
-                  << " != known omap_digest " << auth.omap_digest;
+		  << " != "
+		  << (auth_oi.is_omap_digest() && okseed ? "known" : "best guess")
+		  << " omap_digest " << auth.omap_digest
+		  << " from auth shard " << auth_shard;
     }
   }
   // Shallow error takes precendence because this will be seen by