Skip to content

Commit b914da9

Browse files
committed
YQ-3556 move workload manager sensors under feature flag (ydb-platform#7768)
1 parent b2a6ae2 commit b914da9

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

ydb/core/kqp/workload_service/kqp_workload_service.cpp

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ class TKqpWorkloadService : public TActorBootstrapped<TKqpWorkloadService> {
7474

7575
EnabledResourcePools = AppData()->FeatureFlags.GetEnableResourcePools();
7676
EnabledResourcePoolsOnServerless = AppData()->FeatureFlags.GetEnableResourcePoolsOnServerless();
77+
EnableResourcePoolsCounters = AppData()->FeatureFlags.GetEnableResourcePoolsCounters();
7778
if (EnabledResourcePools) {
7879
InitializeWorkloadService();
7980
}
@@ -101,6 +102,7 @@ class TKqpWorkloadService : public TActorBootstrapped<TKqpWorkloadService> {
101102

102103
EnabledResourcePools = event.GetConfig().GetFeatureFlags().GetEnableResourcePools();
103104
EnabledResourcePoolsOnServerless = event.GetConfig().GetFeatureFlags().GetEnableResourcePoolsOnServerless();
105+
EnableResourcePoolsCounters = event.GetConfig().GetFeatureFlags().GetEnableResourcePoolsCounters();
104106
if (EnabledResourcePools) {
105107
LOG_I("Resource pools was enanbled");
106108
InitializeWorkloadService();
@@ -526,7 +528,7 @@ class TKqpWorkloadService : public TActorBootstrapped<TKqpWorkloadService> {
526528

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

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

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

561563
bool EnabledResourcePools = false;
562564
bool EnabledResourcePoolsOnServerless = false;
565+
bool EnableResourcePoolsCounters = false;
563566
bool ServiceInitialized = false;
564567
bool IdleChecksStarted = false;
565568
ETablesCreationStatus TablesCreationStatus = ETablesCreationStatus::Cleanup;

ydb/core/kqp/workload_service/ut/common/kqp_workload_service_ut_common.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -231,6 +231,7 @@ class TWorkloadServiceYdbSetup : public IYdbSetup {
231231
TAppConfig appConfig;
232232
appConfig.MutableFeatureFlags()->SetEnableResourcePools(Settings_.EnableResourcePools_);
233233
appConfig.MutableFeatureFlags()->SetEnableMetadataObjectsOnServerless(Settings_.EnableMetadataObjectsOnServerless_);
234+
appConfig.MutableFeatureFlags()->SetEnableResourcePoolsCounters(true);
234235

235236
return appConfig;
236237
}

0 commit comments

Comments
 (0)