Skip to content

Commit 986e97a

Browse files
dcherednikdcherednik
committed
Revert "Stream 24 3 add logs to dsproxy (#11269)"
This reverts commit c4eeb2d.
1 parent 569841c commit 986e97a

39 files changed

+650
-1314
lines changed

‎ydb/core/blobstorage/dsproxy/dsproxy.h‎

Lines changed: 108 additions & 206 deletions
Large diffs are not rendered by default.

‎ydb/core/blobstorage/dsproxy/dsproxy_assimilate.cpp‎

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -264,12 +264,17 @@ class TBlobStorageGroupAssimilateRequest : public TBlobStorageGroupRequestActor<
264264
return mon->ActiveAssimilate;
265265
}
266266

267-
TBlobStorageGroupAssimilateRequest(TBlobStorageGroupAssimilateParameters& params)
268-
: TBlobStorageGroupRequestActor(params, NWilson::TSpan(TWilson::BlobStorage, std::move(params.Common.TraceId), "DSProxy.Assimilate"))
269-
, SkipBlocksUpTo(params.Common.Event->SkipBlocksUpTo)
270-
, SkipBarriersUpTo(params.Common.Event->SkipBarriersUpTo)
271-
, SkipBlobsUpTo(params.Common.Event->SkipBlobsUpTo)
272-
, PerVDiskInfo(Info->GetTotalVDisksNum())
267+
TBlobStorageGroupAssimilateRequest(const TIntrusivePtr<TBlobStorageGroupInfo>& info,
268+
const TIntrusivePtr<TGroupQueues>& state, const TActorId& source,
269+
const TIntrusivePtr<TBlobStorageGroupProxyMon>& mon, TEvBlobStorage::TEvAssimilate *ev, ui64 cookie,
270+
NWilson::TTraceId traceId, TInstant now, TIntrusivePtr<TStoragePoolCounters>& storagePoolCounters)
271+
: TBlobStorageGroupRequestActor(info, state, mon, source, cookie,
272+
NKikimrServices::BS_PROXY_ASSIMILATE, false, {}, now, storagePoolCounters, ev->RestartCounter,
273+
NWilson::TSpan(TWilson::BlobStorage, std::move(traceId), "DSProxy.Assimilate"), std::move(ev->ExecutionRelay))
274+
, SkipBlocksUpTo(ev->SkipBlocksUpTo)
275+
, SkipBarriersUpTo(ev->SkipBarriersUpTo)
276+
, SkipBlobsUpTo(ev->SkipBlobsUpTo)
277+
, PerVDiskInfo(info->GetTotalVDisksNum())
273278
, Result(new TEvBlobStorage::TEvAssimilateResult(NKikimrProto::OK, {}))
274279
{
275280
Heap.reserve(PerVDiskInfo.size());
@@ -459,8 +464,11 @@ class TBlobStorageGroupAssimilateRequest : public TBlobStorageGroupRequestActor<
459464
}
460465
};
461466

462-
IActor* CreateBlobStorageGroupAssimilateRequest(TBlobStorageGroupAssimilateParameters params) {
463-
return new TBlobStorageGroupAssimilateRequest(params);
467+
IActor* CreateBlobStorageGroupAssimilateRequest(const TIntrusivePtr<TBlobStorageGroupInfo>& info,
468+
const TIntrusivePtr<TGroupQueues>& state, const TActorId& source,
469+
const TIntrusivePtr<TBlobStorageGroupProxyMon>& mon, TEvBlobStorage::TEvAssimilate *ev,
470+
ui64 cookie, NWilson::TTraceId traceId, TInstant now, TIntrusivePtr<TStoragePoolCounters>& storagePoolCounters) {
471+
return new TBlobStorageGroupAssimilateRequest(info, state, source, mon, ev, cookie, std::move(traceId), now, storagePoolCounters);
464472
}
465473

466474
} // NKikimr

‎ydb/core/blobstorage/dsproxy/dsproxy_blackboard.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
#include "defs.h"
33

