[Filestore] toggle service state functionality via execute action and remove implementation via a separate service method (#4582)

debnatkh · web-flow · commit 1aa104a59ab1 · 2025-10-30T16:48:48.000+01:00
diff --git a/cloud/filestore/libs/diagnostics/profile_log_events.cpp b/cloud/filestore/libs/diagnostics/profile_log_events.cpp
@@ -127,7 +127,6 @@ void FinalizeProfileLogRequestInfo(
     IMPLEMENT_DEFAULT_METHOD(CreateSession)
     IMPLEMENT_DEFAULT_METHOD(DestroySession)
     IMPLEMENT_DEFAULT_METHOD(PingSession)
-    IMPLEMENT_DEFAULT_METHOD(ToggleServiceState)
     IMPLEMENT_DEFAULT_METHOD(AddClusterNode)
     IMPLEMENT_DEFAULT_METHOD(RemoveClusterNode)
     IMPLEMENT_DEFAULT_METHOD(ListClusterNodes)
@@ -505,7 +504,6 @@ void InitProfileLogRequestInfo(
     IMPLEMENT_DEFAULT_METHOD(CreateSession, NProto)
     IMPLEMENT_DEFAULT_METHOD(DestroySession, NProto)
     IMPLEMENT_DEFAULT_METHOD(PingSession, NProto)
-    IMPLEMENT_DEFAULT_METHOD(ToggleServiceState, NProto)
     IMPLEMENT_DEFAULT_METHOD(AddClusterNode, NProto)
     IMPLEMENT_DEFAULT_METHOD(RemoveClusterNode, NProto)
     IMPLEMENT_DEFAULT_METHOD(ListClusterNodes, NProto)
diff --git a/cloud/filestore/libs/service/auth_scheme.cpp b/cloud/filestore/libs/service/auth_scheme.cpp
@@ -16,7 +16,6 @@ TPermissionList GetRequestPermissions(EFileStoreRequest requestType)
         case EFileStoreRequest::DestroySession:
         case EFileStoreRequest::ResetSession:
         case EFileStoreRequest::PingSession:
-        case EFileStoreRequest::ToggleServiceState:
         case EFileStoreRequest::SubscribeSession:
         case EFileStoreRequest::GetSessionEvents:
         case EFileStoreRequest::GetSessionEventsStream:
diff --git a/cloud/filestore/libs/service/request.cpp b/cloud/filestore/libs/service/request.cpp
@@ -120,7 +120,6 @@ static const TString RequestNames[] = {
     "AddData",
     "ReadBlob",
     "WriteBlob",
-    "ToggleServiceState",
 };
 
 static_assert(
diff --git a/cloud/filestore/libs/service/request.h b/cloud/filestore/libs/service/request.h
@@ -85,14 +85,12 @@ namespace NCloud::NFileStore {
 #define FILESTORE_CONTROL_SERVICE(xxx, ...)                                    \
     xxx(Ping,                               __VA_ARGS__)                       \
     xxx(PingSession,                        __VA_ARGS__)                       \
-    xxx(ToggleServiceState,                 __VA_ARGS__)                       \
     FILESTORE_SERVICE_METHODS(xxx,          __VA_ARGS__)                       \
 // FILESTORE_CONTROL_SERVICE
 
 #define FILESTORE_SERVICE(xxx, ...)                                            \
     xxx(Ping,                               __VA_ARGS__)                       \
     xxx(PingSession,                        __VA_ARGS__)                       \
-    xxx(ToggleServiceState,                 __VA_ARGS__)                       \
     FILESTORE_SERVICE_METHODS(xxx,          __VA_ARGS__)                       \
     FILESTORE_DATA_METHODS(xxx,             __VA_ARGS__)                       \
     FILESTORE_LOCAL_DATA_METHODS(xxx,       __VA_ARGS__)                       \
@@ -101,7 +99,6 @@ namespace NCloud::NFileStore {
 #define FILESTORE_REMOTE_SERVICE(xxx, ...)                                     \
     xxx(Ping,                               __VA_ARGS__)                       \
     xxx(PingSession,                        __VA_ARGS__)                       \
-    xxx(ToggleServiceState,                 __VA_ARGS__)                       \
     FILESTORE_SERVICE_METHODS(xxx,          __VA_ARGS__)                       \
     FILESTORE_DATA_METHODS(xxx,             __VA_ARGS__)                       \
 // FILESTORE_SERVICE
@@ -135,7 +132,6 @@ namespace NCloud::NFileStore {
 #define FILESTORE_PROTO_REQUESTS(xxx, ...)                                     \
     xxx(Ping,                               __VA_ARGS__)                       \
     xxx(PingSession,                        __VA_ARGS__)                       \
-    xxx(ToggleServiceState,                 __VA_ARGS__)                       \
     FILESTORE_SERVICE_METHODS(xxx,          __VA_ARGS__)                       \
     FILESTORE_DATA_METHODS(xxx,             __VA_ARGS__)                       \
     FILESTORE_LOCAL_DATA_METHODS(xxx,       __VA_ARGS__)                       \
@@ -152,7 +148,6 @@ enum class EFileStoreRequest
     AddData,
     ReadBlob,
     WriteBlob,
-    ToggleServiceState,
     MAX
 };
 
diff --git a/cloud/filestore/libs/service_local/fs.h b/cloud/filestore/libs/service_local/fs.h
@@ -72,7 +72,6 @@ namespace NCloud::NFileStore {
 #define FILESTORE_SERVICE_LOCAL_SYNC(xxx, ...)                                 \
     xxx(Ping,                               __VA_ARGS__)                       \
     xxx(PingSession,                        __VA_ARGS__)                       \
-    xxx(ToggleServiceState,                 __VA_ARGS__)                       \
     FILESTORE_SERVICE_METHODS(xxx,          __VA_ARGS__)                       \
     FILESTORE_DATA_METHODS_LOCAL_SYNC(xxx,  __VA_ARGS__)                       \
 // FILESTORE_SERVICE_LOCAL_SYNC
diff --git a/cloud/filestore/libs/service_local/service.cpp b/cloud/filestore/libs/service_local/service.cpp
@@ -422,15 +422,6 @@ FILESTORE_IMPLEMENT_METHOD_ASYNC(WriteDataLocal)
         return {};
     }
 
-    template <>
-    NProto::TToggleServiceStateResponse Execute<TToggleServiceStateMethod>(
-        NProto::TToggleServiceStateRequest& request,
-        NProto::TProfileLogRequestInfo& logRequest)
-    {
-        Y_UNUSED(request, logRequest);
-        return {};
-    }
-
     template <>
     NProto::TCreateFileStoreResponse Execute<TCreateFileStoreMethod>(
         NProto::TCreateFileStoreRequest& request,
diff --git a/cloud/filestore/libs/storage/service/service_actor.h b/cloud/filestore/libs/storage/service/service_actor.h
@@ -261,6 +261,11 @@ class TStorageServiceActor final
         TRequestInfoPtr requestInfo,
         TString input);
 
+    void PerformToggleServiceStateAction(
+        const NActors::TActorContext& ctx,
+        TRequestInfoPtr requestInfo,
+        TString input);
+
 private:
     void RenderSessions(IOutputStream& out);
     void RenderLocalFileStores(IOutputStream& out);
diff --git a/cloud/filestore/libs/storage/service/service_actor_actions.cpp b/cloud/filestore/libs/storage/service/service_actor_actions.cpp
@@ -114,14 +114,35 @@ void TStorageServiceActor::HandleExecuteAction(
         }
     };
 
+    using TInstantAction = void (TStorageServiceActor::*)(
+        const NActors::TActorContext&,
+        TRequestInfoPtr,
+        TString);
+
+    static const THashMap<TString, TInstantAction> instantActions = {
+        {
+            "toggleservicestate",
+            &TStorageServiceActor::PerformToggleServiceStateAction
+        }
+    };
+
     auto it = actions.find(action);
-    if (it == actions.end()) {
-        NCloud::Reply(ctx, *requestInfo, ActionNotFoundResponse());
+    if (it != actions.end()) {
+        auto actorBuilder = it->second;
+        auto actor =
+            std::invoke(actorBuilder, this, requestInfo, std::move(input));
+        NCloud::Register(ctx, std::move(actor));
         return;
     }
-    auto actorBuilder = it->second;
-    auto actor = std::invoke(actorBuilder, this, requestInfo, std::move(input));
-    NCloud::Register(ctx, std::move(actor));
+
+    auto instantIt = instantActions.find(action);
+    if (instantIt != instantActions.end()) {
+        auto instantAction = instantIt->second;
+        std::invoke(instantAction, this, ctx, requestInfo, std::move(input));
+        return;
+    }
+
+    NCloud::Reply(ctx, *requestInfo, ActionNotFoundResponse());
 }
 
 }   // namespace NCloud::NFileStore::NStorage
diff --git a/cloud/filestore/libs/storage/service/service_actor_actions_toggle_service_state.cpp b/cloud/filestore/libs/storage/service/service_actor_actions_toggle_service_state.cpp
@@ -0,0 +1,44 @@
+#include "service_actor.h"
+
+#include <cloud/filestore/private/api/protos/actions.pb.h>
+
+#include <google/protobuf/util/json_util.h>
+
+namespace NCloud::NFileStore::NStorage {
+
+using namespace NActors;
+
+using namespace NKikimr;
+
+////////////////////////////////////////////////////////////////////////////////
+
+void TStorageServiceActor::PerformToggleServiceStateAction(
+    const NActors::TActorContext& ctx,
+    TRequestInfoPtr requestInfo,
+    TString input)
+{
+    NProtoPrivate::TToggleServiceStateRequest request;
+    if (!google::protobuf::util::JsonStringToMessage(input, &request).ok()) {
+        auto msg = std::make_unique<TEvService::TEvExecuteActionResponse>(
+            TErrorResponse(E_ARGUMENT, "Failed to parse input"));
+        NCloud::Reply(ctx, *requestInfo, std::move(msg));
+        return;
+    }
+
+    ServiceState = request.GetDesiredServiceState();
+    LOG_INFO(
+        ctx,
+        TFileStoreComponents::SERVICE,
+        "Service state changed to %s",
+        EServiceState_Name(ServiceState).Quote().c_str());
+
+    NProtoPrivate::TToggleServiceStateResponse response;
+
+    auto msg = std::make_unique<TEvService::TEvExecuteActionResponse>();
+    google::protobuf::util::MessageToJsonString(
+        response,
+        msg->Record.MutableOutput());
+    NCloud::Reply(ctx, *requestInfo, std::move(msg));
+}
+
+}   // namespace NCloud::NFileStore::NStorage
diff --git a/cloud/filestore/libs/storage/service/service_actor_toggle_service_state.cpp b/cloud/filestore/libs/storage/service/service_actor_toggle_service_state.cpp
diff --git a/cloud/filestore/libs/storage/service/service_ut.cpp b/cloud/filestore/libs/storage/service/service_ut.cpp
@@ -4045,8 +4045,12 @@ Y_UNIT_TEST_SUITE(TStorageServiceTest)
             pingResponse->Record.GetServiceState(),
             pingResponse->Record.ShortDebugString());
 
-        service.ToggleServiceState(
+        NProtoPrivate::TToggleServiceStateRequest toggleRequest;
+        toggleRequest.SetDesiredServiceState(
             NProto::EServiceState::SERVICE_STATE_STOPPING);
+        TString buf;
+        google::protobuf::util::MessageToJsonString(toggleRequest, &buf);
+        service.ExecuteAction("toggleservicestate", buf);
 
         pingResponse = service.Ping();
         UNIT_ASSERT_EQUAL_C(
diff --git a/cloud/filestore/libs/storage/service/ya.make b/cloud/filestore/libs/storage/service/ya.make
@@ -15,6 +15,7 @@ SRCS(
     service_actor_actions_tablet_ops.cpp
     service_actor_actions_write_compaction_map.cpp
     service_actor_actions_list_local_filestores.cpp
+    service_actor_actions_toggle_service_state.cpp
     service_actor_actions.cpp
     service_actor_alterfs.cpp
     service_actor_complete.cpp
@@ -34,7 +35,6 @@ SRCS(
     service_actor_monitoring.cpp
     service_actor_monitoring_search.cpp
     service_actor_ping.cpp
-    service_actor_toggle_service_state.cpp
     service_actor_pingsession.cpp
     service_actor_readdata.cpp
     service_actor_statfs.cpp
diff --git a/cloud/filestore/libs/storage/testlib/service_client.h b/cloud/filestore/libs/storage/testlib/service_client.h
@@ -422,14 +422,6 @@ class TServiceClient
         return request;
     }
 
-    auto CreateToggleServiceStateRequest(NProto::EServiceState desiredState)
-    {
-        auto request =
-            std::make_unique<TEvService::TEvToggleServiceStateRequest>();
-        request->Record.SetDesiredServiceState(desiredState);
-        return request;
-    }
-
     std::unique_ptr<TEvService::TEvExecuteActionRequest> CreateExecuteActionRequest(
         const TString& action,
         const TString& input)
diff --git a/cloud/filestore/private/api/protos/actions.proto b/cloud/filestore/private/api/protos/actions.proto
@@ -1,5 +1,7 @@
 syntax = "proto3";
 
+import "cloud/filestore/public/api/protos/ping.proto";
+
 package NCloud.NFileStore.NProtoPrivate;
 
 option go_package = "github.com/ydb-platform/nbs/cloud/filestore/private/api/protos";
@@ -40,3 +42,16 @@ message TListLocalFileStoresResponse
 {
     repeated string FileSystemIds = 1;
 }
+
+////////////////////////////////////////////////////////////////////////////////
+// Toggle service state request/response
+
+message TToggleServiceStateRequest
+{
+    // Desired service state.
+    NProto.EServiceState DesiredServiceState = 1;
+}
+
+message TToggleServiceStateResponse
+{
+}
diff --git a/cloud/filestore/public/api/grpc/service.proto b/cloud/filestore/public/api/grpc/service.proto
@@ -178,13 +178,6 @@ service TFileStoreService
         };
     }
 
-    rpc ToggleServiceState(TToggleServiceStateRequest) returns (TToggleServiceStateResponse) {
-        option (google.api.http) = {
-            post: "/toggle_service_state"
-            body: "*"
-        };
-    }
-
     rpc SubscribeSession(TSubscribeSessionRequest) returns (TSubscribeSessionResponse) {
         option (google.api.http) = {
             post: "/subscribe_session"
diff --git a/cloud/filestore/public/api/protos/ping.proto b/cloud/filestore/public/api/protos/ping.proto
@@ -31,21 +31,3 @@ message TPingResponse
     // Current service state.
     EServiceState ServiceState = 2;
 }
-
-////////////////////////////////////////////////////////////////////////////////
-// Toggle service state request/response
-
-message TToggleServiceStateRequest
-{
-    // Desired service state.
-    EServiceState DesiredServiceState = 1;
-
-    // Optional request headers.
-    THeaders Headers = 2;
-}
-
-message TToggleServiceStateResponse
-{
-    // Optional error, set only if error happened.
-    NCloud.NProto.TError Error = 1;
-}
diff --git a/cloud/filestore/tools/analytics/libs/event-log/dump_ut.cpp b/cloud/filestore/tools/analytics/libs/event-log/dump_ut.cpp
@@ -94,7 +94,7 @@ Y_UNIT_TEST_SUITE(TDumpTest)
     {
         const auto requests = GetRequestTypes();
 
-        UNIT_ASSERT_VALUES_EQUAL(74, requests.size());
+        UNIT_ASSERT_VALUES_EQUAL(73, requests.size());
 
         ui32 index = 0;
 #define TEST_REQUEST_TYPE(id, name)                                            \
@@ -163,7 +163,6 @@ Y_UNIT_TEST_SUITE(TDumpTest)
         TEST_REQUEST_TYPE(55, AddData);
         TEST_REQUEST_TYPE(56, ReadBlob);
         TEST_REQUEST_TYPE(57, WriteBlob);
-        TEST_REQUEST_TYPE(58, ToggleServiceState);
 
         // Fuse
         TEST_REQUEST_TYPE(1001, Flush);
diff --git a/cloud/filestore/tools/testing/loadtest/lib/request_replay.cpp b/cloud/filestore/tools/testing/loadtest/lib/request_replay.cpp
@@ -141,7 +141,6 @@ TFuture<TCompletedRequest> IReplayRequestGenerator::ProcessRequest(
         case EFileStoreRequest::GenerateBlobIds:
         case EFileStoreRequest::PingSession:
         case EFileStoreRequest::Ping:
-        case EFileStoreRequest::ToggleServiceState:
         case EFileStoreRequest::DescribeData:
         case EFileStoreRequest::AddData:
             return {};
