Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

os/blueStore: In osd_tp_thread, call _txc_finalize_kv. #14709

Merged
merged 1 commit into from May 4, 2017
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 1 addition & 2 deletions src/os/bluestore/BlueStore.cc
Expand Up @@ -7383,7 +7383,6 @@ void BlueStore::_txc_state_proc(TransContext *txc)
dout(20) << __func__ << " DEBUG randomly forcing submit via kv thread"
<< dendl;
} else {
_txc_finalize_kv(txc, txc->t);
txc->state = TransContext::STATE_KV_SUBMITTED;
int r = db->submit_transaction(txc->t);
assert(r == 0);
Expand Down Expand Up @@ -7939,7 +7938,6 @@ void BlueStore::_kv_sync_thread()
}
for (auto txc : kv_submitting) {
assert(txc->state == TransContext::STATE_KV_QUEUED);
_txc_finalize_kv(txc, txc->t);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This has to happen in kv_sync_thread when using ExtentFreelistManager. For the bitmap one it could be moved. Perhaps we should just drop the extent-based implementation....

txc->log_state_latency(logger, l_bluestore_state_kv_queued_lat);
int r = db->submit_transaction(txc->t);
assert(r == 0);
Expand Down Expand Up @@ -8308,6 +8306,7 @@ int BlueStore::queue_transactions(
txc->t->set(PREFIX_DEFERRED, key, bl);
}

_txc_finalize_kv(txc, txc->t);
if (handle)
handle->suspend_tp_timeout();

Expand Down