Skip to content

Commit 208706d

Browse files
serbel324serbel324
authored
Improve cost metrics configuration (#5045)
1 parent 5de3054 commit 208706d

31 files changed

+239
-103
lines changed

‎ydb/core/blobstorage/dsproxy/ut_fat/dsproxy_ut.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4252,6 +4252,7 @@ class TBlobStorageProxyTest: public TTestBase {
42524252
vDiskConfig->GCOnlySynced = false;
42534253
vDiskConfig->HullCompLevelRateThreshold = 0.1;
42544254
vDiskConfig->SkeletonFrontQueueBackpressureCheckMsgId = false;
4255+
vDiskConfig->UseCostTracker = false;
42554256

42564257
IActor* vDisk = CreateVDisk(vDiskConfig, bsInfo, counters);
42574258
TActorSetupCmd vDiskSetup(vDisk, TMailboxType::Revolving, 0);

‎ydb/core/blobstorage/nodewarden/node_warden_impl.cpp

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -178,6 +178,19 @@ void TNodeWarden::Bootstrap() {
178178
icb->RegisterSharedControl(EnableSyncLogChunkCompressionSSD, "VDiskControls.EnableSyncLogChunkCompressionSSD");
179179
icb->RegisterSharedControl(MaxSyncLogChunksInFlightHDD, "VDiskControls.MaxSyncLogChunksInFlightHDD");
180180
icb->RegisterSharedControl(MaxSyncLogChunksInFlightSSD, "VDiskControls.MaxSyncLogChunksInFlightSSD");
181+
182+
icb->RegisterSharedControl(CostMetricsParametersByMedia[NPDisk::DEVICE_TYPE_ROT].BurstThresholdNs,
183+
"VDiskControls.BurstThresholdNsHDD");
184+
icb->RegisterSharedControl(CostMetricsParametersByMedia[NPDisk::DEVICE_TYPE_SSD].BurstThresholdNs,
185+
"VDiskControls.BurstThresholdNsSSD");
186+
icb->RegisterSharedControl(CostMetricsParametersByMedia[NPDisk::DEVICE_TYPE_NVME].BurstThresholdNs,
187+
"VDiskControls.BurstThresholdNsNVME");
188+
icb->RegisterSharedControl(CostMetricsParametersByMedia[NPDisk::DEVICE_TYPE_ROT].DiskTimeAvailableScale,
189+
"VDiskControls.DiskTimeAvailableScaleHDD");
190+
icb->RegisterSharedControl(CostMetricsParametersByMedia[NPDisk::DEVICE_TYPE_SSD].DiskTimeAvailableScale,
191+
"VDiskControls.DiskTimeAvailableScaleSSD");
192+
icb->RegisterSharedControl(CostMetricsParametersByMedia[NPDisk::DEVICE_TYPE_NVME].DiskTimeAvailableScale,
193+
"VDiskControls.DiskTimeAvailableScaleNVME");
181194
}
182195

183196
// start replication broker

‎ydb/core/blobstorage/nodewarden/node_warden_impl.h

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,8 @@ namespace NKikimr::NStorage {
142142
TReplQuoter::TPtr ReplNodeRequestQuoter;
143143
TReplQuoter::TPtr ReplNodeResponseQuoter;
144144

145+
TCostMetricsParametersByMedia CostMetricsParametersByMedia;
146+
145147
public:
146148
struct TGroupRecord;
147149

@@ -159,6 +161,11 @@ namespace NKikimr::NStorage {
159161
, EnableSyncLogChunkCompressionSSD(0, 0, 1)
160162
, MaxSyncLogChunksInFlightHDD(10, 1, 1024)
161163
, MaxSyncLogChunksInFlightSSD(10, 1, 1024)
164+
, CostMetricsParametersByMedia({
165+
TCostMetricsParameters{200},
166+
TCostMetricsParameters{50},
167+
TCostMetricsParameters{32},
168+
})
162169
{
163170
Y_ABORT_UNLESS(Cfg->BlobStorageConfig.GetServiceSet().AvailabilityDomainsSize() <= 1);
164171
AvailDomainId = 1;

‎ydb/core/blobstorage/nodewarden/node_warden_vdisk.cpp

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -184,20 +184,9 @@ namespace NKikimr::NStorage {
184184
vdiskConfig->MaxSyncLogChunksInFlight = MaxSyncLogChunksInFlightSSD;
185185
}
186186

187-
vdiskConfig->FeatureFlags = Cfg->FeatureFlags;
187+
vdiskConfig->CostMetricsParametersByMedia = CostMetricsParametersByMedia;
188188

189-
if (Cfg->BlobStorageConfig.HasCostMetricsSettings()) {
190-
for (auto type : Cfg->BlobStorageConfig.GetCostMetricsSettings().GetVDiskTypes()) {
191-
if (type.HasPDiskType() && deviceType == PDiskTypeToPDiskType(type.GetPDiskType())) {
192-
if (type.HasBurstThresholdNs()) {
193-
vdiskConfig->BurstThresholdNs = type.GetBurstThresholdNs();
194-
}
195-
if (type.HasDiskTimeAvailableScale()) {
196-
vdiskConfig->DiskTimeAvailableScale = type.GetDiskTimeAvailableScale();
197-
}
198-
}
199-
}
200-
}
189+
vdiskConfig->FeatureFlags = Cfg->FeatureFlags;
201190

202191
if (StorageConfig.HasBlobStorageConfig() && StorageConfig.GetBlobStorageConfig().HasVDiskPerformanceSettings()) {
203192
for (auto &type : StorageConfig.GetBlobStorageConfig().GetVDiskPerformanceSettings().GetVDiskTypes()) {

‎ydb/core/blobstorage/pdisk/blobstorage_pdisk.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ struct TEvYardInitResult : public TEventLocal<TEvYardInitResult, TEvBlobStorage:
173173
TEvYardInitResult(const NKikimrProto::EReplyStatus status, const TString &errorReason)
174174
: Status(status)
175175
, StatusFlags(0)
176-
, PDiskParams(new TPDiskParams(0, 0, 0, 0, 0, 0, 0, 0, 0, 0))
176+
, PDiskParams(new TPDiskParams(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, DEVICE_TYPE_ROT))
177177
, ErrorReason(errorReason)
178178
{
179179
Y_ABORT_UNLESS(status != NKikimrProto::OK, "Single-parameter constructor is for error responses only");
@@ -183,7 +183,7 @@ struct TEvYardInitResult : public TEventLocal<TEvYardInitResult, TEvBlobStorage:
183183
ui64 writeSpeedBps, ui64 readBlockSize, ui64 writeBlockSize,
184184
ui64 bulkWriteBlockSize, ui32 chunkSize, ui32 appendBlockSize,
185185
TOwner owner, TOwnerRound ownerRound, TStatusFlags statusFlags, TVector<TChunkIdx> ownedChunks,
186-
const TString &errorReason)
186+
EDeviceType trueMediaType, const TString &errorReason)
187187
: Status(status)
188188
, StatusFlags(statusFlags)
189189
, PDiskParams(new TPDiskParams(
@@ -196,8 +196,8 @@ struct TEvYardInitResult : public TEventLocal<TEvYardInitResult, TEvBlobStorage:
196196
writeSpeedBps,
197197
readBlockSize,
198198
writeBlockSize,
199-
bulkWriteBlockSize
200-
))
199+
bulkWriteBlockSize,
200+
trueMediaType))
201201
, OwnedChunks(std::move(ownedChunks))
202202
, ErrorReason(errorReason)
203203
{}

‎ydb/core/blobstorage/pdisk/blobstorage_pdisk_impl.cpp

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1743,7 +1743,8 @@ void TPDisk::ReplyErrorYardInitResult(TYardInit &evYardInit, const TString &str)
17431743
DriveModel.Speed(TDriveModel::OP_TYPE_WRITE), readBlockSize, writeBlockSize,
17441744
DriveModel.BulkWriteBlockSize(),
17451745
GetUserAccessibleChunkSize(), GetChunkAppendBlockSize(), OwnerSystem, 0,
1746-
GetStatusFlags(OwnerSystem, evYardInit.OwnerGroupType), TVector<TChunkIdx>(), error.Str()));
1746+
GetStatusFlags(OwnerSystem, evYardInit.OwnerGroupType), TVector<TChunkIdx>(),
1747+
Cfg->RetrieveDeviceType(), error.Str()));
17471748
Mon.YardInit.CountResponse();
17481749
}
17491750

