Skip to content
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

YQ-3556 move workload manager sensors under feature flag #7768

Merged
merged 1 commit into from
Aug 15, 2024
Merged

YQ-3556 move workload manager sensors under feature flag #7768

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
5 changes: 4 additions & 1 deletion ydb/core/kqp/workload_service/kqp_workload_service.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ class TKqpWorkloadService : public TActorBootstrapped<TKqpWorkloadService> {

EnabledResourcePools = AppData()->FeatureFlags.GetEnableResourcePools();
EnabledResourcePoolsOnServerless = AppData()->FeatureFlags.GetEnableResourcePoolsOnServerless();
EnableResourcePoolsCounters = AppData()->FeatureFlags.GetEnableResourcePoolsCounters();
if (EnabledResourcePools) {
InitializeWorkloadService();
}
Expand Down Expand Up @@ -101,6 +102,7 @@ class TKqpWorkloadService : public TActorBootstrapped<TKqpWorkloadService> {

EnabledResourcePools = event.GetConfig().GetFeatureFlags().GetEnableResourcePools();
EnabledResourcePoolsOnServerless = event.GetConfig().GetFeatureFlags().GetEnableResourcePoolsOnServerless();
EnableResourcePoolsCounters = event.GetConfig().GetFeatureFlags().GetEnableResourcePoolsCounters();
if (EnabledResourcePools) {
LOG_I("Resource pools was enanbled");
InitializeWorkloadService();
Expand Down Expand Up @@ -526,7 +528,7 @@ class TKqpWorkloadService : public TActorBootstrapped<TKqpWorkloadService> {

LOG_I("Creating new handler for pool " << poolKey);

const auto poolHandler = Register(CreatePoolHandlerActor(database, poolId, poolConfig, Counters.Counters));
const auto poolHandler = Register(CreatePoolHandlerActor(database, poolId, poolConfig, EnableResourcePoolsCounters ? Counters.Counters : MakeIntrusive<NMonitoring::TDynamicCounters>()));
const auto poolState = &PoolIdToState.insert({poolKey, TPoolState{.PoolHandler = poolHandler, .ActorContext = ActorContext()}}).first->second;

Counters.ActivePools->Inc();
Expand Down Expand Up @@ -560,6 +562,7 @@ class TKqpWorkloadService : public TActorBootstrapped<TKqpWorkloadService> {

bool EnabledResourcePools = false;
bool EnabledResourcePoolsOnServerless = false;
bool EnableResourcePoolsCounters = false;
bool ServiceInitialized = false;
bool IdleChecksStarted = false;
ETablesCreationStatus TablesCreationStatus = ETablesCreationStatus::Cleanup;
Expand Down
1 change: 1 addition & 0 deletions ydb/core/kqp/workload_service/ut/common/kqp_workload_service_ut_common.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,6 +230,7 @@ class TWorkloadServiceYdbSetup : public IYdbSetup {
TAppConfig GetAppConfig() const {
TAppConfig appConfig;
appConfig.MutableFeatureFlags()->SetEnableResourcePools(Settings_.EnableResourcePools_);
appConfig.MutableFeatureFlags()->SetEnableResourcePoolsCounters(true);

return appConfig;
}
Expand Down
1 change: 1 addition & 0 deletions ydb/core/protos/feature_flags.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,4 +151,5 @@ message TFeatureFlags {
optional bool EnableResourcePoolsOnServerless = 132 [default = false];
optional bool EnableVectorIndex = 133 [default = false];
optional bool EnableChangefeedsOnIndexTables = 134 [default = false];
optional bool EnableResourcePoolsCounters = 135 [default = false];
}
Loading