Added macro to enable/disable VDiskSkeletonTrace (#1967)

Author: alexvru

ydb/core/blobstorage/vdisk/common/vdisk_events.h

@@ -35,6 +35,10 @@
 #define BS_EVVGET_SIZE_VERIFY 0
 #endif
 
+#ifndef VDISK_SKELETON_TRACE
+#define VDISK_SKELETON_TRACE 0
+#endif
+
 namespace NKikimr {
 
     namespace NBackpressure {
@@ -1528,7 +1532,9 @@ namespace NKikimr {
         , TEventWithRelevanceTracker
     {
         mutable NLWTrace::TOrbit Orbit;
+#if VDISK_SKELETON_TRACE
         std::shared_ptr<TVDiskSkeletonTrace> VDiskSkeletonTrace;
+#endif
 
         TEvVSpecialPatchBase() = default;
 
@@ -1922,7 +1928,9 @@ namespace NKikimr {
         , TEventWithRelevanceTracker
     {
         mutable NLWTrace::TOrbit Orbit;
+#if VDISK_SKELETON_TRACE
         std::shared_ptr<TVDiskSkeletonTrace> VDiskSkeletonTrace;
+#endif
 
         TEvVPatchStart() = default;
 
@@ -2008,7 +2016,9 @@ namespace NKikimr {
         , TEventWithRelevanceTracker
     {
         mutable NLWTrace::TOrbit Orbit;
+#if VDISK_SKELETON_TRACE
         std::shared_ptr<TVDiskSkeletonTrace> VDiskSkeletonTrace;
+#endif
 
         TEvVPatchDiff() = default;
 
@@ -2083,7 +2093,9 @@ namespace NKikimr {
         , TEventWithRelevanceTracker
     {
         mutable NLWTrace::TOrbit Orbit;
+#if VDISK_SKELETON_TRACE
         std::shared_ptr<TVDiskSkeletonTrace> VDiskSkeletonTrace;
+#endif
 
         TEvVPatchXorDiff() = default;
 

ydb/core/blobstorage/vdisk/skeleton/blobstorage_skeletonfront.cpp

@@ -335,10 +335,11 @@ namespace NKikimr {
                         hasError = true;
                         STLOG(PRI_ERROR, NKikimrServices::BS_SKELETON, BSVSF04,
                                 vDiskLogPrefix << " passed more than 5 munites for message in the internal queue",
-                                (MsgId, msgInfo.MsgId),,
+                                (MsgId, msgInfo.MsgId),
                                 (QueueName, Name),
                                 (PassedTimeSeconds, passedTime.Seconds()),
-                                (Trace, (msgInfo.VDiskSkeletonTrace ? msgInfo.VDiskSkeletonTrace->ToString() : "None")));
+                                (Trace, (msgInfo.VDiskSkeletonTrace ? msgInfo.VDiskSkeletonTrace->ToString() : "None"))
+                                );
                     }
                 }
                 return hasError;
@@ -1230,9 +1231,11 @@ namespace NKikimr {
                 ev->Forward(SkeletonId).Release()), msgId, cost, *this, clientId);
             if (event) {
                 std::shared_ptr<TVDiskSkeletonTrace> trace;
+#if VDISK_SKELETON_TRACE
                 if constexpr (IsPatchEvent<TEvent>) {
-                    event->Get<TEvent>()->VDiskSkeletonTrace = std::make_shared<TVDiskSkeletonTrace>();
+                    event->Get<TEvent>()->VDiskSkeletonTrace = trace = std::make_shared<TVDiskSkeletonTrace>();
                 }
+#endif
                 // good, enqueue it in intQueue
                 intQueue.Enqueue(ctx, recByteSize, std::move(event), msgId, cost, deadline, extQueueId, *this, clientId,
                     std::move(trace), internalMessageId);

ydb/core/blobstorage/vdisk/skeleton/skeleton_vpatch_actor.cpp

@@ -115,16 +115,19 @@ namespace NKikimr::NPrivate {
         ui64 ReceivedXorDiffCount = 0;
         ui64 WaitedXorDiffCount = 0;
 
+#if VDISK_SKELETON_TRACE
         std::shared_ptr<TVDiskSkeletonTrace> PatchActorTrace;
         std::shared_ptr<TVDiskSkeletonTrace> CurrentEventTrace;
 
-
         void AddMark(const char * const mark) {
             PatchActorTrace->AddMark(mark);
             if (CurrentEventTrace) {
                 CurrentEventTrace->AddMark(mark);
             }
         }
+#else
+        void AddMark(const char* /*mark*/) {}
+#endif
 
     public:
         TSkeletonVPatchActor(TActorId leaderId, const TBlobStorageGroupType &gType,
@@ -146,8 +149,10 @@ namespace NKikimr::NPrivate {
             , LeaderId(leaderId)
             , IncarnationGuid(incarnationGuid)
             , GType(gType)
+#if VDISK_SKELETON_TRACE
             , PatchActorTrace(std::make_shared<TVDiskSkeletonTrace>())
             , CurrentEventTrace(std::move(ev->Get()->VDiskSkeletonTrace))
+#endif
         {
             NKikimrBlobStorage::TEvVPatchStart &record = ev->Get()->Record;
             if (record.HasMsgQoS() && record.GetMsgQoS().HasDeadlineSeconds()) {
@@ -167,9 +172,11 @@ namespace NKikimr::NPrivate {
             FoundPartsEvent = std::make_unique<TEvBlobStorage::TEvVPatchFoundParts>(
                     NKikimrProto::OK, OriginalBlobId, PatchedBlobId, VDiskId, record.GetCookie(), now, ErrorReason, &record,
                     SkeletonFrontIDPtr, VPatchFoundPartsMsgsPtr, getHistogram, IncarnationGuid);
+#if VDISK_SKELETON_TRACE
             if (CurrentEventTrace) {
                 CurrentEventTrace->AdditionalTrace = PatchActorTrace;
             }
+#endif
             AddMark("TSkeletonVPatchActor created");
         }
 
@@ -219,11 +226,13 @@ namespace NKikimr::NPrivate {
                 FoundPartsEvent->AddPart(part);
             }
             FoundPartsEvent->SetStatus(status);
+#if VDISK_SKELETON_TRACE
             if (CurrentEventTrace) {
                 CurrentEventTrace->AdditionalTrace = nullptr;
             }
             AddMark((FoundOriginalParts.size() ? "Found parts" : "Parts were not found"));
             CurrentEventTrace = nullptr;
+#endif
             SendVDiskResponse(TActivationContext::AsActorContext(), Sender, FoundPartsEvent.release(), Cookie);
         }
 
@@ -303,11 +312,13 @@ namespace NKikimr::NPrivate {
                     (ErrorReason, ErrorReason));
             Y_ABORT_UNLESS(ResultEvent);
             ResultEvent->SetStatus(status, ErrorReason);
+#if VDISK_SKELETON_TRACE
             if (CurrentEventTrace) {
                 CurrentEventTrace->AdditionalTrace = nullptr;
             }
             AddMark((status == NKikimrProto::OK ? "Patch ends with OK" : "Patch ends witn NOT OK"));
             CurrentEventTrace = nullptr;
+#endif
             if (forceEnd) {
                 ResultEvent->SetForceEndResponse();
             }
@@ -502,7 +513,9 @@ namespace NKikimr::NPrivate {
                     &record, SkeletonFrontIDPtr, VPatchResMsgsPtr, PutHistogram, IncarnationGuid);
             Sender = ev->Sender;
             Cookie = ev->Cookie;
+#if VDISK_SKELETON_TRACE
             CurrentEventTrace = std::move(ev->Get()->VDiskSkeletonTrace);
+#endif
             AddMark("Error: HandleError TEvVPatchDiff");
             SendVPatchResult(NKikimrProto::ERROR, ev->Get()->IsForceEnd());
         }
@@ -523,10 +536,12 @@ namespace NKikimr::NPrivate {
 
         void Handle(TEvBlobStorage::TEvVPatchDiff::TPtr &ev) {
             NKikimrBlobStorage::TEvVPatchDiff &record = ev->Get()->Record;
+#if VDISK_SKELETON_TRACE
             CurrentEventTrace = std::move(ev->Get()->VDiskSkeletonTrace);
             if (CurrentEventTrace) {
                 CurrentEventTrace->AdditionalTrace = PatchActorTrace;
             }
+#endif
             Y_ABORT_UNLESS(record.HasCookie());
             AddMark("Receive TEvVPatchDiff");
 
@@ -630,9 +645,11 @@ namespace NKikimr::NPrivate {
             auto resultEvent = std::make_unique<TEvBlobStorage::TEvVPatchXorDiffResult>(
                     NKikimrProto::ERROR, now, &record, SkeletonFrontIDPtr, VPatchResMsgsPtr, PutHistogram);
             AddMark("Error: HandleError TEvVPatchXorDiff");
+#if VDISK_SKELETON_TRACE
             if (ev->Get()->VDiskSkeletonTrace) {
                 ev->Get()->VDiskSkeletonTrace->AddMark("Error: HandleError TEvVPatchXorDiff");
             }
+#endif
             SendVDiskResponse(TActivationContext::AsActorContext(), ev->Sender, resultEvent.release(), ev->Cookie);
         }
 
@@ -652,18 +669,25 @@ namespace NKikimr::NPrivate {
                     (ToPart, (ui32)toPart),
                     (HasBuffer, (Buffer.GetSize() == 0 ? "no" : "yes")),
                     (ReceivedXorDiffCount, TStringBuilder() << ReceivedXorDiffCount << '/' << WaitedXorDiffCount));
+
             AddMark("received xor diff");
+#if VDISK_SKELETON_TRACE
             if (ev->Get()->VDiskSkeletonTrace) {
                 ev->Get()->VDiskSkeletonTrace->AddMark("received xor diff");
             }
+#endif
 
             TInstant now = TActivationContext::Now();
             std::unique_ptr<TEvBlobStorage::TEvVPatchXorDiffResult> resultEvent = std::make_unique<TEvBlobStorage::TEvVPatchXorDiffResult>(
                     NKikimrProto::OK, now, &record, SkeletonFrontIDPtr, VPatchResMsgsPtr, PutHistogram);
+
             AddMark("Send xor diff result");
+#if VDISK_SKELETON_TRACE
             if (ev->Get()->VDiskSkeletonTrace) {
                 ev->Get()->VDiskSkeletonTrace->AddMark("Send xor diff result");
             }
+#endif
+
             SendVDiskResponse(TActivationContext::AsActorContext(), ev->Sender, resultEvent.release(), ev->Cookie);
 
             if (!CheckDiff(xorDiffs, "XorDiff from datapart")) {