From 561760455663831d6145f17c014b902ede7d1840 Mon Sep 17 00:00:00 2001 From: Josh Durgin Date: Fri, 21 Jul 2017 15:02:53 -0400 Subject: [PATCH] osd/PrimaryLogPG: skip deleted missing objects in pg[n]ls Fixes: http://tracker.ceph.com/issues/20739 Signed-off-by: Josh Durgin --- src/osd/PrimaryLogPG.cc | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/osd/PrimaryLogPG.cc b/src/osd/PrimaryLogPG.cc index 245fc88a8fae9..8a5d3e06c5311 100644 --- a/src/osd/PrimaryLogPG.cc +++ b/src/osd/PrimaryLogPG.cc @@ -1242,6 +1242,9 @@ void PrimaryLogPG::do_pg_op(OpRequestRef op) if (candidate.get_namespace() == cct->_conf->osd_hit_set_namespace) continue; + if (missing_loc.is_deleted(candidate)) + continue; + // skip wrong namespace if (m->get_hobj().nspace != librados::all_nspaces && candidate.get_namespace() != m->get_hobj().nspace) @@ -1398,6 +1401,9 @@ void PrimaryLogPG::do_pg_op(OpRequestRef op) if (candidate.get_namespace() != m->get_hobj().nspace) continue; + if (missing_loc.is_deleted(candidate)) + continue; + if (filter && !pgls_filter(filter, candidate, filter_out)) continue; -- 2.39.5