[NBS, Filestore] add filename and line to the "tablet is dead" message (

#2755) * [NBS, Filestore] add filename and line to the "tablet is dead" message
ydb-platform · Dec 25, 2024 · e708405 · e708405
1 parent 734b8e3
commit e708405
Show file tree

Hide file tree

Showing 24 changed files with 35 additions and 23 deletions.
diff --git a/cloud/blockstore/libs/storage/disk_registry/disk_registry_actor.cpp b/cloud/blockstore/libs/storage/disk_registry/disk_registry_actor.cpp
@@ -185,7 +185,7 @@ void TDiskRegistryActor::BeforeDie(const NActors::TActorContext& ctx)
         ReplyToPendingDeallocations(
             ctx,
             requestInfos,
-            MakeError(E_REJECTED, "Tablet is dead"));
+            MakeTabletIsDeadError(E_REJECTED, __LOCATION__));
     }
     PendingDiskDeallocationRequests.clear();
 }

diff --git a/cloud/blockstore/libs/storage/disk_registry/disk_registry_actor_acquire.cpp b/cloud/blockstore/libs/storage/disk_registry/disk_registry_actor_acquire.cpp
@@ -287,7 +287,7 @@ void TAcquireDiskActor::HandlePoisonPill(
 {
     Y_UNUSED(ev);
 
-    ReplyAndDie(ctx, MakeError(E_REJECTED, "Tablet is dead"));
+    ReplyAndDie(ctx, MakeTabletIsDeadError(E_REJECTED, __LOCATION__));
 }
 
 void TAcquireDiskActor::OnAcquireResponse(

diff --git a/cloud/blockstore/libs/storage/disk_registry/disk_registry_actor_cleanup.cpp b/cloud/blockstore/libs/storage/disk_registry/disk_registry_actor_cleanup.cpp
@@ -174,7 +174,7 @@ void TCleanupActor::HandlePoisonPill(
     const TActorContext& ctx)
 {
     Y_UNUSED(ev);
-    ReplyAndDie(ctx, MakeError(E_REJECTED, "Tablet is dead"));
+    ReplyAndDie(ctx, MakeTabletIsDeadError(E_REJECTED, __LOCATION__));
 }
 
 ////////////////////////////////////////////////////////////////////////////////

diff --git a/cloud/blockstore/libs/storage/disk_registry/disk_registry_actor_cms.cpp b/cloud/blockstore/libs/storage/disk_registry/disk_registry_actor_cms.cpp
@@ -275,7 +275,8 @@ void TCmsRequestActor::HandlePoisonPill(
 {
     Y_UNUSED(ev);
 
-    *Response->Record.MutableError() = MakeError(E_REJECTED, "Tablet is dead");
+    *Response->Record.MutableError() =
+        MakeTabletIsDeadError(E_REJECTED, __LOCATION__);
 
     ReplyAndDie(ctx);
 }

diff --git a/cloud/blockstore/libs/storage/disk_registry/disk_registry_actor_destroy.cpp b/cloud/blockstore/libs/storage/disk_registry/disk_registry_actor_destroy.cpp
@@ -127,7 +127,7 @@ void TDestroyActor::HandlePoisonPill(
     const TActorContext& ctx)
 {
     Y_UNUSED(ev);
-    ReplyAndDie(ctx, MakeError(E_REJECTED, "Tablet is dead"));
+    ReplyAndDie(ctx, MakeTabletIsDeadError(E_REJECTED, __LOCATION__));
 }
 
 void TDestroyActor::HandleDestroyVolumeResponse(

diff --git a/cloud/blockstore/libs/storage/disk_registry/disk_registry_actor_migration.cpp b/cloud/blockstore/libs/storage/disk_registry/disk_registry_actor_migration.cpp
@@ -110,7 +110,7 @@ void TMarkReplacementDevicesActor::HandlePoisonPill(
 {
     Y_UNUSED(ev);
 
-    Error = MakeError(E_REJECTED, "Tablet is dead");
+    Error = MakeTabletIsDeadError(E_REJECTED, __LOCATION__);
     ReplyAndDie(ctx);
 }
 

diff --git a/...d/blockstore/libs/storage/disk_registry/disk_registry_actor_monitoring_replace_device.cpp b/...d/blockstore/libs/storage/disk_registry/disk_registry_actor_monitoring_replace_device.cpp
@@ -133,7 +133,7 @@ void TReplaceActor::HandlePoisonPill(
     const TActorContext& ctx)
 {
     Y_UNUSED(ev);
-    ReplyAndDie(ctx, MakeError(E_REJECTED, "Tablet is dead"));
+    ReplyAndDie(ctx, MakeTabletIsDeadError(E_REJECTED, __LOCATION__));
 }
 
 void TReplaceActor::HandleReplaceDeviceResponse(

diff --git a/...d/blockstore/libs/storage/disk_registry/disk_registry_actor_monitoring_volume_realloc.cpp b/...d/blockstore/libs/storage/disk_registry/disk_registry_actor_monitoring_volume_realloc.cpp
@@ -130,7 +130,7 @@ void THttpVolumeReallocActor::HandlePoisonPill(
     const TActorContext& ctx)
 {
     Y_UNUSED(ev);
-    ReplyAndDie(ctx, MakeError(E_REJECTED, "Tablet is dead"));
+    ReplyAndDie(ctx, MakeTabletIsDeadError(E_REJECTED, __LOCATION__));
 }
 
 ////////////////////////////////////////////////////////////////////////////////

diff --git a/cloud/blockstore/libs/storage/disk_registry/disk_registry_actor_release.cpp b/cloud/blockstore/libs/storage/disk_registry/disk_registry_actor_release.cpp
@@ -214,7 +214,7 @@ void TReleaseDiskActor::HandlePoisonPill(
 {
     Y_UNUSED(ev);
 
-    ReplyAndDie(ctx, MakeError(E_REJECTED, "Tablet is dead"));
+    ReplyAndDie(ctx, MakeTabletIsDeadError(E_REJECTED, __LOCATION__));
 }
 
 void TReleaseDiskActor::HandleTimeout(

diff --git a/cloud/blockstore/libs/storage/disk_registry/disk_registry_actor_replace.cpp b/cloud/blockstore/libs/storage/disk_registry/disk_registry_actor_replace.cpp
@@ -120,7 +120,7 @@ void TReplaceActor::HandlePoisonPill(
     const TActorContext& ctx)
 {
     Y_UNUSED(ev);
-    ReplyAndDie(ctx, MakeError(E_REJECTED, "Tablet is dead"));
+    ReplyAndDie(ctx, MakeTabletIsDeadError(E_REJECTED, __LOCATION__));
 }
 
 ////////////////////////////////////////////////////////////////////////////////

diff --git a/cloud/blockstore/libs/storage/disk_registry/disk_registry_actor_resume_device.cpp b/cloud/blockstore/libs/storage/disk_registry/disk_registry_actor_resume_device.cpp
@@ -102,7 +102,7 @@ void TResumeDeviceActor::HandlePoisonPill(
     const TActorContext& ctx)
 {
     Y_UNUSED(ev);
-    ReplyAndDie(ctx, MakeError(E_REJECTED, "Tablet is dead"));
+    ReplyAndDie(ctx, MakeTabletIsDeadError(E_REJECTED, __LOCATION__));
 }
 
 ////////////////////////////////////////////////////////////////////////////////

diff --git a/cloud/blockstore/libs/storage/disk_registry/disk_registry_actor_secure_erase.cpp b/cloud/blockstore/libs/storage/disk_registry/disk_registry_actor_secure_erase.cpp
@@ -222,7 +222,7 @@ void TSecureEraseActor::HandlePoisonPill(
     const TActorContext& ctx)
 {
     Y_UNUSED(ev);
-    ReplyAndDie(ctx, MakeError(E_REJECTED, "Tablet is dead"));
+    ReplyAndDie(ctx, MakeTabletIsDeadError(E_REJECTED, __LOCATION__));
 }
 
 STFUNC(TSecureEraseActor::StateErase)

diff --git a/cloud/blockstore/libs/storage/disk_registry/disk_registry_actor_volume_config.cpp b/cloud/blockstore/libs/storage/disk_registry/disk_registry_actor_volume_config.cpp
@@ -168,7 +168,7 @@ void TUpdateActor::HandlePoisonPill(
     const TActorContext& ctx)
 {
     Y_UNUSED(ev);
-    ReplyAndDie(ctx, MakeError(E_REJECTED, "Tablet is dead"));
+    ReplyAndDie(ctx, MakeTabletIsDeadError(E_REJECTED, __LOCATION__));
 }
 
 void TUpdateActor::ReplyAndDie(const TActorContext& ctx, NProto::TError error)

diff --git a/cloud/blockstore/libs/storage/service/service_actor_mount.cpp b/cloud/blockstore/libs/storage/service/service_actor_mount.cpp
@@ -80,7 +80,7 @@ class TMountVolumeActor final
 
         auto response =
             std::make_unique<TEvService::TEvMountVolumeResponse>(
-                MakeError(E_REJECTED, "Tablet is dead"));
+                MakeTabletIsDeadError(E_REJECTED, __LOCATION__));
 
         NCloud::Reply(ctx, *RequestInfo, std::move(response));
         Die(ctx);

diff --git a/cloud/blockstore/libs/storage/service/service_actor_readblocks.cpp b/cloud/blockstore/libs/storage/service/service_actor_readblocks.cpp
@@ -105,7 +105,7 @@ class TReadBlocksRemoteRequestActor final
         const TActorContext& ctx)
     {
         auto response = std::make_unique<TEvService::TEvReadBlocksLocalResponse>(
-            MakeError(E_REJECTED, "Tablet is dead"));
+            MakeTabletIsDeadError(E_REJECTED, __LOCATION__));
 
         NCloud::Reply(ctx, *Request, std::move(response));
         Die(ctx);

diff --git a/cloud/blockstore/libs/storage/service/service_actor_volume_binding.cpp b/cloud/blockstore/libs/storage/service/service_actor_volume_binding.cpp
@@ -99,7 +99,7 @@ class TDelayChangeBindingActor final
 
         auto response =
             std::make_unique<TEvService::TEvChangeVolumeBindingResponse>(
-                MakeError(E_REJECTED, "Tablet is dead"),
+                MakeTabletIsDeadError(E_REJECTED, __LOCATION__),
                 DiskId);
 
         NCloud::Reply(ctx, *RequestInfo, std::move(response));

diff --git a/cloud/blockstore/libs/storage/service/service_actor_writeblocks.cpp b/cloud/blockstore/libs/storage/service/service_actor_writeblocks.cpp
@@ -143,7 +143,7 @@ class TWriteBlocksRemoteRequestActor final
         const TEvService::TEvWriteBlocksRequest::TPtr&,
         const TActorContext& ctx)
     {
-        ReplyAndDie(ctx, MakeError(E_REJECTED, "Tablet is dead"));
+        ReplyAndDie(ctx, MakeTabletIsDeadError(E_REJECTED, __LOCATION__));
     }
 
     void HandleWriteBlocksResponse(

diff --git a/cloud/blockstore/libs/storage/service/service_ut_mount.cpp b/cloud/blockstore/libs/storage/service/service_ut_mount.cpp
@@ -2626,7 +2626,7 @@ Y_UNIT_TEST_SUITE(TServiceMountVolumeTest)
                 switch (event->GetTypeRewrite()) {
                     case TEvVolume::EvRemoveClientRequest: {
                         auto msg = std::make_unique<TEvVolume::TEvRemoveClientResponse>(
-                            MakeError(E_REJECTED, "Tablet is dead"));
+                            MakeTabletIsDeadError(E_REJECTED, __LOCATION__));
                         runtime.Send(
                             new IEventHandle(
                                 event->Sender,

diff --git a/cloud/blockstore/libs/storage/service/volume_client_actor.cpp b/cloud/blockstore/libs/storage/service/volume_client_actor.cpp
@@ -259,7 +259,7 @@ void TVolumeClientActor::HandleRequest(
     // otherwise it is safe to use Get() to retrieve actual message.
     if (!ev->HasBuffer() && !ev->HasEvent()) {
         auto response = std::make_unique<typename TMethod::TResponse>(
-            MakeError(E_REJECTED, "Tablet is dead"));
+            MakeTabletIsDeadError(E_REJECTED, __LOCATION__));
 
         NCloud::Reply(ctx, *ev, std::move(response));
         return;

diff --git a/cloud/blockstore/libs/storage/undelivered/undelivered.cpp b/cloud/blockstore/libs/storage/undelivered/undelivered.cpp
@@ -54,8 +54,8 @@ void TUndeliveredHandlerActor::CancelRequest(
     const TActorContext& ctx,
     const typename TMethod::TRequest::TPtr& ev)
 {
-   auto response = std::make_unique<typename TMethod::TResponse>(
-        MakeError(E_REJECTED, "Tablet is dead"));
+    auto response = std::make_unique<typename TMethod::TResponse>(
+        MakeTabletIsDeadError(E_REJECTED, __LOCATION__));
 
     NCloud::Reply(ctx, *ev, std::move(response));
 }

diff --git a/cloud/blockstore/libs/storage/volume_proxy/volume_proxy.cpp b/cloud/blockstore/libs/storage/volume_proxy/volume_proxy.cpp
@@ -587,7 +587,7 @@ void TVolumeProxyActor::HandleRequest(
     // otherwise it is safe to use Get() to retrieve actual message.
     if (!ev->HasBuffer() && !ev->HasEvent()) {
         auto response = std::make_unique<typename TMethod::TResponse>(
-            MakeError(E_REJECTED, "Tablet is dead"));
+            MakeTabletIsDeadError(E_REJECTED, __LOCATION__));
 
         NCloud::Reply(ctx, *ev, std::move(response));
         return;

diff --git a/cloud/filestore/libs/storage/tablet_proxy/tablet_proxy_actor.cpp b/cloud/filestore/libs/storage/tablet_proxy/tablet_proxy_actor.cpp
@@ -310,7 +310,7 @@ void TIndexTabletProxyActor::HandleRequest(
     // otherwise it is safe to use Get() to retrieve actual message.
     if (!ev->HasBuffer() && !ev->HasEvent()) {
         auto response = std::make_unique<typename TMethod::TResponse>(
-            MakeError(E_REJECTED, "tablet is dead"));
+            MakeTabletIsDeadError(E_REJECTED, __LOCATION__));
 
         NCloud::Reply(ctx, *ev, std::move(response));
         return;

diff --git a/cloud/storage/core/libs/common/error.cpp b/cloud/storage/core/libs/common/error.cpp
@@ -249,6 +249,13 @@ NProto::TError MakeError(ui32 code, TString message, ui32 flags)
     return error;
 }
 
+NProto::TError MakeTabletIsDeadError(ui32 code, const TSourceLocation& location)
+{
+    TStringStream out;
+    out << "Tablet is dead: " << location.File << ":" << location.Line;
+    return MakeError(code, out.Str());
+}
+
 }   // namespace NCloud
 
 ////////////////////////////////////////////////////////////////////////////////

diff --git a/cloud/storage/core/libs/common/error.h b/cloud/storage/core/libs/common/error.h
@@ -467,6 +467,10 @@ inline TResultOrError<void> ResultOrError(NThreading::TFuture<void>& future)
     });
 }
 
+NProto::TError MakeTabletIsDeadError(
+    ui32 code,
+    const TSourceLocation& location);
+
 }   // namespace NCloud
 
 ////////////////////////////////////////////////////////////////////////////////