issue-1384: destruction of an already destroyed fs should return S_FA…

…LSE (#1659) Problem: DestroyFileStore for an already destroyed fs returns NKikimrScheme::EStatus::StatusPathDoesNotExist instead of S_FALSE Bug was introduced in #1441 because DestroyFileStore actor and DescribeSessions actor are handling missing fs in different ways.
ydb-platform · Jul 30, 2024 · 1af6e2b · 1af6e2b
1 parent b0a8b3a
commit 1af6e2b
Show file tree

Hide file tree

Showing 2 changed files with 55 additions and 0 deletions.
diff --git a/cloud/filestore/libs/storage/service/service_actor_destroyfs.cpp b/cloud/filestore/libs/storage/service/service_actor_destroyfs.cpp
@@ -97,6 +97,16 @@ void TDestroyFileStoreActor::HandleDescribeSessionsResponse(
 {
     const auto* msg = ev->Get();
     if (HasError(msg->GetError())) {
+        if (msg->GetStatus() ==
+            MAKE_SCHEMESHARD_ERROR(
+                NKikimrScheme::EStatus::StatusPathDoesNotExist))
+        {
+            ReplyAndDie(
+                ctx,
+                MakeError(S_FALSE, FileSystemId.Quote() + " does not exist"));
+            return;
+        }
+
         ReplyAndDie(ctx, msg->GetError());
         return;
     }

diff --git a/cloud/filestore/libs/storage/service/service_ut.cpp b/cloud/filestore/libs/storage/service/service_ut.cpp
@@ -3448,6 +3448,51 @@ Y_UNIT_TEST_SUITE(TStorageServiceTest)
             destroyFileStoreResponse->GetErrorReason());
     }
 
+    Y_UNIT_TEST(DestroyDestroyedFileStoreShouldFail)
+    {
+        TTestEnv env;
+        env.CreateSubDomain("nfs");
+
+        ui32 nodeIdx = env.CreateNode("nfs");
+
+        const TString fsId = "test";
+        const TString fsId2 = "test2";
+        const auto initialBlockCount = 1'000;
+        TServiceClient service(env.GetRuntime(), nodeIdx);
+        service.CreateFileStore(fsId, initialBlockCount);
+        service.CreateFileStore(fsId2, initialBlockCount);
+
+        {
+            auto destroyFileStoreResponse = service.DestroyFileStore(fsId);
+            UNIT_ASSERT_VALUES_EQUAL_C(
+                S_OK,
+                destroyFileStoreResponse->GetStatus(),
+                destroyFileStoreResponse->GetErrorReason());
+
+            auto alreadyDestroyedFileStoreResponse =
+                service.DestroyFileStore(fsId);
+            UNIT_ASSERT_VALUES_EQUAL_C(
+                S_FALSE,
+                alreadyDestroyedFileStoreResponse->GetStatus(),
+                alreadyDestroyedFileStoreResponse->GetErrorReason());
+        }
+
+        {
+            auto destroyFileStoreResponse = service.DestroyFileStore(fsId2);
+            UNIT_ASSERT_VALUES_EQUAL_C(
+                S_OK,
+                destroyFileStoreResponse->GetStatus(),
+                destroyFileStoreResponse->GetErrorReason());
+
+            auto alreadyDestroyedFileStoreResponse =
+                service.DestroyFileStore(fsId);
+            UNIT_ASSERT_VALUES_EQUAL_C(
+                S_FALSE,
+                alreadyDestroyedFileStoreResponse->GetStatus(),
+                alreadyDestroyedFileStoreResponse->GetErrorReason());
+        }
+    }
+
     Y_UNIT_TEST(ShouldValidateRequestsWithFollowerId)
     {
         TTestEnv env;