fixes

Author: vporyadke

ydb/core/mind/hive/hive_impl.cpp

@@ -176,14 +176,12 @@ void THive::DeleteTabletWithoutStorage(TLeaderTabletInfo* tablet, TSideEffects&
 }
 
 TInstant THive::GetAllowedBootingTime() {
-    TDuration passed = LastConnect - StartTime();
-    i64 connectedNodes = TabletCounters->Simple()[NHive::COUNTER_NODES_CONNECTED].Get();
+    auto connectedNodes = TabletCounters->Simple()[NHive::COUNTER_NODES_CONNECTED].Get();
     BLOG_D(connectedNodes << " nodes connected out of " << ExpectedNodes);
     if (connectedNodes == 0) {
         return {};
     }
-    TDuration avgConnectTime = passed / connectedNodes;
-    TInstant result = LastConnect + avgConnectTime * std::max<i64>(ExpectedNodes - connectedNodes, 1);
+    TInstant result = LastConnect + MaxTimeBetweenConnects * std::max<i64>(static_cast<i64>(ExpectedNodes) - static_cast<i64>(connectedNodes), 1);
     if (connectedNodes < ExpectedNodes) {
         result = std::max(result, StartTime() + GetMaxWarmUpPeriod());
     }
@@ -195,7 +193,7 @@ void THive::ExecuteProcessBootQueue(NIceDb::TNiceDb& db, TSideEffects& sideEffec
     if (WarmUp) {
         TInstant allowed = GetAllowedBootingTime();
         if (now < allowed) {
-            BLOG_D("ProcessBootQueue - waiting unitl " << allowed << " because of warmup, now: " << now);
+            BLOG_D("ProcessBootQueue - waiting until " << allowed << " because of warmup, now: " << now);
             ProcessBootQueueScheduled = false;
             PostponeProcessBootQueue(allowed - now);
             return;

ydb/core/mind/hive/hive_impl.h

@@ -363,8 +363,9 @@ class THive : public TActor<THive>, public TTabletExecutedFlat, public THiveShar
     bool ProcessBootQueuePostponed = false;
     TInstant LastConnect;
     TInstant ProcessBootQueuePostponedUntil;
+    TDuration MaxTimeBetweenConnects;
     bool WarmUp;
-    i64 ExpectedNodes;
+    ui64 ExpectedNodes;
 
     THashMap<ui32, TEvInterconnect::TNodeInfo> NodesInfo;
     TTabletCountersBase* TabletCounters;

ydb/core/mind/hive/monitoring.cpp

@@ -1869,7 +1869,7 @@ function fillDataShort(result) {
         if ("TotalTablets" in result) {
             var percent = Math.floor(result.RunningTablets * 100 / result.TotalTablets) + '%';
             var values = result.RunningTablets + ' of ' + result.TotalTablets;
-            var warmup = result.Warmup ? "<span class='glyphicon glyphicon-fire' style='color:red; margin-right:4px'></span>" : "";
+            var warmup = result.WarmUp ? "<span class='glyphicon glyphicon-fire' style='color:red; margin-right:4px'></span>" : "";
             $('#runningTablets').html(warmup + percent + ' (' + values + ')');
             $('#aliveNodes').html(result.AliveNodes);
             $('#bootQueue').html(result.BootQueueSize);

ydb/core/mind/hive/tx__status.cpp

@@ -33,7 +33,11 @@ class TTxStatus : public TTransactionBase<THive> {
             }
             if (Self->WarmUp &&
                 node.Statistics.RestartTimestampSize() < Self->GetNodeRestartsToIgnoreInWarmup()) {
-                Self->LastConnect = TActivationContext::Now();
+                TInstant now = TActivationContext::Now();
+                if (Self->LastConnect != TInstant{}) {
+                    Self->MaxTimeBetweenConnects = std::max(Self->MaxTimeBetweenConnects, now - Self->LastConnect);
+                }
+                Self->LastConnect = now;
             }
             if (node.LocationAcquired) {
                 NIceDb::TNiceDb db(txc.DB);