44
#include "dsproxy.h"
5-
#include "request_history.h"
65

76
#include <ydb/core/blobstorage/base/batched_vec.h>
87
#include <ydb/core/blobstorage/groupinfo/blobstorage_groupinfo.h>

‎ydb/core/blobstorage/dsproxy/dsproxy_block.cpp‎

Lines changed: 23 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ class TBlobStorageGroupBlockRequest : public TBlobStorageGroupRequestActor<TBlob
1616
const ui32 Generation;
1717
const TInstant Deadline;
1818
const ui64 IssuerGuid;
19+
TInstant StartTime;
1920
bool SeenAlready = false;
2021

2122
TGroupQuorumTracker QuorumTracker;
@@ -99,7 +100,7 @@ class TBlobStorageGroupBlockRequest : public TBlobStorageGroupRequestActor<TBlob
99100
std::unique_ptr<TEvBlobStorage::TEvBlockResult> result(new TEvBlobStorage::TEvBlockResult(status));
100101
result->ErrorReason = ErrorReason;
101102
A_LOG_LOG_S(true, PriorityForStatusResult(status), "DSPB04", "Result# " << result->Print(false));
102-
Mon->CountBlockResponseTime(TActivationContext::Monotonic() - RequestStartTime);
103+
Mon->CountBlockResponseTime(TActivationContext::Now() - StartTime);
103104
return SendResponseAndDie(std::move(result));
104105
}
105106

@@ -131,12 +132,19 @@ class TBlobStorageGroupBlockRequest : public TBlobStorageGroupRequestActor<TBlob
131132
return mon->ActiveBlock;
132133
}
133134

134-
TBlobStorageGroupBlockRequest(TBlobStorageGroupBlockParameters& params, NWilson::TSpan&& span)
135-
: TBlobStorageGroupRequestActor(params, std::move(span))
136-
, TabletId(params.Common.Event->TabletId)
137-
, Generation(params.Common.Event->Generation)
138-
, Deadline(params.Common.Event->Deadline)
139-
, IssuerGuid(params.Common.Event->IssuerGuid)
135+
TBlobStorageGroupBlockRequest(const TIntrusivePtr<TBlobStorageGroupInfo> &info,
136+
const TIntrusivePtr<TGroupQueues> &state, const TActorId &source,
137+
const TIntrusivePtr<TBlobStorageGroupProxyMon> &mon, TEvBlobStorage::TEvBlock *ev,
138+
ui64 cookie, NWilson::TSpan&& span, TInstant now,
139+
TIntrusivePtr<TStoragePoolCounters> &storagePoolCounters)
140+
: TBlobStorageGroupRequestActor(info, state, mon, source, cookie,
141+
NKikimrServices::BS_PROXY_BLOCK, false, {}, now, storagePoolCounters, ev->RestartCounter,
142+
std::move(span), std::move(ev->ExecutionRelay))
143+
, TabletId(ev->TabletId)
144+
, Generation(ev->Generation)
145+
, Deadline(ev->Deadline)
146+
, IssuerGuid(ev->IssuerGuid)
147+
, StartTime(now)
140148
, QuorumTracker(Info.Get())
141149
{}
142150

@@ -167,12 +175,16 @@ class TBlobStorageGroupBlockRequest : public TBlobStorageGroupRequestActor<TBlob
167175
}
168176
};
169177

170-
IActor* CreateBlobStorageGroupBlockRequest(TBlobStorageGroupBlockParameters params) {
171-
NWilson::TSpan span(TWilson::BlobStorage, std::move(params.Common.TraceId), "DSProxy.Block");
178+
IActor* CreateBlobStorageGroupBlockRequest(const TIntrusivePtr<TBlobStorageGroupInfo> &info,
179+
const TIntrusivePtr<TGroupQueues> &state, const TActorId &source,
180+
const TIntrusivePtr<TBlobStorageGroupProxyMon> &mon, TEvBlobStorage::TEvBlock *ev,
181+
ui64 cookie, NWilson::TTraceId traceId, TInstant now, TIntrusivePtr<TStoragePoolCounters> &storagePoolCounters) {
182+
NWilson::TSpan span(TWilson::BlobStorage, std::move(traceId), "DSProxy.Block");
172183
if (span) {
173-
span.Attribute("event", params.Common.Event->ToString());
184+
span.Attribute("event", ev->ToString());
174185
}
175-
return new TBlobStorageGroupBlockRequest(params, std::move(span));
186+
187+
return new TBlobStorageGroupBlockRequest(info, state, source, mon, ev, cookie, std::move(span), now, storagePoolCounters);
176188
}
177189

178190
} // NKikimr

