Skip to content

Fix trim duration (change microseconds to milliseconds) #7302

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Merged
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
Original file line number Diff line number Diff line change
Expand Up @@ -401,16 +401,15 @@ class TRealBlockDevice : public IBlockDevice {
}
EndOffset = op->GetOffset() + opSize;

ui64 duration = HPNow() - completionAction->SubmitTime;
ui64 durationMs = HPMilliSecondsFloat(duration);
double duration = HPMilliSecondsFloat(HPNow() - completionAction->SubmitTime);
if (op->GetType() == IAsyncIoOperation::EType::PRead) {
NSan::Unpoison(op->GetData(), opSize);
REQUEST_VALGRIND_MAKE_MEM_DEFINED(op->GetData(), opSize);
Device.Mon.DeviceReadDuration.Increment(durationMs);
LWPROBE(PDiskDeviceReadDuration, Device.GetPDiskId(), HPMilliSecondsFloat(duration), opSize);
Device.Mon.DeviceReadDuration.Increment(duration);
LWPROBE(PDiskDeviceReadDuration, Device.GetPDiskId(), duration, opSize);
} else {
Device.Mon.DeviceWriteDuration.Increment(durationMs);
LWPROBE(PDiskDeviceWriteDuration, Device.GetPDiskId(), HPMilliSecondsFloat(duration), opSize);
Device.Mon.DeviceWriteDuration.Increment(duration);
LWPROBE(PDiskDeviceWriteDuration, Device.GetPDiskId(), duration, opSize);
}
if (completionAction->FlushAction) {
ui64 idx = completionAction->FlushAction->OperationIdx;
Expand Down Expand Up @@ -668,8 +667,8 @@ class TRealBlockDevice : public IBlockDevice {
Device.IsTrimEnabled = Device.IoContext->DoTrim(op);
NHPTimer::STime endTime = HPNow();
Device.IdleCounter.Decrement();
const ui64 durationUs = HPMicroSeconds(endTime - beginTime);
Device.Mon.DeviceTrimDuration.Increment(durationUs);
const double duration = HPMilliSecondsFloat(endTime - beginTime);
Device.Mon.DeviceTrimDuration.Increment(duration);
*Device.Mon.DeviceEstimatedCostNs += completion->CostNs;
if (Device.ActorSystem && Device.IsTrimEnabled) {
LOG_DEBUG_S(*Device.ActorSystem, NKikimrServices::BS_DEVICE,
Expand All @@ -680,7 +679,7 @@ class TRealBlockDevice : public IBlockDevice {
<< "\" offset# " << op->GetOffset()
<< " size# " << op->GetSize());
LWPROBE(PDiskDeviceTrimDuration, Device.GetPDiskId(),
HPMilliSecondsFloat(endTime - beginTime), op->GetOffset());
duration, op->GetOffset());
}
}
completion->SetResult(EIoResult::Ok);
Expand Down
Loading