From: Sage Weil <sage@redhat.com>
Date: Wed, 8 Feb 2017 22:01:47 +0000 (-0500)
Subject: osd/PG: drop get_sort_bitwise() accessors, flag
X-Git-Tag: v12.0.1~427^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=75d7a5c85f9075124d61c273d202dd2cdb96fa18;p=ceph.git

osd/PG: drop get_sort_bitwise() accessors, flag

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

diff --git a/src/osd/PG.cc b/src/osd/PG.cc
index 1275caaea533a..c31cc7bd32625 100644
--- a/src/osd/PG.cc
+++ b/src/osd/PG.cc
@@ -259,7 +259,6 @@ PG::PG(OSDService *o, OSDMapRef curmap,
   peer_features(CEPH_FEATURES_SUPPORTED_DEFAULT),
   acting_features(CEPH_FEATURES_SUPPORTED_DEFAULT),
   upacting_features(CEPH_FEATURES_SUPPORTED_DEFAULT),
-  do_sort_bitwise(false),
   last_epoch(0)
 {
 #ifdef PG_DEBUG_REFS
@@ -5325,7 +5324,7 @@ void PG::on_new_interval()
     upacting_features &= osdmap->get_xinfo(*p).features;
   }
 
-  do_sort_bitwise = osdmap->test_flag(CEPH_OSDMAP_SORTBITWISE);
+  assert(osdmap->test_flag(CEPH_OSDMAP_SORTBITWISE));
 
   _on_new_interval();
 }
diff --git a/src/osd/PG.h b/src/osd/PG.h
index 3c2f0aa995d85..ab81b9a9696af 100644
--- a/src/osd/PG.h
+++ b/src/osd/PG.h
@@ -2082,7 +2082,6 @@ public:
   uint64_t acting_features;
   uint64_t upacting_features;
 
-  bool do_sort_bitwise;
   epoch_t last_epoch;
 
  public:
@@ -2097,11 +2096,6 @@ public:
   uint64_t get_min_acting_features() const { return acting_features; }
   uint64_t get_min_upacting_features() const { return upacting_features; }
 
-  /// true if we will sort hobjects bitwise for this pg interval
-  bool get_sort_bitwise() const {
-    return do_sort_bitwise;
-  }
-
   void init_primary_up_acting(
     const vector<int> &newup,
     const vector<int> &newacting,
diff --git a/src/osd/PGBackend.h b/src/osd/PGBackend.h
index e6991ed3975bd..2470d377f2ca1 100644
--- a/src/osd/PGBackend.h
+++ b/src/osd/PGBackend.h
@@ -243,7 +243,6 @@ typedef ceph::shared_ptr<const OSDMap> OSDMapRef;
      virtual pg_shard_t primary_shard() const = 0;
 
      virtual uint64_t min_peer_features() const = 0;
-     virtual bool sort_bitwise() const = 0;
 
      virtual hobject_t get_temp_recovery_object(eversion_t version,
 						snapid_t snap) = 0;
diff --git a/src/osd/PrimaryLogPG.h b/src/osd/PrimaryLogPG.h
index ff147da30086b..69aa55d1d5f1b 100644
--- a/src/osd/PrimaryLogPG.h
+++ b/src/osd/PrimaryLogPG.h
@@ -433,9 +433,6 @@ public:
   uint64_t min_peer_features() const override {
     return get_min_peer_features();
   }
-  bool sort_bitwise() const override {
-    return get_sort_bitwise();
-  }
 
   void send_message_osd_cluster(
     int peer, Message *m, epoch_t from_epoch) override;