@@ -1790,7 +1791,8 @@ bool TPDisk::YardInitForKnownVDisk(TYardInit &evYardInit, TOwner owner) {
17901791
DriveModel.SeekTimeNs() / 1000ull, DriveModel.Speed(TDriveModel::OP_TYPE_READ),
17911792
DriveModel.Speed(TDriveModel::OP_TYPE_WRITE), readBlockSize, writeBlockSize,
17921793
DriveModel.BulkWriteBlockSize(), GetUserAccessibleChunkSize(), GetChunkAppendBlockSize(), owner,
1793-
ownerRound, GetStatusFlags(OwnerSystem, evYardInit.OwnerGroupType), ownedChunks, nullptr));
1794+
ownerRound, GetStatusFlags(OwnerSystem, evYardInit.OwnerGroupType), ownedChunks,
1795+
Cfg->RetrieveDeviceType(), nullptr));
17941796
GetStartingPoints(owner, result->StartingPoints);
17951797
ownerData.VDiskId = vDiskId;
17961798
ownerData.CutLogId = evYardInit.CutLogId;
@@ -1941,7 +1943,7 @@ void TPDisk::YardInitFinish(TYardInit &evYardInit) {
19411943
DriveModel.Speed(TDriveModel::OP_TYPE_WRITE), readBlockSize, writeBlockSize,
19421944
DriveModel.BulkWriteBlockSize(), GetUserAccessibleChunkSize(), GetChunkAppendBlockSize(), owner, ownerRound,
19431945
GetStatusFlags(OwnerSystem, evYardInit.OwnerGroupType) | ui32(NKikimrBlobStorage::StatusNewOwner), TVector<TChunkIdx>(),
1944-
nullptr));
1946+
Cfg->RetrieveDeviceType(), nullptr));
19451947
GetStartingPoints(result->PDiskParams->Owner, result->StartingPoints);
19461948
WriteSysLogRestorePoint(new TCompletionEventSender(
19471949
this, evYardInit.Sender, result.Release(), Mon.YardInit.Results), evYardInit.ReqId, {});

