From 9f84eb851d512515e57dc8f7ed093bf1673cee24 Mon Sep 17 00:00:00 2001 From: Igor Fedotov Date: Tue, 2 Sep 2025 16:09:54 +0300 Subject: [PATCH] os/bluestore: enable dummy db/txc in ExtentMap::reshard_action. Intended for UT simplication only. Signed-off-by: Igor Fedotov --- src/os/bluestore/BlueStore.cc | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/src/os/bluestore/BlueStore.cc b/src/os/bluestore/BlueStore.cc index a2f33c26b9f..d9c72984538 100644 --- a/src/os/bluestore/BlueStore.cc +++ b/src/os/bluestore/BlueStore.cc @@ -3757,11 +3757,13 @@ void BlueStore::ExtentMap::reshard_action( << shard_index_end << ")" << dendl; // Fault the range - fault_range(db, needs_reshard_begin, (needs_reshard_end - needs_reshard_begin)); + if (db) { + fault_range(db, needs_reshard_begin, (needs_reshard_end - needs_reshard_begin)); + } // Remove old shard keys string key; - for (unsigned i = shard_index_begin; i < shard_index_end; ++i) { + for (unsigned i = shard_index_begin; t && i < shard_index_end; ++i) { generate_extent_shard_key_and_apply( onode->key, shards[i].shard_info->offset, &key, [&](const string& final_key) { @@ -3816,13 +3818,15 @@ void BlueStore::ExtentMap::reshard_action( // identify new spanning blobs dout(20) << __func__ << " checking spanning blobs 0x[" << std::hex << spanning_scan_begin << "," << spanning_scan_end << ")" << dendl; - if (spanning_scan_begin < needs_reshard_begin) { - fault_range(db, spanning_scan_begin, - needs_reshard_begin - spanning_scan_begin); - } - if (spanning_scan_end > needs_reshard_end) { - fault_range(db, needs_reshard_end, - spanning_scan_end - needs_reshard_end); + if (db) { + if (spanning_scan_begin < needs_reshard_begin) { + fault_range(db, spanning_scan_begin, + needs_reshard_begin - spanning_scan_begin); + } + if (spanning_scan_end > needs_reshard_end) { + fault_range(db, needs_reshard_end, + spanning_scan_end - needs_reshard_end); + } } auto current_shard = extent_map_shards.begin() + shard_index_begin; auto end_shard = extent_map_shards.end(); -- 2.39.5