]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
osd: fix omap digest compare when scrub 9271/head
authorXinze Chi <xinze@xsky.com>
Mon, 23 May 2016 13:38:39 +0000 (21:38 +0800)
committerXinze Chi <xinze@xsky.com>
Mon, 23 May 2016 14:00:48 +0000 (22:00 +0800)
Introduce by fe1c28dea4e5607a0c72eab1f046074616cd55a7.

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

index 2b897d7f8e0b764daf54bfdbe8501ffb52fc9767..ef8012df6316ec720d0c54753e84c1bb3f4f31ba 100644 (file)
@@ -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;
       }