Skip to content

Commit bab703a

Browse files
komarevtsev-dkomarevtsev-d
committed
Fix tests
1 parent b1687c2 commit bab703a

File tree

9 files changed

+40
-20
lines changed

9 files changed

+40
-20
lines changed

‎cloud/blockstore/apps/client/lib/command.cpp‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -450,7 +450,8 @@ void TCommand::Init()
450450
RequestStats = CreateClientRequestStats(
451451
clientGroup,
452452
Timer,
453-
EHistogramCounterOption::ReportMultipleCounters);
453+
EHistogramCounterOption::ReportMultipleCounters |
454+
EHistogramCounterOption::UseUsUnitsForTimeHistogram);
454455

455456
VolumeStats = CreateVolumeStats(
456457
Monitoring,

‎cloud/blockstore/libs/diagnostics/request_stats_ut.cpp‎

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,8 @@ Y_UNIT_TEST_SUITE(TRequestStatsTest)
6464
auto requestStats = CreateServerRequestStats(
6565
monitoring->GetCounters(),
6666
CreateWallClockTimer(),
67-
EHistogramCounterOption::ReportMultipleCounters);
67+
EHistogramCounterOption::ReportMultipleCounters |
68+
EHistogramCounterOption::UseUsUnitsForTimeHistogram);
6869

6970
auto totalCounters = monitoring
7071
->GetCounters()
@@ -230,7 +231,8 @@ Y_UNIT_TEST_SUITE(TRequestStatsTest)
230231
auto requestStats = CreateServerRequestStats(
231232
monitoring->GetCounters(),
232233
CreateWallClockTimer(),
233-
EHistogramCounterOption::ReportMultipleCounters);
234+
EHistogramCounterOption::ReportMultipleCounters |
235+
EHistogramCounterOption::UseUsUnitsForTimeHistogram);
234236

235237
auto totalCounters =
236238
monitoring->GetCounters()->GetSubgroup("request", "WriteBlocks");
@@ -319,7 +321,8 @@ Y_UNIT_TEST_SUITE(TRequestStatsTest)
319321
auto requestStats = CreateServerRequestStats(
320322
monitoring->GetCounters(),
321323
CreateWallClockTimer(),
322-
EHistogramCounterOption::ReportMultipleCounters);
324+
EHistogramCounterOption::ReportMultipleCounters |
325+
EHistogramCounterOption::UseUsUnitsForTimeHistogram);
323326

324327
auto totalCounters = monitoring
325328
->GetCounters()
@@ -431,7 +434,8 @@ Y_UNIT_TEST_SUITE(TRequestStatsTest)
431434
auto requestStats = CreateServerRequestStats(
432435
monitoring->GetCounters(),
433436
CreateWallClockTimer(),
434-
EHistogramCounterOption::ReportMultipleCounters);
437+
EHistogramCounterOption::ReportMultipleCounters |
438+
EHistogramCounterOption::UseUsUnitsForTimeHistogram);
435439

436440
auto totalCounters =
437441
monitoring->GetCounters()->GetSubgroup("request", "WriteBlocks");
@@ -559,7 +563,8 @@ Y_UNIT_TEST_SUITE(TRequestStatsTest)
559563
auto requestStats = CreateServerRequestStats(
560564
monitoring->GetCounters(),
561565
CreateWallClockTimer(),
562-
EHistogramCounterOption::ReportMultipleCounters);
566+
EHistogramCounterOption::ReportMultipleCounters |
567+
EHistogramCounterOption::UseUsUnitsForTimeHistogram);
563568

564569
auto totalCounters = monitoring
565570
->GetCounters()
@@ -656,7 +661,8 @@ Y_UNIT_TEST_SUITE(TRequestStatsTest)
656661
auto requestStats = CreateServerRequestStats(
657662
monitoring->GetCounters(),
658663
CreateWallClockTimer(),
659-
EHistogramCounterOption::ReportMultipleCounters);
664+
EHistogramCounterOption::ReportMultipleCounters |
665+
EHistogramCounterOption::UseUsUnitsForTimeHistogram);
660666

661667
auto totalCounters = monitoring
662668
->GetCounters()
@@ -725,7 +731,8 @@ Y_UNIT_TEST_SUITE(TRequestStatsTest)
725731
auto requestStats = CreateServerRequestStats(
726732
monitoring->GetCounters(),
727733
CreateWallClockTimer(),
728-
EHistogramCounterOption::ReportMultipleCounters);
734+
EHistogramCounterOption::ReportMultipleCounters |
735+
EHistogramCounterOption::UseUsUnitsForTimeHistogram);
729736

730737
unsigned int totalShots = 0;
731738
auto shoot = [&] (auto mediaKind, unsigned int count) {

‎cloud/blockstore/libs/diagnostics/server_stats_ut.cpp‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,8 @@ Y_UNIT_TEST_SUITE(TServerStatsTest)
147147
CreateServerRequestStats(
148148
serverGroup,
149149
timer,
150-
EHistogramCounterOption::ReportMultipleCounters),
150+
EHistogramCounterOption::ReportMultipleCounters |
151+
EHistogramCounterOption::UseUsUnitsForTimeHistogram),
151152
std::move(volumeStats)
152153
);
153154

