RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-20 10:01:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

os/bluestore: release deferred throttle on io finish, before cleanup

Browse Source 
The throttle is really about limiting deferred IO; we do not need to
actually remove the deferred record from the kv db before queueing more.
(In fact, the txc that queues more will do the cleanup.)

Signed-off-by: Sage Weil <sage@redhat.com>
This commit is contained in:
Sage Weil 2017-03-08 14:57:52 -05:00
parent eff1e83145
commit 78df9b3e4d
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/os/bluestore/BlueStore.cc
View File

@ -7494,8 +7494,6 @@ void BlueStore::_txc_finish(TransContext *txc)
txc->removed_collections.pop_front();
}
_op_queue_release_deferred_throttle(txc);
OpSequencerRef osr = txc->osr;
{
std::lock_guard<std::mutex> l(osr->qlock);
@ -7726,6 +7724,7 @@ int BlueStore::_deferred_finish(TransContext *txc)
std::lock_guard<std::mutex> l(kv_lock);
txc->state = TransContext::STATE_DEFERRED_CLEANUP;
txc->osr->qcond.notify_all();
_op_queue_release_deferred_throttle(txc);
deferred_cleanup_queue.push_back(txc);
kv_cond.notify_one();
return 0;
@ -7856,7 +7855,8 @@ int BlueStore::queue_transactions(
handle->suspend_tp_timeout();
_op_queue_reserve_throttle(txc);
_op_queue_reserve_deferred_throttle(txc);
if (txc->deferred_txn)
_op_queue_reserve_deferred_throttle(txc);
if (handle)
handle->reset_tp_timeout();