From: Sage Weil <sage@redhat.com>
Date: Wed, 8 Feb 2017 21:42:59 +0000 (-0500)
Subject: osd/osd_types: drop bitwise from ScrubMap
X-Git-Tag: v12.0.1~427^2~8
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=b052e497a511d32ff79035473e1416fc5e6b2d69;p=ceph-ci.git

osd/osd_types: drop bitwise from ScrubMap

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/osd/PG.cc b/src/osd/PG.cc
index 13e063472ca..3d61b7d3d1e 100644
--- a/src/osd/PG.cc
+++ b/src/osd/PG.cc
@@ -4323,8 +4323,6 @@ void PG::chunky_scrub(ThreadPool::TPHandle &handle)
       case PG::Scrubber::INACTIVE:
         dout(10) << "scrub start" << dendl;
 
-	scrubber.cleaned_meta_map.reset_bitwise(get_sort_bitwise());
-
         publish_stats_to_osd();
         scrubber.epoch_start = info.history.same_interval_since;
         scrubber.active = true;
@@ -4666,7 +4664,7 @@ void PG::scrub_compare_maps()
     }
   }
 
-  ScrubMap for_meta_scrub(get_sort_bitwise());
+  ScrubMap for_meta_scrub;
   if (scrubber.end.is_max() ||
       scrubber.cleaned_meta_map.objects.empty()) {
     scrubber.cleaned_meta_map.swap(for_meta_scrub);
diff --git a/src/osd/osd_types.h b/src/osd/osd_types.h
index c335d3ed44d..74f50022847 100644
--- a/src/osd/osd_types.h
+++ b/src/osd/osd_types.h
@@ -4735,15 +4735,10 @@ struct ScrubMap {
   };
   WRITE_CLASS_ENCODER(object)
 
-  bool bitwise; // ephemeral, not encoded
   map<hobject_t,object> objects;
   eversion_t valid_through;
   eversion_t incr_since;
 
-  ScrubMap() : bitwise(true) {}
-  ScrubMap(bool bitwise)
-    : bitwise(bitwise) {}
-
   void merge_incr(const ScrubMap &l);
   void insert(const ScrubMap &r) {
     objects.insert(r.objects.begin(), r.objects.end());
@@ -4757,15 +4752,6 @@ struct ScrubMap {
   void encode(bufferlist& bl) const;
   void decode(bufferlist::iterator& bl, int64_t pool=-1);
   void dump(Formatter *f) const;
-  void reset_bitwise(bool new_bitwise) {
-    if (bitwise == new_bitwise)
-      return;
-    map<hobject_t, object> new_objects(
-      objects.begin(),
-      objects.end());
-    ::swap(new_objects, objects);
-    bitwise = new_bitwise;
-  }
   static void generate_test_instances(list<ScrubMap*>& o);
 };
 WRITE_CLASS_ENCODER(ScrubMap::object)