‎ydb/core/blobstorage/dsproxy/dsproxy_collect.cpp‎

Lines changed: 27 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ class TBlobStorageGroupCollectGarbageRequest : public TBlobStorageGroupRequestAc
2727
const bool Decommission;
2828

2929
TGroupQuorumTracker QuorumTracker;
30+
TInstant StartTime;
3031

3132
ui32 RequestsSent = 0;
3233
ui32 ResponsesReceived = 0;
@@ -140,21 +141,27 @@ class TBlobStorageGroupCollectGarbageRequest : public TBlobStorageGroupRequestAc
140141
return mon->ActiveCollectGarbage;
141142
}
142143

143-
TBlobStorageGroupCollectGarbageRequest(TBlobStorageGroupCollectGarbageParameters& params)
144-
: TBlobStorageGroupRequestActor(params, NWilson::TSpan(TWilson::BlobStorage, std::move(params.Common.TraceId), "DSProxy.CollectGarbage"))
145-
, TabletId(params.Common.Event->TabletId)
146-
, RecordGeneration(params.Common.Event->RecordGeneration)
147-
, PerGenerationCounter(params.Common.Event->PerGenerationCounter)
148-
, Channel(params.Common.Event->Channel)
149-
, Deadline(params.Common.Event->Deadline)
150-
, Keep(params.Common.Event->Keep.Release())
151-
, DoNotKeep(params.Common.Event->DoNotKeep.Release())
152-
, CollectGeneration(params.Common.Event->CollectGeneration)
153-
, CollectStep(params.Common.Event->CollectStep)
154-
, Hard(params.Common.Event->Hard)
155-
, Collect(params.Common.Event->Collect)
156-
, Decommission(params.Common.Event->Decommission)
144+
TBlobStorageGroupCollectGarbageRequest(const TIntrusivePtr<TBlobStorageGroupInfo> &info,
145+
const TIntrusivePtr<TGroupQueues> &state, const TActorId &source,
146+
const TIntrusivePtr<TBlobStorageGroupProxyMon> &mon, TEvBlobStorage::TEvCollectGarbage *ev, ui64 cookie,
147+
NWilson::TTraceId traceId, TInstant now, TIntrusivePtr<TStoragePoolCounters> &storagePoolCounters)
148+
: TBlobStorageGroupRequestActor(info, state, mon, source, cookie,
149+
NKikimrServices::BS_PROXY_COLLECT, false, {}, now, storagePoolCounters, ev->RestartCounter,
150+
NWilson::TSpan(TWilson::BlobStorage, std::move(traceId), "DSProxy.CollectGarbage"), std::move(ev->ExecutionRelay))
151+
, TabletId(ev->TabletId)
152+
, RecordGeneration(ev->RecordGeneration)
153+
, PerGenerationCounter(ev->PerGenerationCounter)
154+
, Channel(ev->Channel)
155+
, Deadline(ev->Deadline)
156+
, Keep(ev->Keep.Release())
157+
, DoNotKeep(ev->DoNotKeep.Release())
158+
, CollectGeneration(ev->CollectGeneration)
159+
, CollectStep(ev->CollectStep)
160+
, Hard(ev->Hard)
161+
, Collect(ev->Collect)
162+
, Decommission(ev->Decommission)
157163
, QuorumTracker(Info.Get())
164+
, StartTime(now)
158165
{}
159166

