mirrors/scylladb
1
0
Fork 0
mirror of https://github.com/scylladb/scylladb.git synced 2026-04-19 16:15:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

sstables: Remove ignore_component_digest_mismatch from sstable_open_config

Browse Source 
The ignore_component_digest_mismatch flag is now initialized at sstable construction
time from sstables_manager::config (which is populated from db::config at boot time).
Remove the flag from sstable_open_config struct and all call sites that were setting
it explicitly.

Signed-off-by: Pavel Emelyanov <xemul@scylladb.com>
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
Pavel Emelyanov
2026-04-16 13:43:31 +03:00
parent 9107e055b3
commit 4d352c7cf5
6 changed files with 6 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
replica/distributed_loader.cc
View File

@@ -186,9 +186,6 @@ distributed_loader::process_upload_dir(sharded<replica::database>& db, sharded<d
.need_mutate_level = true,
.enable_dangerous_direct_import_of_cassandra_counters = db.local().get_config().enable_dangerous_direct_import_of_cassandra_counters(),
.allow_loading_materialized_view = false,
.sstable_open_config = {
.ignore_component_digest_mismatch = db.local().get_config().ignore_component_digest_mismatch(),
},
};
process_sstable_dir(directory, flags).get();
@@ -381,9 +378,6 @@ future<> table_populator::process_subdir(sharded<sstables::sstable_directory>& d
.enable_dangerous_direct_import_of_cassandra_counters = _db.local().get_config().enable_dangerous_direct_import_of_cassandra_counters(),
.allow_loading_materialized_view = true,
.garbage_collect = true,
.sstable_open_config = {
.ignore_component_digest_mismatch = _db.local().get_config().ignore_component_digest_mismatch(),
},
};
co_await distributed_loader::process_sstable_dir(directory, flags);

6
service/storage_service.cc
View File

@@ -4873,8 +4873,7 @@ future<> storage_service::clone_locally_tablet_storage(locator::global_tablet_id
});
rtlogger.debug("Cloned storage of tablet {} from leaving replica {}, {} sstables were found", tablet, leaving, d.size());
auto ignore_digest_mismatch = _db.local().get_config().ignore_component_digest_mismatch();
auto load_sstable = [leave_unsealed, ignore_digest_mismatch] (const dht::sharder& sharder, replica::table& t, sstables::entry_descriptor d) -> future<sstables::shared_sstable> {
auto load_sstable = [leave_unsealed] (const dht::sharder& sharder, replica::table& t, sstables::entry_descriptor d) -> future<sstables::shared_sstable> {
auto& mng = t.get_sstables_manager();
auto sst = mng.make_sstable(t.schema(), t.get_storage_options(), d.generation, d.state.value_or(sstables::sstable_state::normal),
d.version, d.format, db_clock::now(), default_io_error_handler_gen());
@@ -4883,8 +4882,7 @@ future<> storage_service::clone_locally_tablet_storage(locator::global_tablet_id
// SSTables will be loaded at pending replica and migration is retried, so correctness
// wise, we're good.
auto cfg = sstables::sstable_open_config{ .current_shard_as_sstable_owner = true,
.unsealed_sstable = leave_unsealed,
.ignore_component_digest_mismatch = ignore_digest_mismatch };
.unsealed_sstable = leave_unsealed };
co_await sst->load(sharder, cfg);
co_return sst;
};

4
sstables/open_info.hh
View File

@@ -85,10 +85,6 @@ struct sstable_open_config {
bool keep_sharding_metadata = false;
// Allows unsealed sstable to be loaded, since it must read components from temporary TOC instead.
bool unsealed_sstable = false;
// When true, log a warning instead of throwing on component digest mismatch.
// Useful for recovering sstables with corrupted non-vital components or
// working around bugs in digest calculation.
bool ignore_component_digest_mismatch = false;
};
}

3
sstables_loader.cc
View File