‎ydb/core/blobstorage/pdisk/blobstorage_pdisk_params.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ namespace NKikimr {
1111
////////////////////////////////////////////////////////////////////////////
1212
TPDiskParams::TPDiskParams(NPDisk::TOwner owner, ui64 ownerRound, ui32 chunkSize, ui32 appendBlockSize,
1313
ui64 seekTimeUs, ui64 readSpeedBps, ui64 writeSpeedBps, ui64 readBlockSize,
14-
ui64 writeBlockSize, ui64 bulkWriteBlockSize)
14+
ui64 writeBlockSize, ui64 bulkWriteBlockSize, NPDisk::EDeviceType trueMediaType)
1515
: Owner(owner)
1616
, OwnerRound(ownerRound)
1717
, ChunkSize(chunkSize)
@@ -25,6 +25,7 @@ namespace NKikimr {
2525
, BulkWriteBlockSize(bulkWriteBlockSize)
2626
, PrefetchSizeBytes(CalculatePrefetchSizeBytes(seekTimeUs, readSpeedBps))
2727
, GlueRequestDistanceBytes(CalculateGlueRequestDistanceBytes(seekTimeUs, readSpeedBps))
28+
, TrueMediaType(trueMediaType)
2829
{
2930
Y_DEBUG_ABORT_UNLESS(AppendBlockSize <= ChunkSize);
3031
}

‎ydb/core/blobstorage/pdisk/blobstorage_pdisk_params.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,15 @@ namespace NKikimr {
2727
const ui64 PrefetchSizeBytes; // Pdisk is expected to stream data of this size at 83% of max speed.
2828
const ui64 GlueRequestDistanceBytes; // It is faster to read unneeded data of this size than to seek over it.
2929

30+
const NPDisk::EDeviceType TrueMediaType;
31+
3032
static ui32 CalculateRecommendedReadSize(ui64 seekTimeUs, ui64 readSpeedBps, ui64 appendBlockSize);
3133
static ui64 CalculatePrefetchSizeBytes(ui64 seekTimeUs, ui64 readSpeedBps);
3234
static ui64 CalculateGlueRequestDistanceBytes(ui64 seekTimeUs, ui64 readSpeedBps);
3335

3436
TPDiskParams(NPDisk::TOwner owner, ui64 ownerRound, ui32 chunkSize, ui32 appendBlockSize,
3537
ui64 seekTimeUs, ui64 readSpeedBps, ui64 writeSpeedBps, ui64 readBlockSize,
36-
ui64 writeBlockSize, ui64 bulkWriteBlockSize);
38+
ui64 writeBlockSize, ui64 bulkWriteBlockSize, NPDisk::EDeviceType trueMediaType);
3739
void OutputHtml(IOutputStream &str) const;
3840
TString ToString() const;
3941
};

