Add min delay before shutdown

Author: pixcc

ydb/core/driver_lib/run/run.cpp

@@ -502,10 +502,10 @@ static TString ReadFile(const TString& fileName) {
 }
 
 void TKikimrRunner::InitializeGracefulShutdown(const TKikimrRunConfig& runConfig) {
-    Y_UNUSED(runConfig);
     GracefulShutdownSupported = true;
-    if (runConfig.AppConfig.HasDelayBeforeShutdownSeconds()) {
-        DelayBeforeShutdown = TDuration::Seconds(runConfig.AppConfig.GetDelayBeforeShutdownSeconds());
+    const auto& config = runConfig.AppConfig.GetShutdownConfig();
+    if (config.HasMinDelayBeforeShutdownSeconds()) {
+        MinDelayBeforeShutdown = TDuration::Seconds(config.GetMinDelayBeforeShutdownSeconds());
     }
 }
 
@@ -1735,9 +1735,9 @@ void TKikimrRunner::KikimrStop(bool graceful) {
 
     if (EnabledGrpcService) {
         ActorSystem->Send(new IEventHandle(NGRpcService::CreateGrpcPublisherServiceActorId(), {}, new TEvents::TEvPoisonPill));
-        Sleep(DelayBeforeShutdown);
     }
 
+    THPTimer timer;
     TIntrusivePtr<TDrainProgress> drainProgress(new TDrainProgress());
     if (AppData->FeatureFlags.GetEnableDrainOnShutdown() && GracefulShutdownSupported && ActorSystem) {
         drainProgress->OnSend();
@@ -1771,6 +1771,10 @@ void TKikimrRunner::KikimrStop(bool graceful) {
         }
     }
 
+    // Wait for a minimum delay to make sure that clients forget about this node
+    auto timeLeftBeforeShutdown = MinDelayBeforeShutdown - TDuration::Seconds(timer.Passed());
+    Sleep(timeLeftBeforeShutdown);
+
     if (ActorSystem) {
         ActorSystem->BroadcastToProxies([](const TActorId& proxyId) {
             return new IEventHandle(proxyId, {}, new TEvInterconnect::TEvTerminate);

ydb/core/driver_lib/run/run.h

@@ -43,7 +43,8 @@ class TKikimrRunner : public virtual TThrRefBase, private IGlobalObjectStorage {
 
     bool EnabledGrpcService = false;
     bool GracefulShutdownSupported = false;
-    TDuration DelayBeforeShutdown;
+    TDuration MinDelayBeforeShutdown;
+    TDuration DelayBeforeShutdown2;
     THolder<NSQS::TAsyncHttpServer> SqsHttp;
 
     THolder<NYdb::TDriver> YdbDriver;

ydb/core/protos/config.proto

@@ -1905,6 +1905,10 @@ message TMetadataCacheConfig {
     optional uint64 RefreshPeriodMs = 1 [default = 15000];
 }
 
+message TShutdownConfig {
+    optional uint32 MinDelayBeforeShutdownSeconds = 1;
+}
+
 message TLabel {
     optional string Name = 1;
     optional string Value = 2;
@@ -1989,7 +1993,7 @@ message TAppConfig {
     optional TMemoryControllerConfig MemoryControllerConfig = 81;
 	optional TGroupedMemoryLimiterConfig GroupedMemoryLimiterConfig = 82;
     optional NKikimrReplication.TReplicationDefaults ReplicationConfig = 83;
-    optional uint32 DelayBeforeShutdownSeconds = 108;
+    optional TShutdownConfig ShutdownConfig = 84;
 
     repeated TNamedConfig NamedConfigs = 100;
     optional string ClusterYamlConfig = 101;