From d8dd744b07fc3f53cb1ba9f1e97e60fb370761b5 Mon Sep 17 00:00:00 2001 From: Adam Kupczyk Date: Wed, 23 Nov 2022 11:20:25 +0000 Subject: [PATCH] os/bluestore: Refactor TransContext Modified TransContext. Changed std::set shared_blobs_written to std::set blobs_written Signed-off-by: Adam Kupczyk --- src/os/bluestore/BlueStore.cc | 6 +++--- src/os/bluestore/BlueStore.h | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/os/bluestore/BlueStore.cc b/src/os/bluestore/BlueStore.cc index c7cfbf9029c0f..a43bcc2faeb61 100644 --- a/src/os/bluestore/BlueStore.cc +++ b/src/os/bluestore/BlueStore.cc @@ -13007,10 +13007,10 @@ void BlueStore::_txc_finish(TransContext *txc) dout(20) << __func__ << " " << txc << " onodes " << txc->onodes << dendl; ceph_assert(txc->get_state() == TransContext::STATE_FINISHING); - for (auto& sb : txc->shared_blobs_written) { - sb->finish_write(txc->seq); + for (auto& sb : txc->blobs_written) { + sb->shared_blob->finish_write(txc->seq); } - txc->shared_blobs_written.clear(); + txc->blobs_written.clear(); while (!txc->removed_collections.empty()) { _queue_reap_collection(txc->removed_collections.front()); diff --git a/src/os/bluestore/BlueStore.h b/src/os/bluestore/BlueStore.h index e2ed810c0b358..ef54b780ee4d8 100644 --- a/src/os/bluestore/BlueStore.h +++ b/src/os/bluestore/BlueStore.h @@ -1789,7 +1789,7 @@ private: #endif std::set shared_blobs; ///< these need to be updated/written - std::set shared_blobs_written; ///< update these on io completion + std::set blobs_written; ///< update these on io completion KeyValueDB::Transaction t; ///< then we will commit this std::list oncommits; ///< more commit completions @@ -2825,7 +2825,7 @@ private: unsigned flags) { b->shared_blob->bc.write(b->shared_blob->get_cache(), txc->seq, offset, bl, flags); - txc->shared_blobs_written.insert(b->shared_blob); + txc->blobs_written.insert(b); } int _collection_list( -- 2.39.5