Skip to content

[Filestore] Availability request names should match the request names reported in user stats #6883

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
SvartMetal wants to merge 1 commit into
base: main
Choose a base branch
from
Open

[Filestore] Availability request names should match the request names reported in user stats #6883

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
91 changes: 46 additions & 45 deletions cloud/filestore/libs/diagnostics/availability_counters.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,38 +27,38 @@ constexpr TDuration DefaultIntervalDuration = TDuration::Minutes(2);

////////////////////////////////////////////////////////////////////////////////

const char* GetAvailabilityRequestTypeName(
EFileStoreAvailabilityRequestType requestType)
const char* GetAvailabilityRequestName(EFileStoreRequest requestType)
{
using EType = EFileStoreAvailabilityRequestType;
using EType = EFileStoreRequest;
switch (requestType) {
case EType::Lookup: return "lookup";
case EType::GetAttr: return "getattr";
case EType::SetAttr: return "setattr";
case EType::AccessNode: return "access";
case EType::AcquireLock: return "acquirelock";
case EType::AllocateData: return "fallocate";
case EType::CreateHandle: return "open";
case EType::CreateNode: return "createnode";
case EType::DestroyHandle: return "release";
case EType::GetNodeAttr: return "getattr";
case EType::GetNodeXAttr: return "getxattr";
case EType::ListNodeXAttr: return "listxattr";
case EType::ListNodes: return "readdir";
case EType::ReadData: return "read";
case EType::ReadLink: return "readlink";
case EType::MkDir: return "mkdir";
case EType::RmDir: return "rmdir";
case EType::Unlink: return "unlink";
case EType::SymLink: return "symlink";
case EType::Link: return "link";
case EType::Rename: return "rename";
case EType::Open: return "open";
case EType::Create: return "create";
case EType::Read: return "read";
case EType::Write: return "write";
case EType::WriteBuf: return "write_buf";
case EType::Flush: return "flush";
case EType::Fsync: return "fsync";
case EType::Release: return "release";
case EType::OpenDir: return "opendir";
case EType::ReadDir: return "readdir";
case EType::ReadDirPlus: return "readdirplus";
case EType::ReleaseDir: return "releasedir";
case EType::None:
case EType::MAX:
break;
case EType::ReleaseLock: return "releaselock";
case EType::RemoveNodeXAttr: return "removexattr";
case EType::RenameNode: return "rename";
case EType::SetNodeAttr: return "setattr";
case EType::SetNodeXAttr: return "setxattr";
case EType::StatFileStore: return "statfs";
case EType::UnlinkNode: return "unlink";
case EType::WriteData: return "write";
default:
return nullptr;
}
return "unknown";
}

bool IsAvailabilityTrackedRequest(EFileStoreRequest requestType)
{
return GetAvailabilityRequestName(requestType) != nullptr;
}

