Skip to content

[24-3] Fix leaky kind filters in configs dispatcher #9952

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Enjection merged 1 commit into from
Oct 2, 2024
Merged

[24-3] Fix leaky kind filters in configs dispatcher #9952

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 10 additions & 4 deletions ydb/core/cms/console/configs_dispatcher.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -927,7 +927,7 @@ void TConfigsDispatcher::Handle(TEvConsole::TEvConfigSubscriptionNotification::T
if (subscription->Yaml && YamlConfigEnabled) {
ReplaceConfigItems(YamlProtoConfig, trunc, FilterKinds(subscription->Kinds), BaseConfig);
} else {
Y_FOR_EACH_BIT(kind, kinds) {
Y_FOR_EACH_BIT(kind, FilterKinds(kinds)) {
if (affectedKinds.contains(kind)) {
hasAffectedKinds = true;
}
Expand All @@ -941,15 +941,15 @@ void TConfigsDispatcher::Handle(TEvConsole::TEvConfigSubscriptionNotification::T
ReplaceConfigItems(ev->Get()->Record.GetConfig(), trunc, FilterKinds(kinds), BaseConfig);
}

if (hasAffectedKinds || !CompareConfigs(subscription->CurrentConfig.Config, trunc) || CurrentStateFunc() == &TThis::StateInit) {
if (hasAffectedKinds || !CompareConfigs(subscription->CurrentConfig.Config, trunc, FilterKinds(kinds)) || CurrentStateFunc() == &TThis::StateInit) {
subscription->UpdateInProcess = MakeHolder<TEvConsole::TEvConfigNotificationRequest>();
subscription->UpdateInProcess->Record.MutableConfig()->CopyFrom(trunc);
subscription->UpdateInProcess->Record.SetLocal(true);
Y_FOR_EACH_BIT(kind, kinds) {
Y_FOR_EACH_BIT(kind, FilterKinds(kinds)) {
subscription->UpdateInProcess->Record.AddItemKinds(kind);
}
subscription->UpdateInProcessCookie = ++NextRequestCookie;
subscription->UpdateInProcessConfigVersion = FilterVersion(ev->Get()->Record.GetConfig().GetVersion(), kinds);
subscription->UpdateInProcessConfigVersion = FilterVersion(ev->Get()->Record.GetConfig().GetVersion(), FilterKinds(kinds));

if (YamlConfigEnabled) {
UpdateYamlVersion(subscription);
Expand Down Expand Up @@ -1046,6 +1046,12 @@ void TConfigsDispatcher::Handle(TEvConfigsDispatcher::TEvSetConfigSubscriptionRe
"SetConfigSubscriptionRequest handler");
Y_UNUSED(nonYamlKinds);
auto kinds = KindsToBitMap(ev->Get()->ConfigItemKinds);

auto truncKinds = FilterKinds(kinds);
if (truncKinds.Empty() && !kinds.Empty()) {
return;
}

auto subscriberActor = ev->Get()->Subscriber ? ev->Get()->Subscriber : ev->Sender;

auto subscription = FindSubscription(kinds);
Expand Down