Skip to content

[NBS] remove copy paste code from request stats #4648

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.

Sign up for GitHub

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

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

[NBS] remove copy paste code from request stats #4648

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
63c4776
remove copy paste code from request stats
vladstepanyuk Nov 11, 2025
3bb5306
correct comment
vladstepanyuk Nov 11, 2025
9dcb22b
fix tests
vladstepanyuk Nov 12, 2025
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
136 changes: 51 additions & 85 deletions cloud/blockstore/libs/diagnostics/request_stats.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,15 +239,14 @@ constexpr TRequestCounters::EOptions SSDOrHDDOptions =
TRequestCounters::EOption::OnlyReadWriteRequests;

#define BLOCKSTORE_MEDIA_KIND(xxx, ...) \
xxx(, GeneralOptions __VA_ARGS__ )\
xxx(SSD, SSDOrHDDOptions __VA_ARGS__ )\
xxx(HDD, SSDOrHDDOptions __VA_ARGS__ )\
xxx(SSDNonrepl, DefaultOptions, __VA_ARGS__ )\
xxx(SSDMirror2, DefaultOptions, __VA_ARGS__ )\
xxx(SSDMirror3, DefaultOptions, __VA_ARGS__ )\
xxx(SSDLocal, DefaultOptions, __VA_ARGS__ )\
xxx(HDDLocal, DefaultOptions, __VA_ARGS__ )\
xxx(HDDNonrepl, DefaultOptions, __VA_ARGS__ )\
xxx(SSD, SSDOrHDDOptions, ssd, __VA_ARGS__ )\
xxx(HDD, SSDOrHDDOptions, hdd, __VA_ARGS__ )\
xxx(SSDNonrepl, DefaultOptions, ssd_nonrepl, __VA_ARGS__ )\
xxx(SSDMirror2, DefaultOptions, ssd_mirror2, __VA_ARGS__ )\
xxx(SSDMirror3, DefaultOptions, ssd_mirror3, __VA_ARGS__ )\
xxx(SSDLocal, DefaultOptions, ssd_local, __VA_ARGS__ )\
xxx(HDDLocal, DefaultOptions, hdd_local, __VA_ARGS__ )\
xxx(HDDNonrepl, DefaultOptions, hdd_nonrepl, __VA_ARGS__ )\
// BLOCKSTORE_MEDIA_KIND

class TRequestStats final
Expand All @@ -259,39 +258,28 @@ class TRequestStats final
const bool IsServerSide;

TRequestCounters Total;
TRequestCounters TotalSSD;
TRequestCounters TotalHDD;
TRequestCounters TotalSSDNonrepl;
TRequestCounters TotalSSDMirror2;
TRequestCounters TotalSSDMirror3;
TRequestCounters TotalSSDLocal;
TRequestCounters TotalHDDLocal;
TRequestCounters TotalHDDNonrepl;

THdrPercentiles HdrTotal;
THdrPercentiles HdrTotalSSD;
THdrPercentiles HdrTotalHDD;
THdrPercentiles HdrTotalSSDNonrepl;
THdrPercentiles HdrTotalSSDMirror2;
THdrPercentiles HdrTotalSSDMirror3;
THdrPercentiles HdrTotalSSDLocal;
THdrPercentiles HdrTotalHDDLocal;
THdrPercentiles HdrTotalHDDNonrepl;

#define DEFINE_COUNTERS(name, ...) \
TRequestCounters Total##name; \
THdrPercentiles HdrTotal##name; \
// DEFINE_REQUEST_COUNTERS

BLOCKSTORE_MEDIA_KIND(DEFINE_COUNTERS)

#undef DEFINE_COUNTERS

public:

#define INITIALIZE_REQUEST_COUNTERS(name, options, ...) \
#define INITIALIZE_COUNTERS(name, options, ...) \
, Total##name(MakeRequestCounters( \
timer, \
options, \
histogramCounterOptions, \
executionTimeSizeClasses)) \
// INITIALIZE_REQUEST_COUNTERS

#define INITIALIZE_HDR_PERCENTILES(name, ...) \
, HdrTotal##name( \
executionTimeSizeClasses) \
// INITIALIZE_HDR_PERCENTILES
// INITIALIZE_REQUEST_COUNTERS