////////////////////////////////////////////////////////////////////////////////
Expand Down Expand Up @@ -101,13 +101,16 @@ void TAvailabilityCounters::EnableAndRegister(
// No intervals have been reported yet - start as available.
*LastIntervalAvailableCounter = 1;

// Index 0 is EFileStoreAvailabilityRequestType::None and stays unused.
for (size_t i = 1; i < RequestTypeStates.size(); ++i) {
// Only the tracked request types get per-type sensors.
for (size_t i = 0; i < RequestTypeStates.size(); ++i) {
const auto requestType = static_cast<EFileStoreRequest>(i);
if (!IsAvailabilityTrackedRequest(requestType)) {
continue;
}
auto& state = RequestTypeStates[i];
auto requestCounters = counters.GetSubgroup(
"request",
GetAvailabilityRequestTypeName(
static_cast<EFileStoreAvailabilityRequestType>(i)));
GetAvailabilityRequestName(requestType));

state.AvailableIntervalsCounter = requestCounters->GetCounter(
"Availability_AvailableIntervals",
Expand All @@ -133,14 +136,12 @@ void TAvailabilityCounters::RequestStarted(
return;
}

if (callContext.AvailabilityRequestType ==
EFileStoreAvailabilityRequestType::None)
{
if (!IsAvailabilityTrackedRequest(callContext.RequestType)) {
return;
}

auto& state = RequestTypeStates[
static_cast<size_t>(callContext.AvailabilityRequestType)];
static_cast<size_t>(callContext.RequestType)];

for (;;) {
// Assign the event to its actual wall-clock interval: roll the
Expand Down Expand Up @@ -174,7 +175,7 @@ void TAvailabilityCounters::DoRequestStarted(
if (callContext.AvailabilityIntervalSeqNo != 0) {
ReportAvailabilityCountersDoubleRegistration(
TStringBuilder() << "request type: "
<< static_cast<ui32>(callContext.AvailabilityRequestType));
<< GetAvailabilityRequestName(callContext.RequestType));
return;
}

Expand All @@ -192,14 +193,12 @@ void TAvailabilityCounters::RequestCompleted(
return;
}

if (callContext.AvailabilityRequestType ==
EFileStoreAvailabilityRequestType::None)
{
if (!IsAvailabilityTrackedRequest(callContext.RequestType)) {
return;
}

auto& state = RequestTypeStates[
static_cast<size_t>(callContext.AvailabilityRequestType)];
static_cast<size_t>(callContext.RequestType)];

for (;;) {
// Assign the event to its actual wall-clock interval: roll the
Expand Down Expand Up @@ -348,8 +347,11 @@ void TAvailabilityCounters::RollInterval(bool publishCounters)
bool intervalAvailable = true;
TStringBuilder unavailableRequestTypes;

// Index 0 is EFileStoreAvailabilityRequestType::None, stays unused.
for (size_t i = 1; i < RequestTypeStates.size(); ++i) {
for (size_t i = 0; i < RequestTypeStates.size(); ++i) {
const auto requestType = static_cast<EFileStoreRequest>(i);
if (!IsAvailabilityTrackedRequest(requestType)) {
continue;
}
if (!RollRequestTypeStateAndReturnAvailability(
RequestTypeStates[i],
publishCounters))
Expand All @@ -358,8 +360,7 @@ void TAvailabilityCounters::RollInterval(bool publishCounters)
// the request types.
intervalAvailable = false;
unavailableRequestTypes << " "
<< GetAvailabilityRequestTypeName(
static_cast<EFileStoreAvailabilityRequestType>(i));
<< GetAvailabilityRequestName(requestType);
}
}

Expand Down
20 changes: 8 additions & 12 deletions cloud/filestore/libs/diagnostics/availability_counters.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,12 @@ namespace NCloud::NFileStore {
////////////////////////////////////////////////////////////////////////////////

// The value of the "request" label of the per-request-type availability
// sensors: the FUSE request name in lower case, as listed in the SLA (e.g.
// "lookup", "write_buf").
const char* GetAvailabilityRequestTypeName(
EFileStoreAvailabilityRequestType requestType);
// sensors: the request name in lower case, as listed in the SLA (e.g.
// "lookup", "write").
const char* GetAvailabilityRequestName(EFileStoreRequest requestType);

// Whether the backend request type is subject to the availability SLA.
bool IsAvailabilityTrackedRequest(EFileStoreRequest requestType);

////////////////////////////////////////////////////////////////////////////////

Expand All @@ -49,12 +51,6 @@ const char* GetAvailabilityRequestTypeName(
// A request is hung if it was outstanding for the entire duration of the N-minute
// interval.
//
// Request type - an individual FUSE request type subject to the SLA, see
// EFileStoreAvailabilityRequestType. Distinct FUSE request types are
// accounted independently even when they map to the same backend request
// type, and requests outside the SLA (AvailabilityRequestType == None) are
// ignored entirely.
//
// The EIO classification is based on TCallContext::GuestReplyErrno - the
// errno actually sent to the guest - because the internal request error does
// not always match the guest-visible outcome.
Expand All @@ -68,7 +64,7 @@ const char* GetAvailabilityRequestTypeName(
// interval was available, 0 otherwise;
// Availability_{Available,Unavailable}Intervals and
// Availability_LastIntervalAvailable are also published per availability
// request type, on the "request=<type>" subgroup (e.g. request=lookup):
// request type, on the "request=<type>" subgroup (e.g. request=read):
// there an interval is available if that request type alone shows no
// unavailability evidence.
//
Expand Down Expand Up @@ -142,7 +138,7 @@ class TAvailabilityCounters
// Assigned by EnableAndRegister().
TDuration IntervalDuration;

std::array<TRequestTypeState, FileStoreAvailabilityRequestTypeCount>
std::array<TRequestTypeState, FileStoreRequestCount>
RequestTypeStates;

// Guarded by RollLock.
Expand Down
Loading