From 34124eaa00d8dd6190b13b2cbdcd1036d162d016 Mon Sep 17 00:00:00 2001 From: David Zafman Date: Tue, 15 May 2018 17:32:50 -0700 Subject: [PATCH] osd: Clear part of cleaned_meta_map in case of a restarted smaller chunk This can not happen at the primary because scrub_compare_maps() is only called once per chunk start. Preemption causes a smaller chunk from start to be processed again at replicas. We clear any of the previous chunk's information. Signed-off-by: David Zafman (cherry picked from commit 9e0ac797c602a088447679b04e14ec0cfaf9dd7b) --- src/osd/PG.cc | 2 ++ src/osd/osd_types.h | 3 +++ 2 files changed, 5 insertions(+) diff --git a/src/osd/PG.cc b/src/osd/PG.cc index 5877a32280df7..e0734ecd68a9d 100644 --- a/src/osd/PG.cc +++ b/src/osd/PG.cc @@ -4297,6 +4297,8 @@ int PG::build_scrub_map_chunk( _repair_oinfo_oid(map); if (!is_primary()) { ScrubMap for_meta_scrub; + // In case we restarted smaller chunk, clear old data + scrubber.cleaned_meta_map.clear_from(scrubber.start); scrubber.cleaned_meta_map.insert(map); scrubber.clean_meta_map(for_meta_scrub); _scan_snaps(for_meta_scrub); diff --git a/src/osd/osd_types.h b/src/osd/osd_types.h index d1a788b913e4f..ec268b118c6fc 100644 --- a/src/osd/osd_types.h +++ b/src/osd/osd_types.h @@ -4968,6 +4968,9 @@ struct ScrubMap { bool has_large_omap_object_errors:1; void merge_incr(const ScrubMap &l); + void clear_from(const hobject_t& start) { + objects.erase(objects.lower_bound(start), objects.end()); + } void insert(const ScrubMap &r) { objects.insert(r.objects.begin(), r.objects.end()); } -- 2.39.5