Skip to content

Remove the update from the queue when necessary #25844

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
merged 1 commit into from
Sep 26, 2025
Merged

Remove the update from the queue when necessary #25844

Show file tree
Hide file tree
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
15 changes: 10 additions & 5 deletions ydb/core/cms/console/console_configs_provider.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -561,6 +561,12 @@ void TConfigsProvider::ProcessScheduledUpdates(const TActorContext &ctx)
*Counters.InflightConfigUpdates = InflightUpdates.size();
}

void TConfigsProvider::RemoveSubscription(const TActorId& subscriber) {
InMemoryIndex.RemoveSubscription(subscriber);
ScheduledUpdates.erase(subscriber);
InflightUpdates.erase(subscriber);
}

void TConfigsProvider::CheckSubscription(TSubscription::TPtr subscription,
const TActorContext &ctx)
{
Expand Down Expand Up @@ -829,7 +835,7 @@ void TConfigsProvider::Handle(TEvConsole::TEvConfigSubscriptionRequest::TPtr &ev
return;
}

InMemoryIndex.RemoveSubscription(subscriber);
RemoveSubscription(subscriber);
Send(existing->Worker, new TEvents::TEvPoisonPill());
}

Expand Down Expand Up @@ -886,18 +892,17 @@ void TConfigsProvider::Handle(TEvConsole::TEvConfigSubscriptionCanceled::TPtr &e

Y_ABORT_UNLESS(subscription->Worker);

InMemoryIndex.RemoveSubscription(subscriber);
RemoveSubscription(subscriber);
Send(subscription->Worker, new TEvents::TEvPoisonPill());
ProcessScheduledUpdates(ctx);
}

void TConfigsProvider::Handle(TEvPrivate::TEvWorkerDisconnected::TPtr &ev, const TActorContext &ctx)
{
auto subscription = ev->Get()->Subscription;
auto existing = InMemoryIndex.GetSubscription(subscription->Subscriber);
if (existing == subscription) {
InMemoryIndex.RemoveSubscription(subscription->Subscriber);
ScheduledUpdates.erase(subscription->Subscriber);
InflightUpdates.erase(subscription->Subscriber);
RemoveSubscription(subscription->Subscriber);

Send(subscription->Subscriber, new TEvConsole::TEvConfigSubscriptionCanceled(subscription->Generation));

Expand Down
1 change: 1 addition & 0 deletions ydb/core/cms/console/console_configs_provider.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,6 +196,7 @@ class TConfigsProvider : public TActorBootstrapped<TConfigsProvider> {
const TActorContext &ctx);

void ProcessScheduledUpdates(const TActorContext &ctx);
void RemoveSubscription(const TActorId& subscriber);

void Handle(NMon::TEvHttpInfo::TPtr &ev);
void Handle(TEvConsole::TEvConfigSubscriptionRequest::TPtr &ev, const TActorContext &ctx);
Expand Down
Loading