Skip to content

Commit a5a8248

Browse files
va-kuznecovVlad Kuznecov
andauthored
Merge nb 24 3. Fix device metrics (#9237)
Co-authored-by: Vlad Kuznecov <va-kuznecov@nebius.com>
1 parent 9378e60 commit a5a8248

File tree

1 file changed

+8
-9
lines changed

1 file changed

+8
-9
lines changed

ydb/core/blobstorage/pdisk/blobstorage_pdisk_blockdevice_async.cpp

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -407,16 +407,15 @@ class TRealBlockDevice : public IBlockDevice {
407407
}
408408
EndOffset = op->GetOffset() + opSize;
409409

410-
ui64 duration = HPNow() - completionAction->SubmitTime;
411-
ui64 durationMs = HPMilliSecondsFloat(duration);
410+
double duration = HPMilliSecondsFloat(HPNow() - completionAction->SubmitTime);
412411
if (op->GetType() == IAsyncIoOperation::EType::PRead) {
413412
NSan::Unpoison(op->GetData(), opSize);
414413
REQUEST_VALGRIND_MAKE_MEM_DEFINED(op->GetData(), opSize);
415-
Device.Mon.DeviceReadDuration.Increment(durationMs);
416-
LWPROBE(PDiskDeviceReadDuration, Device.GetPDiskId(), HPMilliSecondsFloat(duration), opSize);
414+
Device.Mon.DeviceReadDuration.Increment(duration);
415+
LWPROBE(PDiskDeviceReadDuration, Device.GetPDiskId(), duration, opSize);
417416
} else {
418-
Device.Mon.DeviceWriteDuration.Increment(durationMs);
419-
LWPROBE(PDiskDeviceWriteDuration, Device.GetPDiskId(), HPMilliSecondsFloat(duration), opSize);
417+
Device.Mon.DeviceWriteDuration.Increment(duration);
418+
LWPROBE(PDiskDeviceWriteDuration, Device.GetPDiskId(), duration, opSize);
420419
}
421420
if (completionAction->FlushAction) {
422421
ui64 idx = completionAction->FlushAction->OperationIdx;
@@ -680,8 +679,8 @@ class TRealBlockDevice : public IBlockDevice {
680679
Device.IsTrimEnabled = Device.IoContext->DoTrim(op);
681680
NHPTimer::STime endTime = HPNow();
682681
Device.IdleCounter.Decrement();
683-
const ui64 durationUs = HPMicroSeconds(endTime - beginTime);
684-
Device.Mon.DeviceTrimDuration.Increment(durationUs);
682+
const double duration = HPMilliSecondsFloat(endTime - beginTime);
683+
Device.Mon.DeviceTrimDuration.Increment(duration);
685684
*Device.Mon.DeviceEstimatedCostNs += completion->CostNs;
686685
if (Device.ActorSystem && Device.IsTrimEnabled) {
687686
LOG_DEBUG_S(*Device.ActorSystem, NKikimrServices::BS_DEVICE,
@@ -692,7 +691,7 @@ class TRealBlockDevice : public IBlockDevice {
692691
<< "\" offset# " << op->GetOffset()
693692
<< " size# " << op->GetSize());
694693
LWPROBE(PDiskDeviceTrimDuration, Device.GetPDiskId(),
695-
HPMilliSecondsFloat(endTime - beginTime), op->GetOffset());
694+
duration, op->GetOffset());
696695
}
697696
}
698697
completion->SetResult(EIoResult::Ok);

0 commit comments

Comments
 (0)