Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 43 additions & 4 deletions ydb/core/blobstorage/dsproxy/dsproxy_put.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,8 @@ class TBlobStorageGroupPutRequest : public TBlobStorageGroupRequestActor<TBlobSt

bool Done = false;

NLWTrace::TOrbit Orbit;

struct TIncarnationRecord {
ui64 IncarnationGuid = 0;
TMonotonic ExpirationTimestamp = TMonotonic::Max();
Expand Down Expand Up @@ -121,6 +123,22 @@ class TBlobStorageGroupPutRequest : public TBlobStorageGroupRequestActor<TBlobSt

// Send to VDisks.
for (auto& ev : events) {
if (LWPROBE_ENABLED(DSProxyVPutSent) || Orbit.HasShuttles()) {
auto vDiskId = std::visit([](const auto& item) { return VDiskIDFromVDiskID(item->Record.GetVDiskID()); }, ev);
auto itemsCount = std::visit(overloaded{
[](const std::unique_ptr<TEvBlobStorage::TEvVPut>&) { return 1; },
[](const std::unique_ptr<TEvBlobStorage::TEvVMultiPut>& item) { return item->Record.GetItems().size(); }
}, ev);
LWTRACK(
DSProxyVPutSent, Orbit,
std::visit([](const auto& item) { return item->Type(); }, ev),
vDiskId.ToStringWOGeneration(),
Info->GetFailDomainOrderNumber(vDiskId),
itemsCount,
std::visit([](const auto& item) { return item->GetBufferBytes(); }, ev),
accelerate
);
}
std::visit([&](auto& ev) { SendToQueue(std::move(ev), 0, TimeStatsEnabled); }, ev);
++RequestsSent;
}
Expand Down Expand Up @@ -250,7 +268,7 @@ class TBlobStorageGroupPutRequest : public TBlobStorageGroupRequestActor<TBlobSt
HandleIncarnation(TActivationContext::Monotonic(), Info->GetOrderNumber(shortId), record.GetIncarnationGuid());
}

