25-1: Console request timeout (#18610)

Author: CyberROFL

ydb/core/client/server/msgbus_server_console.cpp

@@ -60,6 +60,10 @@ class TConsoleRequestActor : public TMessageBusSecureRequest<TMessageBusServerRe
 
         SendRequest(ctx);
         TBase::Become(&TConsoleRequestActor::MainState);
+
+        if (const auto timeout = TDuration::MilliSeconds(Request.GetTimeoutMs())) {
+            ctx.Schedule(timeout, new TEvents::TEvWakeup());
+        }
     }
 
     void SendRequest(const TActorContext &ctx)
@@ -328,6 +332,10 @@ class TConsoleRequestActor : public TMessageBusSecureRequest<TMessageBusServerRe
         SendReplyAndDie(ctx);
     }
 
+    void HandleTimeout(const TActorContext &ctx) {
+        ReplyWithErrorAndDie(Ydb::StatusIds::TIMEOUT, "Console request timed out", ctx);
+    }
+
     STFUNC(MainState) {
         switch (ev->GetTypeRewrite()) {
             CFunc(TEvents::TEvUndelivered::EventType, Undelivered);
@@ -347,6 +355,7 @@ class TConsoleRequestActor : public TMessageBusSecureRequest<TMessageBusServerRe
             HFunc(TEvConsole::TEvToggleConfigValidatorResponse, Handle);
             CFunc(TEvTabletPipe::EvClientDestroyed, Undelivered);
             HFunc(TEvTabletPipe::TEvClientConnected, Handle);
+            SFunc(TEvents::TEvWakeup, HandleTimeout);
         default:
             Y_ABORT("TConsoleRequestActor::MainState unexpected event type: %" PRIx32 " event: %s",
                    ev->GetTypeRewrite(),

ydb/core/protos/msgbus.proto

@@ -662,6 +662,7 @@ message TConsoleRequest {
     }
     optional string DomainName = 100;
     optional string SecurityToken = 101;
+    optional uint64 TimeoutMs = 102;
 }
 
 message TConsoleResponse {

ydb/public/lib/deprecated/kicli/kikimr.cpp

@@ -266,6 +266,9 @@ class TKikimr::TGRpcImpl : public TKikimr::TImpl {
         case NMsgBusProxy::MTYPE_CLIENT_INTERCONNECT_DEBUG:
             return ExecuteGRpcRequest<NMsgBusProxy::TBusInterconnectDebug>(&NGRpcProxy::TGRpcClient::InterconnectDebug, promise, request);
         case NMsgBusProxy::MTYPE_CLIENT_CONSOLE_REQUEST:
+            if (const auto timeout = GRpcClient->GetConfig().Timeout; timeout != TDuration::Max()) {
+                static_cast<NMsgBusProxy::TBusConsoleRequest*>(request.Get())->Record.SetTimeoutMs(timeout.MilliSeconds());
+            }
             return ExecuteGRpcRequest<NMsgBusProxy::TBusConsoleRequest, NMsgBusProxy::TBusConsoleResponse>(&NGRpcProxy::TGRpcClient::ConsoleRequest, promise, request);
         case NMsgBusProxy::MTYPE_CLIENT_RESOLVE_NODE:
             return ExecuteGRpcRequest<NMsgBusProxy::TBusResolveNode, NMsgBusProxy::TBusResponse>(&NGRpcProxy::TGRpcClient::ResolveNode, promise, request);