bahman/scylla
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

compaction: delete default_compaction_progress_monitor

Browse Source 
default_compaction_progress_monitor returns a reference to a static
object. So, it should be read-only, but its users need to modify it.

Delete default_compaction_progress_monitor and use one's own
compaction_progress_monitor instance where it's needed.

Closes scylladb/scylladb#15800
This commit is contained in:
Aleksandra Martyniuk
2023-10-23 09:38:24 +02:00
committed by Botond Dénes
parent 55ee999f89
commit 0c6a3f568a
7 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
compaction/compaction.cc
View File

@@ -405,11 +405,6 @@ private:
friend class compaction_progress_monitor;
};
static compaction_progress_monitor default_noop_compaction_progress_monitor;
compaction_progress_monitor& default_compaction_progress_monitor() {
return default_noop_compaction_progress_monitor;
}
void compaction_progress_monitor::set_generator(std::unique_ptr<read_monitor_generator> generator) {
_generator = std::move(generator);
}
@@ -1820,7 +1815,7 @@ static future<compaction_result> scrub_sstables_validate_mode(sstables::compacti
};
}
future<compaction_result> scrub_sstables_validate_mode(sstables::compaction_descriptor descriptor, compaction_data& cdata, table_state& table_s, compaction_progress_monitor& progress_monitor = default_compaction_progress_monitor()) {
future<compaction_result> scrub_sstables_validate_mode(sstables::compaction_descriptor descriptor, compaction_data& cdata, table_state& table_s, compaction_progress_monitor& progress_monitor) {
progress_monitor.set_generator(std::make_unique<compaction_read_monitor_generator>(table_s, use_backlog_tracker::no));
auto d = defer([&] { progress_monitor.reset_generator(); });
auto res = co_await scrub_sstables_validate_mode(descriptor, cdata, table_s, *progress_monitor._generator);

4
compaction/compaction.hh
View File

@@ -116,14 +116,12 @@ public:
friend future<compaction_result> scrub_sstables_validate_mode(sstables::compaction_descriptor, compaction_data&, table_state&, compaction_progress_monitor&);
};
compaction_progress_monitor& default_compaction_progress_monitor();
// Compact a list of N sstables into M sstables.
// Returns info about the finished compaction, which includes vector to new sstables.
//
// compaction_descriptor is responsible for specifying the type of compaction, and influencing
// compaction behavior through its available member fields.
future<compaction_result> compact_sstables(sstables::compaction_descriptor descriptor, compaction_data& cdata, table_state& table_s, compaction_progress_monitor& progress_monitor = default_compaction_progress_monitor());
future<compaction_result> compact_sstables(sstables::compaction_descriptor descriptor, compaction_data& cdata, table_state& table_s, compaction_progress_monitor& progress_monitor);
// Return list of expired sstables for column family cf.
// A sstable is fully expired *iff* its max_local_deletion_time precedes gc_before and its

3
test/boost/sstable_3_x_test.cc
View File

@@ -3031,7 +3031,8 @@ static flat_mutation_reader_v2 compacted_sstable_reader(test_env& env, schema_pt
};
desc.replacer = replacer_fn_no_op();
auto cdata = compaction_manager::create_compaction_data();
sstables::compact_sstables(std::move(desc), cdata, cf->as_table_state()).get();
compaction_progress_monitor progress_monitor;
sstables::compact_sstables(std::move(desc), cdata, cf->as_table_state(), progress_monitor).get();
return compacted_sst->as_mutation_source().make_reader_v2(s, env.make_reader_permit(), query::full_partition_range, s->full_slice());
}

3
test/boost/sstable_resharding_test.cc
View File

@@ -107,7 +107,8 @@ void run_sstable_resharding_test(sstables::test_env& env) {
return env.make_sstable(cf->schema(), gen, version);
};
auto cdata = compaction_manager::create_compaction_data();
auto res = sstables::compact_sstables(std::move(descriptor), cdata, cf.as_table_state()).get0();
compaction_progress_monitor progress_monitor;
auto res = sstables::compact_sstables(std::move(descriptor), cdata, cf.as_table_state(), progress_monitor).get0();
sst->destroy().get();
auto new_sstables = std::move(res.new_sstables);

6
test/lib/sstable_utils.cc
View File

@@ -122,8 +122,10 @@ future<compaction_result> compact_sstables(compaction_manager& cm, sstables::com
auto cmt = compaction_manager_test(cm);
sstables::compaction_result ret;
co_await cmt.run(descriptor.run_identifier, table_s, [&] (sstables::compaction_data& cdata) {
return sstables::compact_sstables(std::move(descriptor), cdata, table_s).then([&] (sstables::compaction_result res) {
ret = std::move(res);
return do_with(compaction_progress_monitor{}, [&] (compaction_progress_monitor& progress_monitor) {
return sstables::compact_sstables(std::move(descriptor), cdata, table_s, progress_monitor).then([&] (sstables::compaction_result res) {
ret = std::move(res);
});
});
});
co_return ret;

3
test/perf/perf_sstable.hh
View File

@@ -239,7 +239,8 @@ public:
};
descriptor.replacer = sstables::replacer_fn_no_op();
auto cdata = compaction_manager::create_compaction_data();
auto ret = sstables::compact_sstables(std::move(descriptor), cdata, cf->as_table_state()).get0();
compaction_progress_monitor progress_monitor;
auto ret = sstables::compact_sstables(std::move(descriptor), cdata, cf->as_table_state(), progress_monitor).get0();
auto end = perf_sstable_test_env::now();
auto partitions_per_sstable = _cfg.partitions / _cfg.sstables;

3
tools/scylla-sstable.cc
View File

@@ -966,7 +966,8 @@ void scrub_operation(schema_ptr schema, reader_permit permit, const std::vector<
auto compaction_data = sstables::compaction_data{};
sstables::compact_sstables(std::move(compaction_descriptor), compaction_data, table_state).get();
compaction_progress_monitor progress_monitor;
sstables::compact_sstables(std::move(compaction_descriptor), compaction_data, table_state, progress_monitor).get();
}
void dump_index_operation(schema_ptr schema, reader_permit permit, const std::vector<sstables::shared_sstable>& sstables,