From d3eae0a01ae8d33988ffccee1f0af145aa10fa33 Mon Sep 17 00:00:00 2001 From: Xinze Chi Date: Mon, 23 May 2016 21:38:39 +0800 Subject: [PATCH] osd: fix omap digest compare when scrub Introduce by fe1c28dea4e5607a0c72eab1f046074616cd55a7. Fixes: http://tracker.ceph.com/issues/16000 Signed-off-by: Xinze Chi --- src/osd/PGBackend.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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; } -- 2.47.3