mirrors/scylladb
1
0
Fork 0
mirror of https://github.com/scylladb/scylladb.git synced 2026-05-12 19:02:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge 'hint: Don't switch group in database::apply_hint()' from Pavel Emelyanov

Browse Source 
The method is called from storage_proxy::mutate_hint() which is in turn called from hint_mutation::apply_locally(). The latter is either called from directly by hint sender, which already runs in streaming group, or via RPC HINT_MUTATION handler which uses index 1 that negotiates streaming group as well.

To be sure, add a debugging check for current group being the expected one.

Code cleanup, not backporting

Closes scylladb/scylladb#28545

* github.com:scylladb/scylladb:
  hint: Don't switch group in database::apply_hint()
  hint_sender: Switch to sender group on stop either
This commit is contained in:
Piotr Dulikowski
2026-03-04 09:36:38 +01:00
parent 85bd6d0114 83e64b516a
commit 85dcbfae9a
3 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
db/hints/internal/hint_sender.cc
View File

@@ -154,7 +154,10 @@ hint_sender::~hint_sender() {
future<> hint_sender::stop(drain should_drain) noexcept {
return seastar::async([this, should_drain] {
seastar::thread_attributes attr;
attr.sched_group = _hints_cpu_sched_group;
return seastar::async(std::move(attr), [this, should_drain] {
set_stopping();
_stop_as.request_abort();
_stopped.get();

4
replica/database.cc
View File

@@ -2415,9 +2415,7 @@ future<> database::apply_hint(schema_ptr s, const frozen_mutation& m, tracing::t
if (!s->is_synced()) {
on_internal_error(dblog, format("attempted to apply hint using not synced schema of {}.{}, version={}", s->ks_name(), s->cf_name(), s->version()));
}
return with_scheduling_group(_dbcfg.streaming_scheduling_group, [this, s = std::move(s), &m, tr_state = std::move(tr_state), timeout] () mutable {
return _apply_stage(this, std::move(s), seastar::cref(m), std::move(tr_state), timeout, db::commitlog::force_sync::no, std::monostate{});
});
return _apply_stage(this, std::move(s), seastar::cref(m), std::move(tr_state), timeout, db::commitlog::force_sync::no, std::monostate{});
}
keyspace::config

4
service/storage_proxy.cc
View File

@@ -94,6 +94,7 @@
#include "locator/util.hh"
#include "tools/build_info.hh"
#include "utils/labels.hh"
#include "debug.hh"
namespace bi = boost::intrusive;
@@ -1522,6 +1523,9 @@ public:
virtual future<> apply_locally(storage_proxy& sp, storage_proxy::clock_type::time_point timeout,
tracing::trace_state_ptr tr_state, db::per_partition_rate_limit::info rate_limit_info,
const locator::effective_replication_map& erm) override {
if (current_scheduling_group() != debug::streaming_scheduling_group) {
on_internal_error(dblog, format("attempted to apply hint in {} scheduling group", current_scheduling_group().name()));
}
// A hint will be sent to all relevant endpoints when the endpoint it was originally intended for
// becomes unavailable - this might include the current node
return sp.mutate_hint(_schema, *_mutation, std::move(tr_state), timeout);