[merge to stable] issue-1285: fix missing StartedTs initialization for requestInfo in Flush, CollectGarbage and Cleanup, report readblob operation once event for multiple blobs in service sensors

cloud/filestore/libs/storage/service/service_actor_readdata.cpp

@@ -45,8 +45,7 @@ class TReadDataActor final: public TActorBootstrapped<TReadDataActor>
     // Stats for reporting
     IRequestStatsPtr RequestStats;
     IProfileLogPtr ProfileLog;
-    TMaybe<TInFlightRequest> InFlightRequest;
-    TVector<std::unique_ptr<TInFlightRequest>> InFlightBSRequests;
+    std::optional<TInFlightRequest> InFlightRequest;
     const NCloud::NProto::EStorageMediaKind MediaKind;
 
 public:
@@ -144,7 +143,7 @@ void TReadDataActor::DescribeData(const TActorContext& ctx)
 
     // RequestType is set in order to properly record the request type
     RequestInfo->CallContext->RequestType = EFileStoreRequest::DescribeData;
-    InFlightRequest.ConstructInPlace(
+    InFlightRequest.emplace(
         TRequestInfo(
             RequestInfo->Sender,
             RequestInfo->Cookie,
@@ -295,17 +294,18 @@ void TReadDataActor::ReadBlobIfNeeded(const TActorContext& ctx)
 
     RequestInfo->CallContext->RequestType = EFileStoreRequest::ReadBlob;
     ui32 blobPieceId = 0;
-    InFlightBSRequests.reserve(RemainingBlobsToRead);
+
+    InFlightRequest.emplace(
+        TRequestInfo(
+            RequestInfo->Sender,
+            RequestInfo->Cookie,
+            RequestInfo->CallContext),
+        ProfileLog,
+        MediaKind,
+        RequestStats);
+    InFlightRequest->Start(ctx.Now());
+
     for (const auto& blobPiece: DescribeResponse.GetBlobPieces()) {
-        InFlightBSRequests.emplace_back(std::make_unique<TInFlightRequest>(
-            TRequestInfo(
-                RequestInfo->Sender,
-                RequestInfo->Cookie,
-                RequestInfo->CallContext),
-            ProfileLog,
-            MediaKind,
-            RequestStats));
-        InFlightBSRequests.back()->Start(ctx.Now());
         NKikimr::TLogoBlobID blobId =
             LogoBlobIDFromLogoBlobID(blobPiece.GetBlobId());
         LOG_DEBUG(
@@ -387,12 +387,6 @@ void TReadDataActor::HandleReadBlobResponse(
     TABLET_VERIFY(ev->Cookie < DescribeResponse.BlobPiecesSize());
     const auto& blobPiece = DescribeResponse.GetBlobPieces(ev->Cookie);
 
-    ui64 blobIdx = ev->Cookie;
-    TABLET_VERIFY(
-        blobIdx < InFlightBSRequests.size() && InFlightBSRequests[blobIdx] &&
-        !InFlightBSRequests[blobIdx]->IsCompleted());
-    InFlightBSRequests[blobIdx]->Complete(ctx.Now(), {});
-
     for (size_t i = 0; i < msg->ResponseSz; ++i) {
         TABLET_VERIFY(i < blobPiece.RangesSize());
 
@@ -467,6 +461,8 @@ void TReadDataActor::HandleReadBlobResponse(
 
     --RemainingBlobsToRead;
     if (RemainingBlobsToRead == 0) {
+        InFlightRequest->Complete(ctx.Now(), {});
+
         RequestInfo->CallContext->RequestType = EFileStoreRequest::ReadData;
         ReplyAndDie(ctx);
     }

cloud/filestore/libs/storage/service/service_ut.cpp

@@ -2031,9 +2031,9 @@ Y_UNIT_TEST_SUITE(TStorageServiceTest)
         {
             auto subgroup = counters->FindSubgroup("request", "ReadBlob");
             UNIT_ASSERT(subgroup);
-            // 1MB = 4 blobs of 256KB. Read is performed thrice
+            // Read is performed thrice
             UNIT_ASSERT_VALUES_EQUAL(
-                12,
+                3,
                 subgroup->GetCounter("Count")->GetAtomic());
         }
     }

cloud/filestore/libs/storage/tablet/tablet_actor_cleanup.cpp

@@ -70,6 +70,7 @@ void TIndexTabletActor::HandleCleanup(
         ev->Sender,
         ev->Cookie,
         msg->CallContext);
+    requestInfo->StartedTs = ctx.Now();
 
     ExecuteTx<TCleanup>(
         ctx,

cloud/filestore/libs/storage/tablet/tablet_actor_collectgarbage.cpp

@@ -438,6 +438,7 @@ void TIndexTabletActor::HandleCollectGarbage(
         ev->Sender,
         ev->Cookie,
         msg->CallContext);
+    requestInfo->StartedTs = ctx.Now();
 
     auto channels = GetChannels(EChannelDataKind::Mixed);
 

cloud/filestore/libs/storage/tablet/tablet_actor_flush.cpp

@@ -364,6 +364,7 @@ void TIndexTabletActor::HandleFlush(
         ev->Sender,
         ev->Cookie,
         msg->CallContext);
+    requestInfo->StartedTs = ctx.Now();
 
     AcquireCollectBarrier(commitId);