From 20eb8a2e95e354efef3c8357cf3204fb2e3be6a9 Mon Sep 17 00:00:00 2001 From: letterwuyu Date: Mon, 6 May 2019 14:49:03 +0800 Subject: [PATCH] osd: fix add_next_event about clean_regions Signed-off-by: lishuhao --- src/osd/osd_types.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/osd/osd_types.h b/src/osd/osd_types.h index f02febb4219..d48afd76f08 100644 --- a/src/osd/osd_types.h +++ b/src/osd/osd_types.h @@ -3772,7 +3772,7 @@ public: clean_offsets.insert(offset, len); } bool operator==(const ObjectCleanRegions &orc) const { - return clean_offsets == orc.clean_offsets && clean_omap == orc.clean_omap && max_num_intervals == orc.max_num_intervals; + return clean_offsets == orc.clean_offsets && clean_omap == orc.clean_omap && max_num_intervals == orc.max_num_intervals && new_object == orc.new_object; } void merge(const ObjectCleanRegions &other); @@ -4459,7 +4459,6 @@ public: // create new element in missing map // .have = nil missing[e.soid] = item(e.version, eversion_t(), e.is_delete()); - missing[e.soid].clean_regions = e.clean_regions; missing[e.soid].clean_regions.mark_fully_dirty(); } } else if (is_missing_divergent_item) { -- 2.39.5