Skip to content

Commit bef277a

Browse files
committed
Revert "os/bluestore: Add debug hooks"
This reverts commit cbfc24d. Signed-off-by: Matan Breizman <[email protected]>
1 parent 6f8275c commit bef277a

File tree

2 files changed

+1
-22
lines changed

2 files changed

+1
-22
lines changed

src/os/bluestore/BlueStore.cc

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7361,7 +7361,7 @@ int BlueStore::_init_alloc()
73617361
<< ", free 0x" << alloc->get_free()
73627362
<< ", fragmentation " << alloc->get_fragmentation()
73637363
<< std::dec << dendl;
7364-
if (tracepoint_debug_init_alloc_done) tracepoint_debug_init_alloc_done();
7364+
73657365
return 0;
73667366
}
73677367

@@ -15526,7 +15526,6 @@ int BlueStore::_deferred_replay()
1552615526
fake_ch = true;
1552715527
}
1552815528
OpSequencer *osr = static_cast<OpSequencer*>(ch->osr.get());
15529-
if (tracepoint_debug_deferred_replay_start) tracepoint_debug_deferred_replay_start();
1553015529
KeyValueDB::Iterator it = db->get_iterator(PREFIX_DEFERRED);
1553115530
for (it->lower_bound(string()); it->valid(); it->next(), ++count) {
1553215531
dout(20) << __func__ << " replay " << pretty_binary_string(it->key())
@@ -15546,7 +15545,6 @@ int BlueStore::_deferred_replay()
1554615545
}
1554715546
bool has_some = _eliminate_outdated_deferred(deferred_txn, bluefs_extents);
1554815547
if (has_some) {
15549-
if (tracepoint_debug_deferred_replay_track) tracepoint_debug_deferred_replay_track(*deferred_txn);
1555015548
TransContext *txc = _txc_create(ch.get(), osr, nullptr);
1555115549
txc->deferred_txn = deferred_txn;
1555215550
txc->set_state(TransContext::STATE_KV_DONE);
@@ -15559,7 +15557,6 @@ int BlueStore::_deferred_replay()
1555915557
dout(20) << __func__ << " draining osr" << dendl;
1556015558
_osr_register_zombie(osr);
1556115559
_osr_drain_all();
15562-
if (tracepoint_debug_deferred_replay_end) tracepoint_debug_deferred_replay_end();
1556315560
if (fake_ch) {
1556415561
new_coll_map.clear();
1556515562
}

src/os/bluestore/BlueStore.h

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -3604,19 +3604,6 @@ class BlueStore : public ObjectStore,
36043604
void debug_set_prefer_deferred_size(uint64_t s) {
36053605
prefer_deferred_size = s;
36063606
}
3607-
void set_tracepoint_debug_deferred_replay_start(std::function<void()> action) {
3608-
tracepoint_debug_deferred_replay_start = action;
3609-
}
3610-
void set_tracepoint_debug_deferred_replay_end(std::function<void()> action) {
3611-
tracepoint_debug_deferred_replay_end = action;
3612-
}
3613-
void set_tracepoint_debug_deferred_replay_track(
3614-
std::function<void(const bluestore_deferred_transaction_t&)> action) {
3615-
tracepoint_debug_deferred_replay_track = action;
3616-
}
3617-
void set_tracepoint_debug_init_alloc_done(std::function<void()> action) {
3618-
tracepoint_debug_init_alloc_done = action;
3619-
}
36203607
inline void log_latency(const char* name,
36213608
int idx,
36223609
const ceph::timespan& lat,
@@ -3632,11 +3619,6 @@ class BlueStore : public ObjectStore,
36323619
int idx2 = l_bluestore_first);
36333620

36343621
private:
3635-
std::function<void()> tracepoint_debug_deferred_replay_start = nullptr;
3636-
std::function<void()> tracepoint_debug_deferred_replay_end = nullptr;
3637-
std::function<void(const bluestore_deferred_transaction_t&)>
3638-
tracepoint_debug_deferred_replay_track = nullptr;
3639-
std::function<void()> tracepoint_debug_init_alloc_done = nullptr;
36403622
bool _debug_data_eio(const ghobject_t& o) {
36413623
if (!cct->_conf->bluestore_debug_inject_read_err) {
36423624
return false;

0 commit comments

Comments
 (0)