From: letterwuyu <lishuhao@unitedstack.com>
Date: Mon, 6 May 2019 06:49:03 +0000 (+0800)
Subject: osd: fix add_next_event about clean_regions
X-Git-Tag: v15.1.0~2697^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=20eb8a2e95e354efef3c8357cf3204fb2e3be6a9;p=ceph.git

osd: fix add_next_event about clean_regions

Signed-off-by: lishuhao <lishuhao@unitedstack.com>
---

diff --git a/src/osd/osd_types.h b/src/osd/osd_types.h
index f02febb421911..d48afd76f089d 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) {