@@ -221,7 +222,8 @@ Y_UNIT_TEST_SUITE(TServerStatsTest)
221222
CreateServerRequestStats(
222223
serverGroup,
223224
timer,
224-
EHistogramCounterOption::ReportMultipleCounters),
225+
EHistogramCounterOption::ReportMultipleCounters |
226+
EHistogramCounterOption::UseUsUnitsForTimeHistogram),
225227
std::move(volumeStats)
226228
);
227229

@@ -259,7 +261,8 @@ Y_UNIT_TEST_SUITE(TServerStatsTest)
259261
CreateServerRequestStats(
260262
serverGroup,
261263
timer,
262-
EHistogramCounterOption::ReportMultipleCounters),
264+
EHistogramCounterOption::ReportMultipleCounters |
265+
EHistogramCounterOption::UseUsUnitsForTimeHistogram),
263266
std::move(volumeStats)
264267
);
265268

@@ -347,7 +350,8 @@ Y_UNIT_TEST_SUITE(TServerStatsTest)
347350
CreateServerRequestStats(
348351
serverGroup,
349352
timer,
350-
EHistogramCounterOption::ReportMultipleCounters),
353+
EHistogramCounterOption::ReportMultipleCounters |
354+
EHistogramCounterOption::UseUsUnitsForTimeHistogram),
351355
std::move(volumeStats)
352356
);
353357

@@ -392,7 +396,8 @@ Y_UNIT_TEST_SUITE(TServerStatsTest)
392396
CreateServerRequestStats(
393397
monitoring->GetCounters(),
394398
timer,
395-
EHistogramCounterOption::ReportMultipleCounters),
399+
EHistogramCounterOption::ReportMultipleCounters |
400+
EHistogramCounterOption::UseUsUnitsForTimeHistogram),
396401
CreateVolumeStatsStub()
397402
);
398403

‎cloud/blockstore/libs/endpoints_vhost/external_endpoint_stats_ut.cpp‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,8 @@ struct TFixture
127127
CreateServerRequestStats(
128128
serverGroup,
129129
Timer,
130-
EHistogramCounterOption::ReportMultipleCounters),
130+
EHistogramCounterOption::ReportMultipleCounters |
131+
EHistogramCounterOption::UseUsUnitsForTimeHistogram),
131132
std::move(volumeStats)
132133
);
133134

‎cloud/blockstore/libs/service_local/compound_storage_ut.cpp‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,8 @@ IStoragePtr CreateTestStorage(
179179
CreateServerRequestStats(
180180
serverGroup,
181181
CreateWallClockTimer(),
182-
EHistogramCounterOption::ReportMultipleCounters),
182+
EHistogramCounterOption::ReportMultipleCounters |
183+
EHistogramCounterOption::UseUsUnitsForTimeHistogram),
183184
CreateVolumeStatsStub());
184185

185186
return CreateCompoundStorage(
@@ -706,7 +707,8 @@ Y_UNIT_TEST_SUITE(TCompoundStorageTest)
706707
CreateServerRequestStats(
707708
serverGroup,
708709
CreateWallClockTimer(),
709-
EHistogramCounterOption::ReportMultipleCounters),
710+
EHistogramCounterOption::ReportMultipleCounters |
711+
EHistogramCounterOption::UseUsUnitsForTimeHistogram),
710712
CreateVolumeStatsStub());
711713

712714
auto storage = CreateCompoundStorage(

‎cloud/blockstore/libs/service_local/storage_spdk_ut.cpp‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,8 @@ IStoragePtr CreateSpdkStorage(
250250
CreateServerRequestStats(
251251
serverGroup,
252252
CreateWallClockTimer(),
253-
EHistogramCounterOption::ReportMultipleCounters),
253+
EHistogramCounterOption::ReportMultipleCounters |
254+
EHistogramCounterOption::UseUsUnitsForTimeHistogram),
254255
CreateVolumeStatsStub());
255256

256257
auto storageProvider = CreateSpdkStorageProvider(

‎cloud/blockstore/tools/nbd/bootstrap.cpp‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -398,7 +398,8 @@ void TBootstrap::InitControlClient()
398398
RequestStats = CreateClientRequestStats(
399399
clientGroup,
400400
Timer,
401-
EHistogramCounterOption::ReportMultipleCounters);
401+
EHistogramCounterOption::ReportMultipleCounters |
402+
EHistogramCounterOption::UseUsUnitsForTimeHistogram);
402403

403404
VolumeStats = CreateVolumeStats(
404405
Monitoring,

‎cloud/blockstore/tools/testing/loadtest/lib/bootstrap.cpp‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,8 @@ void TBootstrap::Init()
213213
RequestStats = CreateClientRequestStats(
214214
clientGroup,
215215
Timer,
216-
EHistogramCounterOption::ReportMultipleCounters);
216+
EHistogramCounterOption::ReportMultipleCounters |
217+
EHistogramCounterOption::UseUsUnitsForTimeHistogram);
217218

218219
VolumeStats = CreateVolumeStats(
219220
Monitoring,

‎cloud/vm/blockstore/bootstrap.cpp‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,8 @@ void TBootstrap::Init()
161161
RequestStats = CreateClientRequestStats(
162162
clientGroup,
163163
Timer,
164-
EHistogramCounterOption::ReportMultipleCounters);
164+
EHistogramCounterOption::ReportMultipleCounters |
165+
EHistogramCounterOption::UseUsUnitsForTimeHistogram);
165166

166167
VolumeStats = CreateVolumeStats(
167168
Monitoring,

0 commit comments

Comments
 (0)