160167
void Bootstrap() {
@@ -198,8 +205,12 @@ class TBlobStorageGroupCollectGarbageRequest : public TBlobStorageGroupRequestAc
198205
}
199206
};
200207

201-
IActor* CreateBlobStorageGroupCollectGarbageRequest(TBlobStorageGroupCollectGarbageParameters params) {
202-
return new TBlobStorageGroupCollectGarbageRequest(params);
208+
IActor* CreateBlobStorageGroupCollectGarbageRequest(const TIntrusivePtr<TBlobStorageGroupInfo> &info,
209+
const TIntrusivePtr<TGroupQueues> &state, const TActorId &source,
210+
const TIntrusivePtr<TBlobStorageGroupProxyMon> &mon, TEvBlobStorage::TEvCollectGarbage *ev,
211+
ui64 cookie, NWilson::TTraceId traceId, TInstant now, TIntrusivePtr<TStoragePoolCounters> &storagePoolCounters) {
212+
return new TBlobStorageGroupCollectGarbageRequest(info, state, source, mon, ev, cookie, std::move(traceId), now,
213+
storagePoolCounters);
203214
}
204215

205216
} // NKikimr

‎ydb/core/blobstorage/dsproxy/dsproxy_discover.cpp‎

Lines changed: 26 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -272,6 +272,7 @@ class TBlobStorageGroupDiscoverRequest : public TBlobStorageGroupRequestActor<TB
272272
const bool ReadBody;
273273
const bool DiscoverBlockedGeneration;
274274
const TInstant Deadline;
275+
const TInstant StartTime;
275276

276277
TGroupResponseTracker GroupResponseTracker;
277278
std::unique_ptr<TEvBlobStorage::TEvDiscoverResult> PendingResult;
@@ -294,7 +295,7 @@ class TBlobStorageGroupDiscoverRequest : public TBlobStorageGroupRequestActor<TB
294295
template<typename TPtr>
295296
void SendResult(TPtr& result) {
296297
Y_ABORT_UNLESS(result);
297-
const TDuration duration = TActivationContext::Monotonic() - RequestStartTime;
298+
const TDuration duration = TActivationContext::Now() - StartTime;
298299
Mon->CountDiscoverResponseTime(duration);
299300
const bool success = result->Status == NKikimrProto::OK;
300301
LWPROBE(DSProxyRequestDuration, TEvBlobStorage::EvDiscover, 0, duration.SecondsFloat() * 1000.0,
@@ -876,17 +877,25 @@ class TBlobStorageGroupDiscoverRequest : public TBlobStorageGroupRequestActor<TB
876877
return ERequestType::Discover;
877878
}
878879

879-
TBlobStorageGroupDiscoverRequest(TBlobStorageGroupDiscoverParameters& params)
880-
: TBlobStorageGroupRequestActor(params, NWilson::TSpan(TWilson::BlobStorage, std::move(params.Common.TraceId), "DSProxy.Discover"))
881-
, TabletId(params.Common.Event->TabletId)
882-
, MinGeneration(params.Common.Event->MinGeneration)
883-
, ReadBody(params.Common.Event->ReadBody)
884-
, DiscoverBlockedGeneration(params.Common.Event->DiscoverBlockedGeneration)
885-
, Deadline(params.Common.Event->Deadline)
880+
TBlobStorageGroupDiscoverRequest(const TIntrusivePtr<TBlobStorageGroupInfo> &info,
881+
const TIntrusivePtr<TGroupQueues> &state, const TActorId &source,
882+
const TIntrusivePtr<TBlobStorageGroupProxyMon> mon, TEvBlobStorage::TEvDiscover *ev,
883+
ui64 cookie, NWilson::TTraceId traceId, TInstant now,
884+
TIntrusivePtr<TStoragePoolCounters> &storagePoolCounters)
885+
: TBlobStorageGroupRequestActor(info, state, mon, source, cookie,
886+
NKikimrServices::BS_PROXY_DISCOVER, true, {}, now, storagePoolCounters, ev->RestartCounter,
887+
NWilson::TSpan(TWilson::BlobStorage, std::move(traceId), "DSProxy.Discover"),
888+
std::move(ev->ExecutionRelay))
889+
, TabletId(ev->TabletId)
890+
, MinGeneration(ev->MinGeneration)
891+
, ReadBody(ev->ReadBody)
892+
, DiscoverBlockedGeneration(ev->DiscoverBlockedGeneration)
893+
, Deadline(ev->Deadline)
894+
, StartTime(now)
886895
, GroupResponseTracker(Info)
887896
, IsGetBlockDone(!DiscoverBlockedGeneration)
888-
, ForceBlockedGeneration(params.Common.Event->ForceBlockedGeneration)
889-
, FromLeader(params.Common.Event->FromLeader)
897+
, ForceBlockedGeneration(ev->ForceBlockedGeneration)
898+
, FromLeader(ev->FromLeader)
890899
{}
891900

892901
void Bootstrap() {
@@ -965,8 +974,13 @@ class TBlobStorageGroupDiscoverRequest : public TBlobStorageGroupRequestActor<TB
965974
}
966975
};
967976

