crimson/tools: fixing tools according to osd shards number change modification

Signed-off-by: Chunmei Liu <chunmei.liu@ibm.com>

diff --git a/src/crimson/tools/objectstore/crimson_objectstore_tool.cc b/src/crimson/tools/objectstore/crimson_objectstore_tool.cc
index 1c6fe8995a1316dbcae8cd6d6612cb3ea68d910d..39e14022005cd1f878c4d873a270bceabb04fbd4 100644 (file)
--- a/src/crimson/tools/objectstore/crimson_objectstore_tool.cc
+++ b/src/crimson/tools/objectstore/crimson_objectstore_tool.cc
@@ -291,7 +291,8 @@ static seastar::future<int> action_on_all_objects(
 {
   auto pgs = co_await st.list_pgs();
 
-  for (const auto& [coll, shard_id] : pgs) {
+  for (const auto& [coll, shard_info] : pgs) {
+    auto [shard_id, store_index] = shard_info;
     if (pgid_filter.has_value()) {
       spg_t cand_pgid;
       if (!coll.is_pg(&cand_pgid)) {
@@ -327,7 +328,7 @@ static seastar::future<bool> find_shard_for_object(
     fmt::println(std::cerr, "PG '{}' not found for {} object", config.coll, object_type);
     co_return false;
   }
-  st.set_shard_id(it->second);
+  st.set_shard_id(it->second.first);
   co_return true;
 }
 

diff --git a/src/crimson/tools/store_nbd/fs_driver.cc b/src/crimson/tools/store_nbd/fs_driver.cc
index 6b58909021bf1b9629bcb3974ccb710003d6f2ce..e6c433dc31966a4691d5f6b6b1d5b9989b4256cf 100644 (file)
--- a/src/crimson/tools/store_nbd/fs_driver.cc
+++ b/src/crimson/tools/store_nbd/fs_driver.cc
@@ -289,7 +289,7 @@ seastar::future<> FSDriver::init()
     *config.path,
     crimson::common::local_conf().get_config_values()
   );
-  return fs->start().then([this] {
+  return fs->start().then([this](uint32_t store_shard_nums) {
     sharded_fs = &(fs->get_sharded_store());
   });
 }

diff --git a/src/crimson/tools/store_nbd/tm_driver.cc b/src/crimson/tools/store_nbd/tm_driver.cc
index d70edda030a5f9904bfc17bcef98cf90c1503c8a..2e485425f97b9ef18eb2bf3eb4bcf9801e420633 100644 (file)
--- a/src/crimson/tools/store_nbd/tm_driver.cc
+++ b/src/crimson/tools/store_nbd/tm_driver.cc
@@ -148,9 +148,9 @@ void TMDriver::init()
 
   std::vector<Device*> sec_devices;
 #ifndef NDEBUG
-  tm = make_transaction_manager(device.get(), sec_devices, shard_stats, true);
+  tm = make_transaction_manager(device.get(), sec_devices, shard_stats, 0, true);
 #else
-  tm = make_transaction_manager(device.get(), sec_devices, shard_stats, false);
+  tm = make_transaction_manager(device.get(), sec_devices, shard_stats, 0, false);
 #endif
 }