diff options
author | zalyalov <zalyalov@yandex-team.com> | 2023-11-22 19:31:27 +0300 |
---|---|---|
committer | zalyalov <zalyalov@yandex-team.com> | 2023-11-22 23:09:08 +0300 |
commit | 64fecd02b07c35c13008e2c653423e4f0a28d053 (patch) | |
tree | 0a5632d623c605f13ccbb69f8eed0b7a253920e6 | |
parent | b6243191a932e867d2fa81693ff025afe82af11a (diff) | |
download | ydb-64fecd02b07c35c13008e2c653423e4f0a28d053.tar.gz |
disable hive balancing in unit tests by default KIKIMR-20129
-rw-r--r-- | ydb/core/mind/hive/hive_ut.cpp | 4 | ||||
-rw-r--r-- | ydb/core/testlib/actors/test_runtime.cpp | 6 | ||||
-rw-r--r-- | ydb/core/testlib/test_client.cpp | 1 | ||||
-rw-r--r-- | ydb/core/testlib/test_client.h | 4 | ||||
-rw-r--r-- | ydb/core/util/testactorsys.h | 4 |
5 files changed, 18 insertions, 1 deletions
diff --git a/ydb/core/mind/hive/hive_ut.cpp b/ydb/core/mind/hive/hive_ut.cpp index 938c367b0d..9b7287a210 100644 --- a/ydb/core/mind/hive/hive_ut.cpp +++ b/ydb/core/mind/hive/hive_ut.cpp @@ -262,6 +262,10 @@ namespace { app.SetRequestSequenceSize(10); app.SetHiveStoragePoolFreshPeriod(0); + app.HiveConfig.SetMaxNodeUsageToKick(0.9); + app.HiveConfig.SetMinCounterScatterToBalance(0.02); + app.HiveConfig.SetMinScatterToBalance(0.5); + app.HiveConfig.SetObjectImbalanceToBalance(0.02); if (appConfigSetup) { appConfigSetup(app); } diff --git a/ydb/core/testlib/actors/test_runtime.cpp b/ydb/core/testlib/actors/test_runtime.cpp index c9e140dd14..98e91093fb 100644 --- a/ydb/core/testlib/actors/test_runtime.cpp +++ b/ydb/core/testlib/actors/test_runtime.cpp @@ -139,8 +139,12 @@ namespace NActors { nodeAppData->EnableKqpSpilling = app0->EnableKqpSpilling; nodeAppData->FeatureFlags = app0->FeatureFlags; nodeAppData->CompactionConfig = app0->CompactionConfig; - nodeAppData->HiveConfig = app0->HiveConfig; nodeAppData->HiveConfig.SetWarmUpBootWaitingPeriod(10); + nodeAppData->HiveConfig.SetMaxNodeUsageToKick(100); + nodeAppData->HiveConfig.SetMinCounterScatterToBalance(100); + nodeAppData->HiveConfig.SetMinScatterToBalance(100); + nodeAppData->HiveConfig.SetObjectImbalanceToBalance(100); + nodeAppData->HiveConfig.CopyFrom(app0->HiveConfig); nodeAppData->SchemeShardConfig = app0->SchemeShardConfig; nodeAppData->DataShardConfig = app0->DataShardConfig; nodeAppData->ColumnShardConfig = app0->ColumnShardConfig; diff --git a/ydb/core/testlib/test_client.cpp b/ydb/core/testlib/test_client.cpp index 2f079f08a9..5c037a708f 100644 --- a/ydb/core/testlib/test_client.cpp +++ b/ydb/core/testlib/test_client.cpp @@ -245,6 +245,7 @@ namespace Tests { appData.PersQueueGetReadSessionsInfoWorkerFactory = Settings->PersQueueGetReadSessionsInfoWorkerFactory.get(); appData.DataStreamsAuthFactory = Settings->DataStreamsAuthFactory.get(); appData.PersQueueMirrorReaderFactory = Settings->PersQueueMirrorReaderFactory.get(); + appData.HiveConfig.MergeFrom(Settings->AppConfig.GetHiveConfig()); appData.DynamicNameserviceConfig = new TDynamicNameserviceConfig; auto dnConfig = appData.DynamicNameserviceConfig; diff --git a/ydb/core/testlib/test_client.h b/ydb/core/testlib/test_client.h index e8b96c9549..797207df48 100644 --- a/ydb/core/testlib/test_client.h +++ b/ydb/core/testlib/test_client.h @@ -222,6 +222,10 @@ namespace Tests { AppConfig.MutableTableServiceConfig()->MutableResourceManager()->MutableShardsScanningPolicy()->SetParallelScanningAvailable(true); AppConfig.MutableTableServiceConfig()->MutableResourceManager()->MutableShardsScanningPolicy()->SetShardSplitFactor(16); AppConfig.MutableHiveConfig()->SetWarmUpBootWaitingPeriod(10); + AppConfig.MutableHiveConfig()->SetMaxNodeUsageToKick(100); + AppConfig.MutableHiveConfig()->SetMinCounterScatterToBalance(100); + AppConfig.MutableHiveConfig()->SetMinScatterToBalance(100); + AppConfig.MutableHiveConfig()->SetObjectImbalanceToBalance(100); AppConfig.MutableColumnShardConfig()->SetDisabledOnSchemeShard(false); FeatureFlags.SetEnableSeparationComputeActorsFromRead(true); } diff --git a/ydb/core/util/testactorsys.h b/ydb/core/util/testactorsys.h index d7ac66972a..86c2788d6f 100644 --- a/ydb/core/util/testactorsys.h +++ b/ydb/core/util/testactorsys.h @@ -203,6 +203,10 @@ public: AppData.MonotonicTimeProvider = CreateMonotonicTimeProvider(); AppData.HiveConfig.SetWarmUpBootWaitingPeriod(10); + AppData.HiveConfig.SetMaxNodeUsageToKick(100); + AppData.HiveConfig.SetMinCounterScatterToBalance(100); + AppData.HiveConfig.SetMinScatterToBalance(100); + AppData.HiveConfig.SetObjectImbalanceToBalance(100); } ~TTestActorSystem() { |