TRequestStats(
TDynamicCountersPtr counters,
Expand All @@ -301,50 +289,34 @@ class TRequestStats final
const TVector<TSizeInterval>& executionTimeSizeClasses)
: Counters(std::move(counters))
, IsServerSide(isServerSide)
BLOCKSTORE_MEDIA_KIND(INITIALIZE_REQUEST_COUNTERS)
BLOCKSTORE_MEDIA_KIND(INITIALIZE_HDR_PERCENTILES)
, Total(MakeRequestCounters(
timer,
GeneralOptions,
histogramCounterOptions,
executionTimeSizeClasses))
, HdrTotal(executionTimeSizeClasses)
BLOCKSTORE_MEDIA_KIND(INITIALIZE_COUNTERS)
{
Total.Register(*Counters);

auto ssd = Counters->GetSubgroup("type", "ssd");
TotalSSD.Register(*ssd);

auto hdd = Counters->GetSubgroup("type", "hdd");
TotalHDD.Register(*hdd);

auto ssdNonrepl = Counters->GetSubgroup("type", "ssd_nonrepl");
TotalSSDNonrepl.Register(*ssdNonrepl);

auto ssdMirror2 = Counters->GetSubgroup("type", "ssd_mirror2");
TotalSSDMirror2.Register(*ssdMirror2);

auto ssdMirror3 = Counters->GetSubgroup("type", "ssd_mirror3");
TotalSSDMirror3.Register(*ssdMirror3);

auto ssdLocal = Counters->GetSubgroup("type", "ssd_local");
TotalSSDLocal.Register(*ssdLocal);

auto hddLocal = Counters->GetSubgroup("type", "hdd_local");
TotalHDDLocal.Register(*hddLocal);

auto hddNonrepl = Counters->GetSubgroup("type", "hdd_nonrepl");
TotalHDDNonrepl.Register(*hddNonrepl);

if (IsServerSide) {
HdrTotal.Register(*Counters);
HdrTotalSSD.Register(*ssd);
HdrTotalHDD.Register(*hdd);
HdrTotalSSDNonrepl.Register(*ssdNonrepl);
HdrTotalSSDMirror2.Register(*ssdMirror2);
HdrTotalSSDMirror3.Register(*ssdMirror3);
HdrTotalSSDLocal.Register(*ssdLocal);
HdrTotalHDDLocal.Register(*ssdLocal);
HdrTotalHDDNonrepl.Register(*hddNonrepl);
}

#define REGISTER_COUNTERS(name, _, countersName, ...) \
do { \
auto counters = Counters->GetSubgroup("type", #countersName); \
Total##name.Register(*counters); \
if (IsServerSide) { \
HdrTotal##name.Register(*counters); \
} \
} while (false); \
// REGISTER_COUNTERS

BLOCKSTORE_MEDIA_KIND(REGISTER_COUNTERS)
}

#undef INITIALIZE_REQUEST_COUNTERS
#undef INITIALIZE_HDR_PERCENTILES
#undef REGISTER_COUNTERS
#undef INITIALIZE_COUNTERS

ui64 RequestStarted(
NCloud::NProto::EStorageMediaKind mediaKind,
Expand Down Expand Up @@ -555,26 +527,20 @@ class TRequestStats final
void UpdateStats(bool updatePercentiles) override
{
Total.UpdateStats(updatePercentiles);
TotalSSD.UpdateStats(updatePercentiles);
TotalHDD.UpdateStats(updatePercentiles);
TotalSSDNonrepl.UpdateStats(updatePercentiles);
TotalSSDMirror2.UpdateStats(updatePercentiles);
TotalSSDMirror3.UpdateStats(updatePercentiles);
TotalSSDLocal.UpdateStats(updatePercentiles);
TotalHDDLocal.UpdateStats(updatePercentiles);
TotalHDDNonrepl.UpdateStats(updatePercentiles);

if (updatePercentiles && IsServerSide) {
HdrTotal.UpdateStats();
HdrTotalSSD.UpdateStats();
HdrTotalHDD.UpdateStats();
HdrTotalSSDNonrepl.UpdateStats();
HdrTotalSSDMirror2.UpdateStats();
HdrTotalSSDMirror3.UpdateStats();
HdrTotalSSDLocal.UpdateStats();
HdrTotalHDDLocal.UpdateStats();
HdrTotalHDDNonrepl.UpdateStats();
}

#define UPDATE_STATS(name, ...) \
Total##name.UpdateStats(updatePercentiles); \
if (updatePercentiles && IsServerSide) { \
HdrTotal##name.UpdateStats(); \
} \
// UPDATE_STATS

BLOCKSTORE_MEDIA_KIND(UPDATE_STATS)

#undef UPDATE_STATS
}

private:
Expand Down