Skip to content

Commit 8fa2284

Browse files
committed
review fix
1 parent b62fe7a commit 8fa2284

File tree

4 files changed

+7
-6
lines changed

4 files changed

+7
-6
lines changed

ydb/core/mind/hive/hive_impl.cpp

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

2330-
if (stats.MaxUsage >= GetMaxNodeUsageToKick() && stats.MinUsage < GetMinNodeUsageToNotBalance()) {
2330+
double minUsageToKick = GetMaxNodeUsageToKick() - GetNodeUsageDiffToEmergencyBalance();
2331+
if (stats.MaxUsage >= GetMaxNodeUsageToKick() && stats.MinUsage < minUsageToKick) {
23312332
std::vector<TNodeId> overloadedNodes;
23322333
for (const auto& [nodeId, nodeInfo] : Nodes) {
23332334
if (nodeInfo.IsAlive() && !nodeInfo.Down && nodeInfo.IsOverloaded()) {

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 GetMinNodeUsageToNotBalance() const {
938-
return CurrentConfig.GetMinNodeUsageToNotBalance();
937+
double GetNodeUsageDiffToEmergencyBalance() const {
938+
return CurrentConfig.GetNodeUsageDiffToEmergencyBalance();
939939
}
940940

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

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, "MinNodeUsageToNotBalance", configUpdates);
797+
UpdateConfig(db, "NodeUsageDiffToEmergencyBalance", 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, "MinNodeUsageToNotBalance");
1144+
ShowConfig(out, "NodeUsageDiffToEmergencyBalance");
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 MinNodeUsageToNotBalance = 75 [default = 0.7];
1472+
optional double NodeUsageDiffToEmergencyBalance = 75 [default = 0.2];
14731473
}
14741474

14751475
message TBlobCacheConfig {

0 commit comments

Comments
 (0)