LWPROBE(DSProxyVDiskRequestDuration, TEvBlobStorage::EvVPut, blobId.BlobSize(), blobId.TabletID(),
LWTRACK(DSProxyVDiskRequestDuration, Orbit, TEvBlobStorage::EvVPut, blobId.BlobSize(), blobId.TabletID(),
Info->GroupID.GetRawId(), blobId.Channel(), Info->GetFailDomainOrderNumber(shortId),
GetStartTime(record.GetTimestamps()),
GetTotalTimeMs(record.GetTimestamps()),
Expand Down Expand Up @@ -320,11 +338,12 @@ class TBlobStorageGroupPutRequest : public TBlobStorageGroupRequestActor<TBlobSt
WaitingVDiskResponseCount[vdisk]--;

// Trace put request duration
if (LWPROBE_ENABLED(DSProxyVDiskRequestDuration)) {
if (LWPROBE_ENABLED(DSProxyVDiskRequestDuration) || Orbit.HasShuttles()) {
for (auto &item : record.GetItems()) {
TLogoBlobID blobId = LogoBlobIDFromLogoBlobID(item.GetBlobID());
NKikimrProto::EReplyStatus itemStatus = item.GetStatus();
LWPROBE(DSProxyVDiskRequestDuration, TEvBlobStorage::EvVMultiPut, blobId.BlobSize(), blobId.TabletID(),
LWTRACK(DSProxyVDiskRequestDuration, Orbit,
TEvBlobStorage::EvVMultiPut, blobId.BlobSize(), blobId.TabletID(),
Info->GroupID.GetRawId(), blobId.Channel(), Info->GetFailDomainOrderNumber(shortId),
GetStartTime(record.GetTimestamps()),
GetTotalTimeMs(record.GetTimestamps()),
Expand Down Expand Up @@ -373,6 +392,7 @@ class TBlobStorageGroupPutRequest : public TBlobStorageGroupRequestActor<TBlobSt
if (WaitingVDiskCount > 0 && WaitingVDiskCount <= 2 && RequestsSent > 1) {
ui64 timeToAccelerateUs = Max<ui64>(1, PutImpl.GetTimeToAccelerateNs(LogCtx, 2 - AccelerateRequestsSent) / 1000);
TDuration timeSinceStart = TActivationContext::Monotonic() - StartTime;
LWTRACK(DSProxyScheduleAccelerate, Orbit, timeToAccelerateUs > timeSinceStart.MicroSeconds() ? (timeToAccelerateUs - timeSinceStart.MicroSeconds()) / 1000.0 : 0.0);
if (timeSinceStart.MicroSeconds() < timeToAccelerateUs) {
ui64 causeIdx = RootCauseTrack.RegisterAccelerate();
Schedule(TDuration::MicroSeconds(timeToAccelerateUs - timeSinceStart.MicroSeconds()),
Expand Down Expand Up @@ -430,7 +450,10 @@ class TBlobStorageGroupPutRequest : public TBlobStorageGroupRequestActor<TBlobSt
ResponsesSent++;
Y_ABORT_UNLESS(ResponsesSent <= PutImpl.Blobs.size());
RootCauseTrack.RenderTrack(PutImpl.Blobs[blobIdx].Orbit);
LWTRACK(DSProxyPutReply, PutImpl.Blobs[blobIdx].Orbit);
if (PutImpl.Blobs[blobIdx].Orbit.HasShuttles()) {
LWTRACK(DSProxyPutReply, PutImpl.Blobs[blobIdx].Orbit, blobId.ToString(), NKikimrProto::EReplyStatus_Name(status), putResult->ErrorReason);
}
LWTRACK(DSProxyPutReply, Orbit, blobId.ToString(), NKikimrProto::EReplyStatus_Name(status), putResult->ErrorReason);
putResult->Orbit = std::move(PutImpl.Blobs[blobIdx].Orbit);
putResult->WrittenBeyondBarrier = PutImpl.WrittenBeyondBarrier[blobIdx];
putResult->ExecutionRelay = std::move(PutImpl.Blobs[blobIdx].ExecutionRelay);
Expand Down Expand Up @@ -601,6 +624,22 @@ class TBlobStorageGroupPutRequest : public TBlobStorageGroupRequestActor<TBlobSt
LWTRACK(DSProxyPutBootstrapStart, PutImpl.Blobs[blobIdx].Orbit);
}

auto getTotalSize = [&]() {
ui64 totalSize = 0;
for (auto& blob : PutImpl.Blobs) {
totalSize += blob.BufferSize;
}
return totalSize;
};
LWTRACK(
DSProxyPutRequest, Orbit,
Info->GroupID.GetRawId(),
NKikimrBlobStorage::EPutHandleClass_Name(HandleClass),
TEvBlobStorage::TEvPut::TacticName(Tactic),
PutImpl.Blobs.size(),
getTotalSize()
);

Become(&TThis::StateWait, TDuration::MilliSeconds(DsPutWakeupMs), new TKikimrEvents::TEvWakeup);

PartSets.resize(PutImpl.Blobs.size());
Expand Down
6 changes: 4 additions & 2 deletions ydb/core/blobstorage/lwtrace_probes/blobstorage_probes.h
Original file line number Diff line number Diff line change
Expand Up @@ -267,13 +267,15 @@ struct TEventTypeField {
PROBE(DSProxyPutBootstrapDone, GROUPS("DSProxy","Durations"), \
TYPES(ui64, double, double, double, double, ui64, ui64), \
NAMES("size", "wilsonMs", "allocateMs", "waitTotalMs", "splitTotalMs", "splitTotalCount", "blobIdx")) \
PROBE(DSProxyPutReply, GROUPS("DSProxy"), TYPES(), NAMES()) \
PROBE(DSProxyPutReply, GROUPS("DSProxy"), TYPES(TString, TString, TString), NAMES("blobId", "status", "errorReason")) \
PROBE(DSProxyPutResumeBootstrap, GROUPS("DSProxy"), TYPES(), NAMES()) \
PROBE(DSProxyPutPauseBootstrap, GROUPS("DSProxy"), TYPES(), NAMES()) \
PROBE(DSProxyScheduleAccelerate, GROUPS("DSProxy"), TYPES(), NAMES()) \
PROBE(DSProxyScheduleAccelerate, GROUPS("DSProxy"), TYPES(double), NAMES("timeBeforeAccelerationMs")) \
PROBE(DSProxyStartTransfer, GROUPS("DSProxy"), TYPES(), NAMES()) \
PROBE(VDiskStartProcessing, GROUPS("DSProxy"), TYPES(), NAMES()) \
PROBE(VDiskReply, GROUPS("DSProxy"), TYPES(), NAMES()) \
PROBE(DSProxyPutRequest, GROUPS("DSProxy", "LWTrackStart"), TYPES(ui32, TString, TString, ui64, ui64), NAMES("groupId", "handleClass", "tactic", "count", "totalSize")) \
PROBE(DSProxyVPutSent, GROUPS("DSProxy"), TYPES(NKikimr::TEventTypeField, TString, ui32, ui32, ui64, bool), NAMES("type", "vDiskId", "vdiskOrderNum", "count", "totalSize", "accelerate")) \
/**/
LWTRACE_DECLARE_PROVIDER(BLOBSTORAGE_PROVIDER)

Expand Down