osd: Remove dead code related to old pg removal mechanism

Signed-off-by: David Zafman <dzafman@redhat.com>

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index f1c28457cb6a3737763ca9d90d07e5e2b10525f1..1aa591f605ada63db27ed458c3418b41938f406d 100644 (file)
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -1560,7 +1560,6 @@ OSD::OSD(CephContext *cct_, ObjectStore *store_,
   scrub_finalize_wq(cct->_conf->osd_scrub_finalize_thread_timeout, &osd_tp),
   rep_scrub_wq(this, cct->_conf->osd_scrub_thread_timeout, &disk_tp),
   remove_wq(store, cct->_conf->osd_remove_thread_timeout, &disk_tp),
-  next_removal_seq(0),
   service(this)
 {
   monc->set_messenger(client_messenger);

diff --git a/src/osd/OSD.h b/src/osd/OSD.h
index edc9c8e5e30d0339dca6f33d2dce13964f65be85..fc8e8de763d5443ac6865999db114864862daf8b 100644 (file)
--- a/src/osd/OSD.h
+++ b/src/osd/OSD.h
@@ -2267,10 +2267,6 @@ protected:
       remove_queue.clear();
     }
   } remove_wq;
-  uint64_t next_removal_seq;
-  coll_t get_next_removal_coll(spg_t pgid) {
-    return coll_t::make_removal_coll(next_removal_seq++, pgid);
-  }
 
  private:
   bool ms_can_fast_dispatch_any() const { return true; }

diff --git a/src/osd/osd_types.h b/src/osd/osd_types.h
index c6d2347d4b40ed626f4cbfc51ae58a3abedce6c4..266a15f46f5d8f730c1b86ad12b7a29fbb595fc5 100644 (file)
--- a/src/osd/osd_types.h
+++ b/src/osd/osd_types.h
@@ -480,10 +480,6 @@ public:
     return coll_t(pg_to_tmp_str(pgid));
   }
 
-  static coll_t make_removal_coll(uint64_t seq, spg_t pgid) {
-    return coll_t(seq_to_removal_str(seq, pgid));
-  }
-
   const std::string& to_str() const {
     return str;
   }
@@ -523,11 +519,6 @@ private:
     oss << p << "_TEMP";
     return oss.str();
   }
-  static std::string seq_to_removal_str(uint64_t seq, spg_t pgid) {
-    std::ostringstream oss;
-    oss << "FORREMOVAL_" << seq << "_" << pgid;
-    return oss.str();
-  }
 
   std::string str;
 };