968-
IActor* CreateBlobStorageGroupDiscoverRequest(TBlobStorageGroupDiscoverParameters params) {
969-
return new TBlobStorageGroupDiscoverRequest(params);
977+
IActor* CreateBlobStorageGroupDiscoverRequest(const TIntrusivePtr<TBlobStorageGroupInfo> &info,
978+
const TIntrusivePtr<TGroupQueues> &state, const TActorId &source,
979+
const TIntrusivePtr<TBlobStorageGroupProxyMon> &mon, TEvBlobStorage::TEvDiscover *ev,
980+
ui64 cookie, NWilson::TTraceId traceId, TInstant now,
981+
TIntrusivePtr<TStoragePoolCounters> &storagePoolCounters) {
982+
return new TBlobStorageGroupDiscoverRequest(info, state, source, mon, ev, cookie, std::move(traceId), now,
983+
storagePoolCounters);
970984
}
971985

972986
}//NKikimr

‎ydb/core/blobstorage/dsproxy/dsproxy_discover_m3dc.cpp‎

Lines changed: 27 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -424,6 +424,7 @@ class TDiscoverWorker {
424424
class TBlobStorageGroupMirror3dcDiscoverRequest : public TBlobStorageGroupRequestActor<TBlobStorageGroupMirror3dcDiscoverRequest>{
425425
const ui64 TabletId;
426426
const ui32 MinGeneration;
427+
const TInstant StartTime;
427428
const TInstant Deadline;
428429
const bool ReadBody;
429430
const bool DiscoverBlockedGeneration;
@@ -456,15 +457,23 @@ class TBlobStorageGroupMirror3dcDiscoverRequest : public TBlobStorageGroupReques
456457
return ERequestType::Discover;
457458
}
458459

459-
TBlobStorageGroupMirror3dcDiscoverRequest(TBlobStorageGroupDiscoverParameters& params)
460-
: TBlobStorageGroupRequestActor(params, NWilson::TSpan(TWilson::BlobStorage, std::move(params.Common.TraceId), "DSProxy.Discover(mirror-3-dc)"))
461-
, TabletId(params.Common.Event->TabletId)
462-
, MinGeneration(params.Common.Event->MinGeneration)
463-
, Deadline(params.Common.Event->Deadline)
464-
, ReadBody(params.Common.Event->ReadBody)
465-
, DiscoverBlockedGeneration(params.Common.Event->DiscoverBlockedGeneration)
466-
, ForceBlockedGeneration(params.Common.Event->ForceBlockedGeneration)
467-
, FromLeader(params.Common.Event->FromLeader)
460+
TBlobStorageGroupMirror3dcDiscoverRequest(TIntrusivePtr<TBlobStorageGroupInfo> info,
461+
TIntrusivePtr<TGroupQueues> state, const TActorId& source,
462+
TIntrusivePtr<TBlobStorageGroupProxyMon> mon, TEvBlobStorage::TEvDiscover *ev,
463+
ui64 cookie, NWilson::TTraceId traceId, TInstant now,
464+
TIntrusivePtr<TStoragePoolCounters> &storagePoolCounters)
465+
: TBlobStorageGroupRequestActor(std::move(info), std::move(state), std::move(mon), source, cookie,
466+
NKikimrServices::BS_PROXY_DISCOVER, false, {}, now, storagePoolCounters, ev->RestartCounter,
467+
NWilson::TSpan(TWilson::BlobStorage, std::move(traceId), "DSProxy.Discover(mirror-3-dc)"),
468+
std::move(ev->ExecutionRelay))
469+
, TabletId(ev->TabletId)
470+
, MinGeneration(ev->MinGeneration)
471+
, StartTime(now)
472+
, Deadline(ev->Deadline)
473+
, ReadBody(ev->ReadBody)
474+
, DiscoverBlockedGeneration(ev->DiscoverBlockedGeneration)
475+
, ForceBlockedGeneration(ev->ForceBlockedGeneration)
476+
, FromLeader(ev->FromLeader)
468477
, GetBlockTracker(Info.Get())
469478
{}
470479

@@ -651,7 +660,7 @@ class TBlobStorageGroupMirror3dcDiscoverRequest : public TBlobStorageGroupReques
651660
R_LOG_DEBUG_S("DSPDM03", "Response# " << response->ToString());
652661

653662
Y_ABORT_UNLESS(!Responded);
654-
const TDuration duration = TActivationContext::Monotonic() - RequestStartTime;
663+
const TDuration duration = TActivationContext::Now() - StartTime;
655664
LWPROBE(DSProxyRequestDuration, TEvBlobStorage::EvDiscover, 0, duration.SecondsFloat() * 1000.0,
656665
TabletId, Info->GroupID.GetRawId(), TLogoBlobID::MaxChannel, "", true);
657666
SendResponseAndDie(std::move(response));
@@ -664,7 +673,7 @@ class TBlobStorageGroupMirror3dcDiscoverRequest : public TBlobStorageGroupReques
664673

665674
Y_ABORT_UNLESS(!Responded);
666675
Y_ABORT_UNLESS(status != NKikimrProto::OK);
667-
const TDuration duration = TActivationContext::Monotonic() - RequestStartTime;
676+
const TDuration duration = TActivationContext::Now() - StartTime;
668677
LWPROBE(DSProxyRequestDuration, TEvBlobStorage::EvDiscover, 0, duration.SecondsFloat() * 1000.0,
669678
TabletId, Info->GroupID.GetRawId(), TLogoBlobID::MaxChannel, "", false);
670679
std::unique_ptr<TEvBlobStorage::TEvDiscoverResult> response(new TEvBlobStorage::TEvDiscoverResult(
@@ -729,8 +738,13 @@ class TBlobStorageGroupMirror3dcDiscoverRequest : public TBlobStorageGroupReques
729738
}
730739
};
731740

732-
IActor* CreateBlobStorageGroupMirror3dcDiscoverRequest(TBlobStorageGroupDiscoverParameters params) {
733-
return new TBlobStorageGroupMirror3dcDiscoverRequest(params);
741+
IActor* CreateBlobStorageGroupMirror3dcDiscoverRequest(const TIntrusivePtr<TBlobStorageGroupInfo> &info,
742+
const TIntrusivePtr<TGroupQueues> &state, const TActorId &source,
743+
const TIntrusivePtr<TBlobStorageGroupProxyMon> &mon, TEvBlobStorage::TEvDiscover *ev,
744+
ui64 cookie, NWilson::TTraceId traceId, TInstant now,
745+
TIntrusivePtr<TStoragePoolCounters> &storagePoolCounters) {
746+
return new TBlobStorageGroupMirror3dcDiscoverRequest(info, state, source, mon, ev, cookie, std::move(traceId), now,
747+
storagePoolCounters);
734748
}
735749

736750
}//NKikimr

0 commit comments

Comments
 (0)