@@ -222,7 +222,6 @@ private:
auto units = co_await sst_manager.dir_semaphore().get_units(1);
sstables::sstable_open_config cfg {
.unsealed_sstable = true,
.ignore_component_digest_mismatch = db.get_config().ignore_component_digest_mismatch(),
};
co_await sst->load(table.get_effective_replication_map()->get_sharder(*table.schema()), cfg);
co_await table.add_new_sstable_and_update_cache(sst, [&sst_manager, sst] (sstables::shared_sstable loading_sst) -> future<> {
@@ -774,7 +773,6 @@ future<> sstables_loader::load_new_sstables(sstring ks_name, sstring cf_name,
// that might otherwise consume a significant amount of memory.
sstables::sstable_open_config cfg {
.load_bloom_filter = false,
.ignore_component_digest_mismatch = _db.local().get_config().ignore_component_digest_mismatch(),
};
std::tie(table_id, sstables_on_shards) = co_await replica::distributed_loader::get_sstables_from_upload_dir(_db, ks_name, cf_name, cfg);
co_await container().invoke_on_all([&sstables_on_shards, ks_name, cf_name, table_id, primary, scope] (sstables_loader& loader) mutable -> future<> {
@@ -901,7 +899,6 @@ future<> sstables_loader::download_task_impl::run() {
// that might otherwise consume a significant amount of memory.
sstables::sstable_open_config cfg {
.load_bloom_filter = false,
.ignore_component_digest_mismatch = _loader.local()._db.local().get_config().ignore_component_digest_mismatch(),
};
llog.debug("Loading sstables from {}({}/{})", _endpoint, _bucket, _prefix);

3
streaming/stream_blob.cc
View File

@@ -53,8 +53,7 @@ static future<> load_sstable_for_tablet(const file_stream_id& ops_id, replica::d
auto erm = t.get_effective_replication_map();
auto& sstm = t.get_sstables_manager();
auto sst = sstm.make_sstable(t.schema(), t.get_storage_options(), desc.generation, state, desc.version, desc.format);
sstables::sstable_open_config cfg { .unsealed_sstable = true,
.ignore_component_digest_mismatch = db.get_config().ignore_component_digest_mismatch() };
sstables::sstable_open_config cfg { .unsealed_sstable = true };
co_await sst->load(erm->get_sharder(*t.schema()), cfg);
auto on_add = [sst, &sstm] (sstables::shared_sstable loading_sst) -> future<> {
if (loading_sst == sst) {

8
tools/scylla-sstable.cc
View File

@@ -322,11 +322,11 @@ std::optional<schema_with_source> try_load_schema_autodetect(const bpo::variable
}
const std::vector<sstables::shared_sstable> load_sstables(schema_ptr schema, sstables::sstables_manager& sst_man, sstables::storage_manager& sstm,
const std::vector<sstring>& sstable_names, bool ignore_component_digest_mismatch) {
const std::vector<sstring>& sstable_names) {
std::vector<sstables::shared_sstable> sstables;
sstables.resize(sstable_names.size());
parallel_for_each(sstable_names, [schema, &sst_man, &sstm, &sstable_names, &sstables, ignore_component_digest_mismatch] (const sstring& sst_name) -> future<> {
parallel_for_each(sstable_names, [schema, &sst_man, &sstm, &sstable_names, &sstables] (const sstring& sst_name) -> future<> {
const auto i = std::distance(sstable_names.begin(), std::find(sstable_names.begin(), sstable_names.end(), sst_name));
auto sst_path = std::filesystem::path(sst_name);
@@ -370,7 +370,6 @@ const std::vector<sstables::shared_sstable> load_sstables(schema_ptr schema, sst
auto open_cfg = sstables::sstable_open_config{
.load_first_and_last_position_metadata = false,
.keep_sharding_metadata = true,
.ignore_component_digest_mismatch = ignore_component_digest_mismatch,
};
co_await sst->load(schema->get_sharder(), open_cfg);
} catch (...) {
@@ -3015,9 +3014,8 @@ $ scylla sstable validate /path/to/md-123456-big-Data.db /path/to/md-123457-big-
fmt::print(std::cerr, "error processing arguments: duplicate sstable arguments found\n");
return 1;
}
bool ignore_component_digest_mismatch = app_config.contains("ignore-component-digest-mismatch");
try {
sstables = load_sstables(schema, sst_man, sstm.local(), sstable_names, ignore_component_digest_mismatch);
sstables = load_sstables(schema, sst_man, sstm.local(), sstable_names);
} catch (...) {
fmt::print(std::cerr, "error loading sstables: {}\n", std::current_exception());
return 1;