‎ydb/core/blobstorage/pdisk/mock/pdisk_mock.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -427,7 +427,7 @@ class TPDiskMockActor : public TActorBootstrapped<TPDiskMockActor> {
427427
const ui64 bulkWriteBlockSize = 65536;
428428
res = std::make_unique<NPDisk::TEvYardInitResult>(NKikimrProto::OK, seekTimeUs, readSpeedBps, writeSpeedBps,
429429
readBlockSize, writeBlockSize, bulkWriteBlockSize, Impl.ChunkSize, Impl.AppendBlockSize, ownerId,
430-
owner->OwnerRound, GetStatusFlags(), std::move(ownedChunks), TString());
430+
owner->OwnerRound, GetStatusFlags(), std::move(ownedChunks), NPDisk::DEVICE_TYPE_NVME, TString());
431431
res->StartingPoints = owner->StartingPoints;
432432
} else {
433433
res = std::make_unique<NPDisk::TEvYardInitResult>(NKikimrProto::INVALID_ROUND, "invalid owner round");

‎ydb/core/blobstorage/ut_blobstorage/lib/env.h

Lines changed: 38 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,10 @@ struct TEnvironmentSetup {
2323
std::set<TActorId> CommencedReplication;
2424
std::unordered_map<ui32, TString> Cache;
2525

26+
using TIcbControlKey = std::pair<ui32, TString>; // { nodeId, name }
27+
28+
std::unordered_map<TIcbControlKey, TControlWrapper> IcbControls;
29+
2630
struct TSettings {
2731
const ui32 NodeCount = 9;
2832
const bool VDiskReplPausedAtStart = false;
@@ -39,7 +43,7 @@ struct TEnvironmentSetup {
3943
const bool SuppressCompatibilityCheck = false;
4044
const TFeatureFlags FeatureFlags;
4145
const NPDisk::EDeviceType DiskType = NPDisk::EDeviceType::DEVICE_TYPE_NVME;
42-
const ui32 BurstThresholdNs = 0;
46+
const ui64 BurstThresholdNs = 0;
4347
const ui32 MinHugeBlobInBytes = 0;
4448
const float DiskTimeAvailableScale = 1;
4549
const bool UseFakeConfigDispatcher = false;
@@ -374,14 +378,24 @@ struct TEnvironmentSetup {
374378
}
375379
config->FeatureFlags = Settings.FeatureFlags;
376380

377-
{
378-
auto* type = config->BlobStorageConfig.MutableCostMetricsSettings()->AddVDiskTypes();
379-
type->SetPDiskType(NKikimrBlobStorage::EPDiskType::ROT);
380-
if (Settings.BurstThresholdNs) {
381-
type->SetBurstThresholdNs(Settings.BurstThresholdNs);
382-
}
383-
type->SetDiskTimeAvailableScale(Settings.DiskTimeAvailableScale);
381+
TAppData* appData = Runtime->GetNode(nodeId)->AppData.get();
382+
383+
#define ADD_ICB_CONTROL(controlName, defaultVal, minVal, maxVal, currentValue) { \
384+
TControlWrapper control(defaultVal, minVal, maxVal); \
385+
appData->Icb->RegisterSharedControl(control, controlName); \
386+
control = currentValue; \
387+
IcbControls.insert({{nodeId, controlName}, std::move(control)}); \
388+
}
389+
390+
if (Settings.BurstThresholdNs) {
391+
ADD_ICB_CONTROL("VDiskControls.BurstThresholdNsHDD", 200'000'000, 1, 1'000'000'000'000, Settings.BurstThresholdNs);
392+
ADD_ICB_CONTROL("VDiskControls.BurstThresholdNsSSD", 50'000'000, 1, 1'000'000'000'000, Settings.BurstThresholdNs);
393+
ADD_ICB_CONTROL("VDiskControls.BurstThresholdNsNVME", 32'000'000, 1, 1'000'000'000'000, Settings.BurstThresholdNs);
384394
}
395+
ADD_ICB_CONTROL("VDiskControls.DiskTimeAvailableScaleHDD", 1'000, 1, 1'000'000, std::round(Settings.DiskTimeAvailableScale * 1'000));
396+
ADD_ICB_CONTROL("VDiskControls.DiskTimeAvailableScaleSSD", 1'000, 1, 1'000'000, std::round(Settings.DiskTimeAvailableScale * 1'000));
397+
ADD_ICB_CONTROL("VDiskControls.DiskTimeAvailableScaleNVME", 1'000, 1, 1'000'000, std::round(Settings.DiskTimeAvailableScale * 1'000));
398+
#undef ADD_ICB_CONTROL
385399

386400
{
387401
auto* type = config->BlobStorageConfig.MutableVDiskPerformanceSettings()->AddVDiskTypes();
@@ -699,7 +713,7 @@ struct TEnvironmentSetup {
699713
});
700714
}
701715

