66e43912d6
In that level no io_priority_class-es exist. Instead, all the IO happens in the context of current sched-group. File API no longer accepts prio class argument (and makes io_intent arg mandatory to impls). So the change consists of - removing all usage of io_priority_class - patching file_impl's inheritants to updated API - priority manager goes away altogether - IO bandwidth update is performed on respective sched group - tune-up scylla-gdb.py io_queues command The first change is huge and was made semi-autimatically by: - grep io_priority_class | default_priority_class - remove all calls, found methods' args and class' fields Patching file_impl-s is smaller, but also mechanical: - replace io_priority_class& argument with io_intent* one - pass intent to lower file (if applicatble) Dropping the priority manager is: - git-rm .cc and .hh - sed out all the #include-s - fix configure.py and cmakefile The scylla-gdb.py update is a bit hairry -- it needs to use task queues list for IO classes names and shares, but to detect it should it checks for the "commitlog" group is present. Signed-off-by: Pavel Emelyanov <xemul@scylladb.com> Closes #13963
79 lines
3.0 KiB
C++
79 lines
3.0 KiB
C++
/*
|
|
* Copyright (C) 2021-present ScyllaDB
|
|
*/
|
|
|
|
/*
|
|
* SPDX-License-Identifier: AGPL-3.0-or-later
|
|
*/
|
|
|
|
#include <seastar/util/closeable.hh>
|
|
#include "db/virtual_table.hh"
|
|
#include "db/system_keyspace.hh"
|
|
#include "schema/schema.hh"
|
|
|
|
#include "test/lib/mutation_source_test.hh"
|
|
|
|
#include "test/lib/scylla_test_case.hh"
|
|
|
|
class memtable_filling_test_vt : public db::memtable_filling_virtual_table {
|
|
std::vector<mutation> _mutations;
|
|
public:
|
|
memtable_filling_test_vt(schema_ptr s, std::vector<mutation> mutations)
|
|
: memtable_filling_virtual_table(s)
|
|
, _mutations(std::move(mutations)) {}
|
|
|
|
future<> execute(std::function<void(mutation)> mutation_sink) override {
|
|
return with_timeout(db::no_timeout, do_for_each(_mutations, [mutation_sink = std::move(mutation_sink)] (const mutation& m) { mutation_sink(m); }));
|
|
}
|
|
};
|
|
|
|
class streaming_test_vt : public db::streaming_virtual_table {
|
|
schema_ptr _s;
|
|
std::vector<mutation> _mutations;
|
|
public:
|
|
streaming_test_vt(schema_ptr s, std::vector<mutation> mutations)
|
|
: streaming_virtual_table(s)
|
|
, _s(s)
|
|
, _mutations(std::move(mutations)) {}
|
|
|
|
virtual future<> execute(reader_permit permit, db::result_collector& rc) override {
|
|
return async([this, permit, &rc] {
|
|
auto mt = make_lw_shared<replica::memtable>(_s);
|
|
do_for_each(_mutations, [mt] (const mutation& m) {
|
|
mt->apply(m);
|
|
}).get();
|
|
auto rdr = mt->make_flat_reader(_s, permit);
|
|
auto close_rdr = deferred_close(rdr);
|
|
rdr.consume_pausable([&rc] (mutation_fragment_v2 mf) {
|
|
return rc.take(std::move(mf)).then([] { return stop_iteration::no; });
|
|
}).get();
|
|
});
|
|
}
|
|
};
|
|
|
|
SEASTAR_THREAD_TEST_CASE(test_memtable_filling_vt_as_mutation_source) {
|
|
std::unique_ptr<memtable_filling_test_vt> table; // Used to prolong table's life
|
|
|
|
run_mutation_source_tests([&table] (schema_ptr s, const std::vector<mutation>& mutations, gc_clock::time_point) -> mutation_source {
|
|
table = std::make_unique<memtable_filling_test_vt>(s, mutations);
|
|
return table->as_mutation_source();
|
|
});
|
|
}
|
|
|
|
SEASTAR_THREAD_TEST_CASE(test_streaming_vt_as_mutation_source) {
|
|
std::unique_ptr<streaming_test_vt> table; // Used to prolong table's life
|
|
|
|
run_mutation_source_tests([&table] (schema_ptr s, const std::vector<mutation>& mutations, gc_clock::time_point) -> mutation_source {
|
|
table = std::make_unique<streaming_test_vt>(s, mutations);
|
|
return mutation_source([ms = table->as_mutation_source()] (schema_ptr s,
|
|
reader_permit permit,
|
|
const dht::partition_range& pr,
|
|
const query::partition_slice& slice,
|
|
tracing::trace_state_ptr trace_state,
|
|
streamed_mutation::forwarding stream_fwd,
|
|
mutation_reader::forwarding) {
|
|
return ms.make_reader_v2(s, permit, pr, slice, trace_state, stream_fwd, mutation_reader::forwarding::no);
|
|
});
|
|
}, false /* with_partition_range_forwarding */);
|
|
}
|