From aa40aeb72fa3659e826f652f0e8dae0a78b3d360 Mon Sep 17 00:00:00 2001 From: Pavel Emelyanov Date: Tue, 13 Aug 2024 12:36:30 +0300 Subject: [PATCH] sstable_directory: Log sst->get_filename(), not sstable_filename(desc) There are some places that log sstable Data file name via sstable descriptor. After previous patching all those loggers have sstable at hand and can use sstable::get_filename() instead. Signed-off-by: Pavel Emelyanov --- sstables/sstable_directory.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sstables/sstable_directory.cc b/sstables/sstable_directory.cc index e61fd66452..4e93598c80 100644 --- a/sstables/sstable_directory.cc +++ b/sstables/sstable_directory.cc @@ -193,7 +193,7 @@ sstable_directory::process_descriptor(sstables::entry_descriptor desc, process_f co_await sort_sstable(std::move(desc), flags); } else { auto sst = co_await load_sstable(std::move(desc), flags); - dirlog.debug("Added {} to unsorted sstables list", sstable_filename(desc)); + dirlog.debug("Added {} to unsorted sstables list", sst->get_filename()); _unsorted_sstables.push_back(std::move(sst)); } } @@ -204,14 +204,14 @@ sstable_directory::sort_sstable(sstables::entry_descriptor desc, process_flags f auto shards = sst->get_shards_for_this_sstable(); if (shards.size() == 1) { if (shards[0] == this_shard_id()) { - dirlog.trace("{} identified as a local unshared SSTable", sstable_filename(desc)); + dirlog.trace("{} identified as a local unshared SSTable", sst->get_filename()); _unshared_local_sstables.push_back(std::move(sst)); } else { - dirlog.trace("{} identified as a remote unshared SSTable, shard={}", sstable_filename(desc), shards[0]); + dirlog.trace("{} identified as a remote unshared SSTable, shard={}", sst->get_filename(), shards[0]); _unshared_remote_sstables[shards[0]].push_back(std::move(desc)); } } else { - dirlog.trace("{} identified as a shared SSTable, shards={}", sstable_filename(desc), shards); + dirlog.trace("{} identified as a shared SSTable, shards={}", sst->get_filename(), shards); _shared_sstable_info.push_back(co_await sst->get_open_info()); } }