Skip to content

Commit 22295e9

Browse files
committed
rename
1 parent 50e3e11 commit 22295e9

File tree

5 files changed

+7
-7
lines changed

5 files changed

+7
-7
lines changed

ydb/core/mind/hive/hive_impl.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -2327,7 +2327,7 @@ void THive::Handle(TEvPrivate::TEvProcessTabletBalancer::TPtr&) {
23272327
nodeUsageHistogram.IncrementFor(record.Usage * 100);
23282328
}
23292329

2330-
double minUsageToKick = GetMaxNodeUsageToKick() - GetNodeUsageDiffToEmergencyBalance();
2330+
double minUsageToKick = GetMaxNodeUsageToKick() - GetNodeUsageRangeToKick();
23312331
if (stats.MaxUsage >= GetMaxNodeUsageToKick() && stats.MinUsage < minUsageToKick) {
23322332
std::vector<TNodeId> overloadedNodes;
23332333
for (const auto& [nodeId, nodeInfo] : Nodes) {

ydb/core/mind/hive/hive_impl.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -934,8 +934,8 @@ TTabletInfo* FindTabletEvenInDeleting(TTabletId tabletId, TFollowerId followerId
934934
return CurrentConfig.GetStorageBalancerInflight();
935935
}
936936

937-
double GetNodeUsageDiffToEmergencyBalance() const {
938-
return CurrentConfig.GetNodeUsageDiffToEmergencyBalance();
937+
double GetNodeUsageRangeToKick() const {
938+
return CurrentConfig.GetNodeUsageRangeToKick();
939939
}
940940

941941
static void ActualizeRestartStatistics(google::protobuf::RepeatedField<google::protobuf::uint64>& restartTimestamps, ui64 barrier);

ydb/core/mind/hive/hive_ut.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -3961,7 +3961,7 @@ Y_UNIT_TEST_SUITE(THiveTest) {
39613961
// this value of MaxNodeUsageToKick is selected specifically to make test scenario work
39623962
// in link with number of tablets and values of network usage metrics used below
39633963
app.HiveConfig.SetMaxNodeUsageToKick(0.01);
3964-
app.HiveConfig.SetNodeUsageDiffToEmergencyBalance(0);
3964+
app.HiveConfig.SetNodeUsageRangeToKick(0);
39653965
app.HiveConfig.SetEmergencyBalancerInflight(1); // to ensure fair distribution
39663966
});
39673967

ydb/core/mind/hive/monitoring.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -794,7 +794,7 @@ class TTxMonEvent_Settings : public TTransactionBase<THive>, public TLoggedMonTr
794794
UpdateConfig(db, "MinNetworkScatterToBalance", configUpdates);
795795
UpdateConfig(db, "MinCounterScatterToBalance", configUpdates);
796796
UpdateConfig(db, "MaxNodeUsageToKick", configUpdates, TSchemeIds::State::MaxNodeUsageToKick);
797-
UpdateConfig(db, "NodeUsageDiffToEmergencyBalance", configUpdates);
797+
UpdateConfig(db, "NodeUsageRangeToKick", configUpdates);
798798
UpdateConfig(db, "ResourceChangeReactionPeriod", configUpdates, TSchemeIds::State::ResourceChangeReactionPeriod);
799799
UpdateConfig(db, "TabletKickCooldownPeriod", configUpdates, TSchemeIds::State::TabletKickCooldownPeriod);
800800
UpdateConfig(db, "SpreadNeighbours", configUpdates, TSchemeIds::State::SpreadNeighbours);
@@ -1141,7 +1141,7 @@ class TTxMonEvent_Settings : public TTransactionBase<THive>, public TLoggedMonTr
11411141
ShowConfig(out, "MinCounterScatterToBalance");
11421142
ShowConfig(out, "MinNodeUsageToBalance");
11431143
ShowConfig(out, "MaxNodeUsageToKick");
1144-
ShowConfig(out, "NodeUsageDiffToEmergencyBalance");
1144+
ShowConfig(out, "NodeUsageRangeToKick");
11451145
ShowConfig(out, "ResourceChangeReactionPeriod");
11461146
ShowConfig(out, "TabletKickCooldownPeriod");
11471147
ShowConfig(out, "NodeSelectStrategy");

ydb/core/protos/config.proto

+1-1
Original file line numberDiff line numberDiff line change
@@ -1469,7 +1469,7 @@ message THiveConfig {
14691469
optional double MinGroupUsageToBalance = 72 [default = 0.1];
14701470
optional uint64 StorageBalancerInflight = 73 [default = 1];
14711471
optional bool EnableDestroyOperations = 74 [default = false];
1472-
optional double NodeUsageDiffToEmergencyBalance = 75 [default = 0.2];
1472+
optional double NodeUsageRangeToKick = 75 [default = 0.2];
14731473
}
14741474

14751475
message TBlobCacheConfig {

0 commit comments

Comments
 (0)