Log improvements for TVolumeProxyActor

Author: drbasic

cloud/blockstore/libs/storage/init/server/actorsystem.cpp

@@ -171,7 +171,8 @@ class TStorageServicesInitializer final
 
         auto volumeProxy = CreateVolumeProxy(
             Args.StorageConfig,
-            Args.TraceSerializer);
+            Args.TraceSerializer,
+            Args.TemporaryServer);
 
         setup->LocalServices.emplace_back(
             MakeVolumeProxyServiceId(),

cloud/blockstore/libs/storage/model/log_title.cpp

@@ -68,6 +68,15 @@ TLogTitle::TLogTitle(
     Rebuild();
 }
 
+TLogTitle::TLogTitle(TString diskId, bool temporaryServer, ui64 startTime)
+    : Type(EType::Proxy)
+    , StartTime(startTime)
+    , TemporaryServer(temporaryServer)
+    , DiskId(std::move(diskId))
+{
+    Rebuild();
+}
+
 // static
 TString TLogTitle::GetPartitionPrefix(
     ui64 tabletId,
@@ -140,12 +149,6 @@ void TLogTitle::SetTabletId(ui64 tabletId)
     Rebuild();
 }
 
-void TLogTitle::SetPipeGeneration(ui32 pipeGeneration)
-{
-    PipeGeneration = pipeGeneration;
-    Rebuild();
-}
-
 void TLogTitle::Rebuild()
 {
     switch (Type) {
@@ -165,6 +168,10 @@ void TLogTitle::Rebuild()
             RebuildForClient();
             break;
         }
+        case EType::Proxy: {
+            RebuildForProxy();
+            break;
+        }
     }
 }
 
@@ -249,12 +256,32 @@ void TLogTitle::RebuildForClient()
     builder << " c:" << ClientId;
 
     builder << " pg:";
-    if (PipeGeneration) {
-        builder << PipeGeneration;
+    if (Generation) {
+        builder << Generation;
     } else {
         builder << "?";
     }
     CachedPrefix = builder;
 }
 
+void TLogTitle::RebuildForProxy()
+{
+    auto builder = TStringBuilder();
+
+    builder << "[";
+    if (TemporaryServer) {
+        builder << "~";
+    }
+    builder << "vp:";
+    if (TabletId) {
+        builder << TabletId;
+    } else {
+        builder << "?";
+    }
+    builder << " d:" << DiskId;
+    builder << " pg:" << Generation;
+
+    CachedPrefix = builder;
+}
+
 }   // namespace NCloud::NBlockStore::NStorage

cloud/blockstore/libs/storage/model/log_title.h

@@ -24,6 +24,7 @@ class TLogTitle
         Partition,
         Session,
         Client,
+        Proxy,
     };
 
 private:
@@ -36,8 +37,7 @@ class TLogTitle
     const bool TemporaryServer = false;
 
     ui64 TabletId = 0;
-    ui64 Generation = 0;
-    ui32 PipeGeneration = 0;
+    ui32 Generation = 0;
     TString DiskId;
     TString CachedPrefix;
 
@@ -70,6 +70,9 @@ class TLogTitle
         bool temporaryServer,
         ui64 startTime);
 
+    // Constructor for VolumeProxy
+    TLogTitle(TString diskId, bool temporaryServer, ui64 startTime);
+
     static TString
     GetPartitionPrefix(ui64 tabletId, ui32 partitionIndex, ui32 partitionCount);
 
@@ -82,14 +85,14 @@ class TLogTitle
     void SetDiskId(TString diskId);
     void SetGeneration(ui32 generation);
     void SetTabletId(ui64 tabletId);
-    void SetPipeGeneration(ui32 pipeGeneration);
 
 private:
     void Rebuild();
     void RebuildForVolume();
     void RebuildForPartition();
     void RebuildForSession();
     void RebuildForClient();
+    void RebuildForProxy();
     TString GetPartitionPrefix() const;
 };
 

cloud/blockstore/libs/storage/model/log_title_ut.cpp

@@ -146,7 +146,7 @@ Y_UNIT_TEST_SUITE(TLogTitleTest)
             "[vc:12345 d:disk1 s:session-1 c:client-1 pg:?]",
             logTitle.Get(TLogTitle::EDetails::Brief));
 
-        logTitle.SetPipeGeneration(1);
+        logTitle.SetGeneration(1);
         UNIT_ASSERT_STRINGS_EQUAL(
             "[vc:12345 d:disk1 s:session-1 c:client-1 pg:1]",
             logTitle.Get(TLogTitle::EDetails::Brief));
@@ -167,6 +167,30 @@ Y_UNIT_TEST_SUITE(TLogTitleTest)
             temporayLogTitle.Get(TLogTitle::EDetails::Brief));
     }
 
+    Y_UNIT_TEST(GetForProxy)
+    {
+        TLogTitle logTitle("disk1", false, GetCycleCount());
+
+        UNIT_ASSERT_STRINGS_EQUAL(
+            "[vp:? d:disk1 pg:0]",
+            logTitle.Get(TLogTitle::EDetails::Brief));
+
+        logTitle.SetTabletId(12345);
+        UNIT_ASSERT_STRINGS_EQUAL(
+            "[vp:12345 d:disk1 pg:0]",
+            logTitle.Get(TLogTitle::EDetails::Brief));
+
+        logTitle.SetGeneration(5);
+        UNIT_ASSERT_STRINGS_EQUAL(
+            "[vp:12345 d:disk1 pg:5]",
+            logTitle.Get(TLogTitle::EDetails::Brief));
+
+        TLogTitle temporayLogTitle("disk1", true, GetCycleCount());
+        UNIT_ASSERT_STRINGS_EQUAL(
+            "[~vp:? d:disk1 pg:0]",
+            temporayLogTitle.Get(TLogTitle::EDetails::Brief));
+    }
+
     Y_UNIT_TEST(GetChildLogger)
     {
         const ui64 startTime =

cloud/blockstore/libs/storage/service/volume_client_actor.cpp

@@ -291,7 +291,7 @@ void TVolumeClientActor::HandleRequest(
     if (!PipeClient) {
         PipeClient = ctx.Register(CreateClient(SelfId(), TabletId, ClientConfig));
         ++Generation;
-        LogTitle.SetPipeGeneration(Generation);
+        LogTitle.SetGeneration(Generation);
     }
 
     LOG_TRACE(

cloud/blockstore/libs/storage/testlib/test_env.cpp

@@ -340,7 +340,7 @@ ui32 TTestEnv::CreateBlockStoreNode(
         drProxyId,
         nodeIdx);
 
-    auto volumeProxy = CreateVolumeProxy(storageConfig, TraceSerializer);
+    auto volumeProxy = CreateVolumeProxy(storageConfig, TraceSerializer, false);
     auto volumeProxyId = Runtime.Register(
         volumeProxy.release(),
         nodeIdx,