From: Xinze Chi <xinze@xsky.com>
Date: Mon, 23 May 2016 13:38:39 +0000 (+0800)
Subject: osd: fix omap digest compare when scrub
X-Git-Tag: v0.94.8~11^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F9271%2Fhead;p=ceph.git

osd: fix omap digest compare when scrub

Introduce by fe1c28dea4e5607a0c72eab1f046074616cd55a7.

Fixes: http://tracker.ceph.com/issues/16000
Signed-off-by: Xinze Chi <xinze@xsky.com>
---

diff --git a/src/osd/PGBackend.cc b/src/osd/PGBackend.cc
index 2b897d7f8e0..ef8012df631 100644
--- a/src/osd/PGBackend.cc
+++ b/src/osd/PGBackend.cc
@@ -664,7 +664,7 @@ void PGBackend::be_compare_scrubmaps(
       }
 
       if (auth_object.digest_present && auth_object.omap_digest_present &&
-	  (!auth_oi.is_data_digest() || !auth_oi.is_omap_digest())) {
+	  (!auth_oi.is_data_digest() || (!auth_oi.is_omap_digest() && auth_oi.is_omap()))) {
 	dout(20) << __func__ << " missing digest on " << *k << dendl;
 	update = MAYBE;
       }