mirrors/scylladb
1
0
Fork 0
mirror of https://github.com/scylladb/scylladb.git synced 2026-05-29 11:10:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

sstables: replace rewrite_statistics with new rewrite component mechanism

Browse Source 
This commits migrates all callers that used rewrite_statistics to new
rewrite component mechanism.
This commit is contained in:
Taras Veretilnyk
2026-01-30 12:00:00 +01:00
parent 51c345aaf6
commit 5bbc44ed12
7 changed files with 147 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
test/boost/sstable_test.cc
View File

@@ -13,14 +13,18 @@
#include <seastar/core/do_with.hh>
#include <seastar/core/sleep.hh>
#include <seastar/core/smp.hh>
#include <seastar/util/short_streams.hh>
#include <seastar/util/closeable.hh>
#include "sstables/checksum_utils.hh"
#include "sstables/generation_type.hh"
#include "sstables/sstables.hh"
#include "sstables/key.hh"
#include "sstables/open_info.hh"
#include "sstables/version.hh"
#include "test/lib/random_schema.hh"
#include "test/lib/sstable_utils.hh"
#include "test/lib/random_utils.hh"
#include "test/lib/reader_concurrency_semaphore.hh"
#include "test/lib/scylla_test_case.hh"
#include "test/lib/test_utils.hh"
@@ -398,22 +402,43 @@ SEASTAR_TEST_CASE(wrong_range) {
});
}
future<sstable_ptr> mutate_sstable_level(test_env& env, sstable_ptr sstp, const std::string& dir_path, uint32_t new_level) {
auto modifier = [new_level] (sstables::sstable& sst) {
sst.mutate_sstable_level(new_level);
};
auto creator = [&env, &dir_path] (shared_sstable sstp) {
return env.make_sstable(sstp->get_schema(), dir_path, sstp->get_version());
};
auto new_sst = co_await sstp->link_with_rewritten_component(std::move(creator), component_type::Statistics, modifier, false);
co_await sstp->unlink();
sstp = new_sst;
sstp = co_await env.reusable_sst(uncompressed_schema(), dir_path, sstp->generation());
co_return sstp;
}
SEASTAR_TEST_CASE(statistics_rewrite) {
return test_env::do_with_async([] (test_env& env) {
auto uncompressed_dir_copy = env.tempdir().path();
for (const auto& entry : std::filesystem::directory_iterator(uncompressed_dir().c_str())) {
std::filesystem::copy(entry.path(), uncompressed_dir_copy / entry.path().filename());
}
auto random_spec = tests::make_random_schema_specification(
"ks",
std::uniform_int_distribution<size_t>(1, 4),
std::uniform_int_distribution<size_t>(2, 4),
std::uniform_int_distribution<size_t>(2, 8),
std::uniform_int_distribution<size_t>(2, 8));
auto random_schema = tests::random_schema{tests::random::get_int<uint32_t>(), *random_spec};
auto schema = random_schema.schema();
auto sstp = env.reusable_sst(uncompressed_schema(), uncompressed_dir_copy.native()).get();
auto file_path = sstable::filename(uncompressed_dir_copy.native(), "ks", "cf", la, generation_from_value(1), big, component_type::Data);
auto exists = file_exists(file_path).get();
BOOST_REQUIRE(exists);
const auto muts = tests::generate_random_mutations(random_schema, 2).get();
auto sstp = make_sstable_containing(env.make_sstable(schema, sstable::version_types::me), muts);
// mutate_sstable_level results in statistics rewrite
sstp->mutate_sstable_level(10).get();
auto toc_path = fmt::to_string(sstp->toc_filename());
auto dir_path = std::filesystem::path(toc_path).parent_path().string();
sstp = env.reusable_sst(uncompressed_schema(), uncompressed_dir_copy.native()).get();
BOOST_REQUIRE(sstp->get_sstable_level() != 10);
sstp = mutate_sstable_level(env, sstp, dir_path, 10).get();
sstp = env.reusable_sst(schema, dir_path, sstp->generation()).get();
BOOST_REQUIRE(sstp->get_sstable_level() == 10);
});
}

3
test/cluster/test_incremental_repair.py
View File

@@ -541,7 +541,8 @@ async def test_tablet_incremental_repair_merge_higher_repaired_at_number(manager
s1_mark = await logs[0].mark()
await trigger_tablet_merge(manager, servers, logs)
# The merge process will set the unrepaired sstable with repaired_at=3 to repaired_at=0 during merge
await logs[0].wait_for('Finished repaired_at update for tablet merge .* old=3 new=0 sstables_repaired_at=2', from_mark=s1_mark)
await logs[0].wait_for('Updating repaired_at for tablet merge .* old=3 new=0 sstables_repaired_at=2', from_mark=s1_mark)
await logs[0].wait_for('Completed updating repaired_at=.* for tablet merge', from_mark=s1_mark)
for server in servers:
await manager.server_stop_gracefully(server.server_id)