allow to specify inactivity timeout for http connections (#12075)

Author: adameat

ydb/core/driver_lib/run/config_parser.cpp

@@ -367,6 +367,7 @@ void TRunCommandConfigParser::ApplyParsedOptions() {
     Config.AppConfig.MutableMonitoringConfig()->SetMonitoringAddress(RunOpts.MonitoringAddress);
     Config.AppConfig.MutableMonitoringConfig()->SetMonitoringThreads(RunOpts.MonitoringThreads);
     Config.AppConfig.MutableMonitoringConfig()->SetMaxRequestsPerSecond(RunOpts.MonitoringMaxRequestsPerSecond);
+    Config.AppConfig.MutableMonitoringConfig()->SetInactivityTimeout(ToString(RunOpts.MonitoringInactivityTimeout.Seconds()));
     Config.AppConfig.MutableMonitoringConfig()->SetMonitoringCertificate(TUnbufferedFileInput(RunOpts.MonitoringCertificateFile).ReadAll());
     Config.AppConfig.MutableRestartsCountConfig()->SetRestartsCountFile(RunOpts.RestartsCountFile);
 }

ydb/core/driver_lib/run/config_parser.h

@@ -51,6 +51,7 @@ class TRunCommandConfigParser {
         TString MonitoringCertificateFile;
         ui32 MonitoringThreads;
         ui32 MonitoringMaxRequestsPerSecond;
+        TDuration MonitoringInactivityTimeout;
         TString RestartsCountFile;
         bool StartTracingBusProxy;
         TString TracePath;

ydb/core/driver_lib/run/run.cpp

@@ -442,6 +442,7 @@ void TKikimrRunner::InitializeMonitoring(const TKikimrRunConfig& runConfig, bool
         monConfig.Address = appConfig.GetMonitoringConfig().GetMonitoringAddress();
         monConfig.Certificate = appConfig.GetMonitoringConfig().GetMonitoringCertificate();
         monConfig.MaxRequestsPerSecond = appConfig.GetMonitoringConfig().GetMaxRequestsPerSecond();
+        monConfig.InactivityTimeout = TDuration::Parse(appConfig.GetMonitoringConfig().GetInactivityTimeout());
         if (appConfig.GetMonitoringConfig().HasMonitoringCertificateFile()) {
             monConfig.Certificate = TUnbufferedFileInput(appConfig.GetMonitoringConfig().GetMonitoringCertificateFile()).ReadAll();
         }

ydb/core/mon/mon.h

@@ -42,6 +42,7 @@ class TMon {
         TString RedirectMainPageTo;
         TString Certificate;
         ui32 MaxRequestsPerSecond = 0;
+        TDuration InactivityTimeout = TDuration::Minutes(2);
     };
 
     virtual ~TMon() = default;

ydb/core/protos/config.proto

@@ -538,6 +538,7 @@ message TMonitoringConfig {
     optional string MonitoringCertificateFile = 15;
     optional string MemAllocDumpPathPrefix = 16;
     optional uint32 MaxRequestsPerSecond = 17 [default = 0];
+    optional string InactivityTimeout = 18 [default = "2m"];
 }
 
 message TRestartsCountConfig {

ydb/library/actors/http/http_proxy.h

@@ -68,6 +68,7 @@ struct TEvHttpProxy {
         std::vector<TString> CompressContentTypes;
         ui32 MaxRequestsPerSecond = 0;
         ui32 MaxRecycledRequestsCount = DEFAULT_MAX_RECYCLED_REQUESTS_COUNT;
+        TDuration InactivityTimeout = TDuration::Minutes(2);
 
         TEvAddListeningPort() = default;
 
@@ -251,6 +252,7 @@ struct TPrivateEndpointInfo : THttpEndpointInfo {
     TActorId Owner;
     TSslHelpers::TSslHolder<SSL_CTX> SecureContext;
     TRateLimiter RateLimiter;
+    TDuration InactivityTimeout;
 
     TPrivateEndpointInfo(const std::vector<TString>& compressContentTypes)
         : THttpEndpointInfo(compressContentTypes)

ydb/library/actors/http/http_proxy_acceptor.cpp

@@ -59,6 +59,7 @@ class TAcceptorActor : public NActors::TActor<TAcceptorActor>, public THttpConfi
         Endpoint->Secure = event->Get()->Secure;
         Endpoint->RateLimiter.Limit = event->Get()->MaxRequestsPerSecond;
         Endpoint->RateLimiter.Period = TDuration::Seconds(1);
+        Endpoint->InactivityTimeout = event->Get()->InactivityTimeout;
         int err = 0;
         if (Endpoint->Secure) {
             if (!event->Get()->SslCertificatePem.empty()) {

ydb/library/actors/http/http_proxy_incoming.cpp

@@ -20,7 +20,6 @@ class TIncomingConnectionActor : public TActor<TIncomingConnectionActor<TSocketI
     TDeque<THttpIncomingRequestPtr> RecycledRequests;
 
     THPTimer InactivityTimer;
-    static constexpr TDuration InactivityTimeout = TDuration::Minutes(2);
     TEvPollerReady* InactivityEvent = nullptr;
 
     TPollerToken::TPtr PollerToken;
@@ -71,7 +70,7 @@ class TIncomingConnectionActor : public TActor<TIncomingConnectionActor<TSocketI
 protected:
     void Bootstrap(const TActorContext& ctx) {
         InactivityTimer.Reset();
-        ctx.Schedule(InactivityTimeout, InactivityEvent = new TEvPollerReady(nullptr, false, false));
+        ctx.Schedule(Endpoint->InactivityTimeout, InactivityEvent = new TEvPollerReady(nullptr, false, false));
         LOG_DEBUG_S(ctx, HttpLog, "(#" << TSocketImpl::GetRawSocket() << "," << Address << ") incoming connection opened");
         OnAccept(ctx);
     }
@@ -177,11 +176,11 @@ class TIncomingConnectionActor : public TActor<TIncomingConnectionActor<TSocketI
         }
         if (event->Get() == InactivityEvent) {
             const TDuration passed = TDuration::Seconds(std::abs(InactivityTimer.Passed()));
-            if (passed >= InactivityTimeout) {
+            if (passed >= Endpoint->InactivityTimeout) {
                 LOG_DEBUG_S(ctx, HttpLog, "(#" << TSocketImpl::GetRawSocket() << "," << Address << ") connection closed by inactivity timeout");
                 return Die(ctx); // timeout
             } else {
-                ctx.Schedule(InactivityTimeout - passed, InactivityEvent = new TEvPollerReady(nullptr, false, false));
+                ctx.Schedule(Endpoint->InactivityTimeout - passed, InactivityEvent = new TEvPollerReady(nullptr, false, false));
             }
         }
         if (event->Get()->Write) {