From 121bb1315157b1ef344da05cef5ed3761033be2b Mon Sep 17 00:00:00 2001
From: Mikhail Montsev <svartmetal@nebius.com>
Date: Mon, 13 Jan 2025 16:33:30 +0000
Subject: [PATCH] [Filestore] improve TReadDataActor actor logs

---
 .../service/service_actor_readdata.cpp        | 32 +++++++++++--------
 1 file changed, 19 insertions(+), 13 deletions(-)

diff --git a/cloud/filestore/libs/storage/service/service_actor_readdata.cpp b/cloud/filestore/libs/storage/service/service_actor_readdata.cpp
index 3c8dc712080..af9f8ad178e 100644
--- a/cloud/filestore/libs/storage/service/service_actor_readdata.cpp
+++ b/cloud/filestore/libs/storage/service/service_actor_readdata.cpp
@@ -137,7 +137,8 @@ void TReadDataActor::DescribeData(const TActorContext& ctx)
     LOG_DEBUG(
         ctx,
         TFileStoreComponents::SERVICE,
-        "Executing DescribeData for %lu, %lu, %lu, %lu",
+        "Executing DescribeData for %s, %lu, %lu, %lu, %lu",
+        ReadRequest.GetFileSystemId().c_str(),
         ReadRequest.GetNodeId(),
         ReadRequest.GetHandle(),
         ReadRequest.GetOffset(),
@@ -379,15 +380,16 @@ void TReadDataActor::HandleReadBlobResponse(
     const auto* msg = ev->Get();
 
     if (msg->Status != NKikimrProto::OK) {
-        const auto errorReason = FormatError(
-            MakeError(MAKE_KIKIMR_ERROR(msg->Status), msg->ErrorReason));
         LOG_WARN(
             ctx,
             TFileStoreComponents::SERVICE,
-            "ReadBlob error: %s",
-            errorReason.c_str());
-        ReadData(ctx, errorReason);
+            "TEvBlobStorage::TEvGet failed for %s: response %s",
+            ReadRequest.GetFileSystemId().c_str(),
+            msg->Print(false).c_str());
 
+        const auto errorReason = FormatError(
+            MakeError(MAKE_KIKIMR_ERROR(msg->Status), msg->ErrorReason));
+        ReadData(ctx, errorReason);
         return;
     }
 
@@ -409,15 +411,17 @@ void TReadDataActor::HandleReadBlobResponse(
         const auto& blobRange = blobPiece.GetRanges(i);
         const auto& response = msg->Responses[i];
         if (response.Status != NKikimrProto::OK) {
-            const auto errorReason = FormatError(
-                MakeError(MAKE_KIKIMR_ERROR(response.Status), "read error"));
             LOG_WARN(
                 ctx,
                 TFileStoreComponents::SERVICE,
-                "ReadBlob error: %s",
-                errorReason.c_str());
-            ReadData(ctx, errorReason);
+                "TEvBlobStorage::TEvGet query failed for %s: status %s, response %s",
+                ReadRequest.GetFileSystemId().c_str(),
+                NKikimrProto::EReplyStatus_Name(response.Status).c_str(),
+                msg->Print(false).c_str());
 
+            const auto errorReason = FormatError(
+                MakeError(MAKE_KIKIMR_ERROR(response.Status), "read error"));
+            ReadData(ctx, errorReason);
             return;
         }
 
@@ -438,7 +442,8 @@ void TReadDataActor::HandleReadBlobResponse(
             LOG_WARN(
                 ctx,
                 TFileStoreComponents::SERVICE,
-                "ReadBlob error: %s",
+                "ReadBlob error for %s: %s",
+                ReadRequest.GetFileSystemId().c_str(),
                 error.c_str());
             ReadData(ctx, error);
 
@@ -503,7 +508,8 @@ void TReadDataActor::ReadData(
     LOG_WARN(
         ctx,
         TFileStoreComponents::SERVICE,
-        "Falling back to ReadData for %lu, %lu, %lu, %lu. Message: %s",
+        "Falling back to ReadData for %s, node: %lu, handle: %lu, offset: %lu, length: %lu. Message: %s",
+        ReadRequest.GetFileSystemId().c_str(),
         ReadRequest.GetNodeId(),
         ReadRequest.GetHandle(),
         ReadRequest.GetOffset(),