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 1275caaea533a1e8d210eccbdc1bb13f7c30a4d3..c31cc7bd32625ea40845c527117e8f194f7742e0 100644 (file)
--- 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 3c2f0aa995d85c3ef6f7994403829c557f066813..ab81b9a9696af8de3a76fd6b64d543907ef09904 100644 (file)
--- 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 e6991ed3975bd783fcc110890d8ca6d1b0dc353c..2470d377f2ca1c77a4353e83ba2b6e9ed2a5b311 100644 (file)
--- 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 ff147da30086b83a63c7972ce8a7453ece849c92..69aa55d1d5f1b0fc40be2f3bb9b650d1fa89b3dd 100644 (file)
--- 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;