osd: remove some unused methods

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

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index e0fc34152a4afd9f2e3cc6f3a93e06397e0eb19f..675997842f0c7f70f979d5c008a58b82c1228109 100644 (file)
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -3244,8 +3244,6 @@ int OSD::shutdown()
     finished.clear(); // zap waiters (bleh, this is messy)
   }
 
-  op_shardedwq.clear_pg_slots();
-
   // unregister commands
   cct->get_admin_socket()->unregister_command("status");
   cct->get_admin_socket()->unregister_command("flush_journal");
@@ -9474,36 +9472,6 @@ void OSDShard::unprime_split_children(spg_t parent, unsigned old_pg_num)
 #undef dout_prefix
 #define dout_prefix *_dout << "osd." << osd->whoami << " op_wq "
 
-void OSD::ShardedOpWQ::wake_pg_split_waiters(spg_t pgid)
-{
-  uint32_t shard_index = pgid.hash_to_shard(osd->shards.size());
-  auto sdata = osd->shards[shard_index];
-  bool queued = false;
-  {
-    Mutex::Locker l(sdata->sdata_op_ordering_lock);
-    auto p = sdata->pg_slots.find(pgid);
-    if (p != sdata->pg_slots.end()) {
-      sdata->_wake_pg_slot(pgid, p->second);
-      queued = true;
-    }
-  }
-  if (queued) {
-    sdata->sdata_lock.Lock();
-    sdata->sdata_cond.SignalOne();
-    sdata->sdata_lock.Unlock();
-  }
-}
-
-void OSD::ShardedOpWQ::clear_pg_slots()
-{
-  for (auto sdata : osd->shards) {
-    Mutex::Locker l(sdata->sdata_op_ordering_lock);
-    sdata->pg_slots.clear();
-    sdata->osdmap.reset();
-    // don't bother with reserved pushes; we are shutting down
-  }
-}
-
 void OSD::ShardedOpWQ::_add_slot_waiter(
   spg_t pgid,
   OSDShard::pg_slot& slot,

diff --git a/src/osd/OSD.h b/src/osd/OSD.h
index 6733be994f5ff0522ce4ea4aebca5cc60fc5cae5..c0ab3e8e576d8505e18ccae2823fbaea6a241a76 100644 (file)
--- a/src/osd/OSD.h
+++ b/src/osd/OSD.h
@@ -1657,12 +1657,6 @@ protected:
       OSDShard::pg_slot& slot,
       OpQueueItem&& qi);
 
-    /// wake any pg waiters after a PG is split
-    void wake_pg_split_waiters(spg_t pgid);
-
-    /// clear pg_slots on shutdown
-    void clear_pg_slots();
-
     /// try to do some work
     void _process(uint32_t thread_index, heartbeat_handle_d *hb) override;