702-
void PutBlob(const ui32 groupId, const TLogoBlobID& blobId, const TString& part) {
716+
void PutBlob(const ui32 groupId, const TLogoBlobID& blobId, const TString& part) {
703717
TActorId edge = Runtime->AllocateEdgeActor(Settings.ControllerNodeId);
704718
Runtime->WrapInActorContext(edge, [&] {
705719
SendToBSProxy(edge, groupId, new TEvBlobStorage::TEvPut(blobId, part, TInstant::Max(),
@@ -924,4 +938,19 @@ struct TEnvironmentSetup {
924938
}
925939
return ctr;
926940
};
941+
942+
void SetIcbControl(ui32 nodeId, TString controlName, ui64 value) {
943+
if (nodeId == 0) {
944+
for (nodeId = 1; nodeId <= Settings.NodeCount; ++nodeId) {
945+
auto it = IcbControls.find({nodeId, controlName});
946+
Y_ABORT_UNLESS(it != IcbControls.end());
947+
it->second = value;
948+
}
949+
} else {
950+
auto it = IcbControls.find({nodeId, controlName});
951+
Y_ABORT_UNLESS(it != IcbControls.end());
952+
it->second = value;
953+
}
954+
}
955+
927956
};

‎ydb/core/blobstorage/ut_blobstorage/monitoring.cpp

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -254,21 +254,22 @@ Y_UNIT_TEST_SUITE(BurstDetection) {
254254
}
255255

256256
void TestDiskTimeAvailableScaling() {
257-
auto measure = [](float scale) {
258-
TBlobStorageGroupInfo::TTopology topology(TBlobStorageGroupType::ErasureNone, 1, 1, 1, true);
259-
std::unique_ptr<TEnvironmentSetup> env;
260-
ui32 groupSize;
261-
TBlobStorageGroupType groupType;
262-
ui32 groupId;
263-
std::vector<ui32> pdiskLayout;
264-
SetupEnv(topology, env, groupSize, groupType, groupId, pdiskLayout, 0, scale);
265-
266-
return env->AggregateVDiskCounters(env->StoragePoolName, groupSize, groupSize, groupId, pdiskLayout,
267-
"advancedCost", "DiskTimeAvailable");
268-
};
257+
TBlobStorageGroupInfo::TTopology topology(TBlobStorageGroupType::ErasureNone, 1, 1, 1, true);
258+
std::unique_ptr<TEnvironmentSetup> env;
259+
ui32 groupSize;
260+
TBlobStorageGroupType groupType;
261+
ui32 groupId;
262+
std::vector<ui32> pdiskLayout;
263+
SetupEnv(topology, env, groupSize, groupType, groupId, pdiskLayout, 0, 1);
264+
265+
i64 test1 = env->AggregateVDiskCounters(env->StoragePoolName, groupSize, groupSize, groupId, pdiskLayout,
266+
"advancedCost", "DiskTimeAvailable");
267+
268+
env->SetIcbControl(0, "VDiskControls.DiskTimeAvailableScaleNVME", 2'000);
269+
env->Sim(TDuration::Minutes(5));
269270

270-
i64 test1 = measure(1);
271-
i64 test2 = measure(2);
271+
i64 test2 = env->AggregateVDiskCounters(env->StoragePoolName, groupSize, groupSize, groupId, pdiskLayout,
272+
"advancedCost", "DiskTimeAvailable");
272273

273274
i64 delta = test1 * 2 - test2;
274275

‎ydb/core/blobstorage/ut_group/main.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -417,6 +417,7 @@ class TTestEnv {
417417
TString());
418418
auto vdiskConfig = AllVDiskKinds->MakeVDiskConfig(baseInfo);
419419
vdiskConfig->EnableVDiskCooldownTimeout = true;
420+
vdiskConfig->UseCostTracker = false;
420421
auto counters = Counters->GetSubgroup("node", ToString(disk.NodeId))->GetSubgroup("vdisk", disk.VDiskId.ToString());
421422
const TActorId& actorId = runtime.Register(CreateVDisk(vdiskConfig, Info, counters), TActorId(), 0, std::nullopt, disk.NodeId);
422423
runtime.RegisterService(disk.VDiskActorId, actorId);

‎ydb/core/blobstorage/ut_mirror3of4/main.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -273,6 +273,7 @@ class TTestEnv {
273273
""
274274
);
275275
const auto vcfg = MakeIntrusive<TVDiskConfig>(baseInfo);
276+
vcfg->UseCostTracker = false;
276277
auto vdiskCounters = Counters->GetSubgroup("vdisk", ToString(i));
277278
runtime.RegisterService(info.GetActorId(i), runtime.Register(CreateVDisk(vcfg, Info, vdiskCounters),
278279
TActorId(), 0, std::nullopt, pdisk.NodeId));

‎ydb/core/blobstorage/ut_vdisk/lib/prepare.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -256,6 +256,7 @@ bool TDefaultVDiskSetup::SetUp(TAllVDisks::TVDiskInstance &vdisk, TAllPDisks *pd
256256
modifier(vdisk.Cfg.Get());
257257
}
258258
vdisk.Cfg->RunRepl = runRepl;
259+
vdisk.Cfg->UseCostTracker = false;
259260

260261
return true;
261262
}

‎ydb/core/blobstorage/ut_vdisk2/env.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -174,6 +174,7 @@ namespace NKikimr {
174174
NPDisk::DEVICE_TYPE_SSD, VSlotId, NKikimrBlobStorage::TVDiskKind::Default, 1,
175175
"static");
176176
VDiskConfig = AllVDiskKinds->MakeVDiskConfig(baseInfo);
177+
VDiskConfig->UseCostTracker = false;
177178

178179
// create and register actor
179180
std::unique_ptr<IActor> vdisk(NKikimr::CreateVDisk(VDiskConfig, Info, Counters->GetSubgroup("subsystem", "vdisk")));

‎ydb/core/blobstorage/vdisk/common/blobstorage_cost_tracker.cpp

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,15 +42,16 @@ class TBsCostModelMirror3of4 : public TBsCostModelBase {
4242
};
4343

4444
TBsCostTracker::TBsCostTracker(const TBlobStorageGroupType& groupType, NPDisk::EDeviceType diskType,
45-
const TIntrusivePtr<::NMonitoring::TDynamicCounters>& counters, ui64 burstThresholdNs,
46-
float diskTimeAvailableScale)
45+
const TIntrusivePtr<::NMonitoring::TDynamicCounters>& counters,
46+
const TCostMetricsParameters& costMetricsParameters)
4747
: GroupType(groupType)
4848
, CostCounters(counters->GetSubgroup("subsystem", "advancedCost"))
4949
, MonGroup(std::make_shared<NMonGroup::TCostTrackerGroup>(CostCounters))
50-
, BucketCapacity(burstThresholdNs * diskTimeAvailableScale)
5150
, Bucket(&DiskTimeAvailable, &BucketCapacity, nullptr, nullptr, nullptr, nullptr, true)
52-
, DiskTimeAvailableScale(diskTimeAvailableScale)
51+
, BurstThresholdNs(costMetricsParameters.BurstThresholdNs)
52+
, DiskTimeAvailableScale(costMetricsParameters.DiskTimeAvailableScale)
5353
{
54+
AtomicSet(BucketCapacity, GetDiskTimeAvailableScale() * BurstThresholdNs);
5455
BurstDetector.Initialize(CostCounters, "BurstDetector");
5556
switch (GroupType.GetErasure()) {
5657
case TBlobStorageGroupType::ErasureMirror3dc:

0 commit comments

Comments
 (0)