Merge pull request #9271 from XinzeChi/wip-fix-digest-hammer

osd: fix omap digest compare when scrub Reviewed-by: Samuel Just <sjust@redhat.com> Reviewed-by: David Zafman <dzafman@redhat.com> Reviewed-by: Nathan Cutler <ncutler@suse.com>
ceph · Aug 4, 2016 · da4f735 · da4f735
2 parents 4a12a88 + d3eae0a
commit da4f735
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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;
       }