From: Matan Breizman Date: Tue, 11 Mar 2025 09:13:30 +0000 (+0000) Subject: Revert "os/bluestore: Add debug hooks" X-Git-Tag: v20.3.0~397^2 X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F62214%2Fhead;p=ceph.git Revert "os/bluestore: Add debug hooks" This reverts commit cbfc24dd7e9b3d13b76c340b60d8d56f13f75ae6. Signed-off-by: Matan Breizman --- diff --git a/src/os/bluestore/BlueStore.cc b/src/os/bluestore/BlueStore.cc index 255373ddfc338..7dca7f49f1e51 100644 --- a/src/os/bluestore/BlueStore.cc +++ b/src/os/bluestore/BlueStore.cc @@ -7361,7 +7361,7 @@ int BlueStore::_init_alloc() << ", free 0x" << alloc->get_free() << ", fragmentation " << alloc->get_fragmentation() << std::dec << dendl; - if (tracepoint_debug_init_alloc_done) tracepoint_debug_init_alloc_done(); + return 0; } @@ -15526,7 +15526,6 @@ int BlueStore::_deferred_replay() fake_ch = true; } OpSequencer *osr = static_cast(ch->osr.get()); - if (tracepoint_debug_deferred_replay_start) tracepoint_debug_deferred_replay_start(); KeyValueDB::Iterator it = db->get_iterator(PREFIX_DEFERRED); for (it->lower_bound(string()); it->valid(); it->next(), ++count) { dout(20) << __func__ << " replay " << pretty_binary_string(it->key()) @@ -15546,7 +15545,6 @@ int BlueStore::_deferred_replay() } bool has_some = _eliminate_outdated_deferred(deferred_txn, bluefs_extents); if (has_some) { - if (tracepoint_debug_deferred_replay_track) tracepoint_debug_deferred_replay_track(*deferred_txn); TransContext *txc = _txc_create(ch.get(), osr, nullptr); txc->deferred_txn = deferred_txn; txc->set_state(TransContext::STATE_KV_DONE); @@ -15559,7 +15557,6 @@ int BlueStore::_deferred_replay() dout(20) << __func__ << " draining osr" << dendl; _osr_register_zombie(osr); _osr_drain_all(); - if (tracepoint_debug_deferred_replay_end) tracepoint_debug_deferred_replay_end(); if (fake_ch) { new_coll_map.clear(); } diff --git a/src/os/bluestore/BlueStore.h b/src/os/bluestore/BlueStore.h index 8fa184efa1654..b535d16bba56f 100644 --- a/src/os/bluestore/BlueStore.h +++ b/src/os/bluestore/BlueStore.h @@ -3604,19 +3604,6 @@ public: void debug_set_prefer_deferred_size(uint64_t s) { prefer_deferred_size = s; } - void set_tracepoint_debug_deferred_replay_start(std::function action) { - tracepoint_debug_deferred_replay_start = action; - } - void set_tracepoint_debug_deferred_replay_end(std::function action) { - tracepoint_debug_deferred_replay_end = action; - } - void set_tracepoint_debug_deferred_replay_track( - std::function action) { - tracepoint_debug_deferred_replay_track = action; - } - void set_tracepoint_debug_init_alloc_done(std::function action) { - tracepoint_debug_init_alloc_done = action; - } inline void log_latency(const char* name, int idx, const ceph::timespan& lat, @@ -3632,11 +3619,6 @@ public: int idx2 = l_bluestore_first); private: - std::function tracepoint_debug_deferred_replay_start = nullptr; - std::function tracepoint_debug_deferred_replay_end = nullptr; - std::function - tracepoint_debug_deferred_replay_track = nullptr; - std::function tracepoint_debug_init_alloc_done = nullptr; bool _debug_data_eio(const ghobject_t& o) { if (!cct->_conf->bluestore_debug_inject_read_err) { return false;