Skip to content

Fix BSC VDisk metrics unknown fields exchange #18012

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

Merged
merged 1 commit into from
May 5, 2025
+5 −2
Merged

Fix BSC VDisk metrics unknown fields exchange #18012

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
5 changes: 3 additions & 2 deletions ydb/core/blobstorage/vdisk/skeleton/blobstorage_skeleton.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,7 @@ namespace NKikimr {
}
ctx.Send(*SkeletonFrontIDPtr, ev.release());
// send VDisk's metric to NodeWarden
const bool enableThrottlingReport = AppData()->FeatureFlags.GetEnableThrottlingReport();
ctx.Send(NodeWardenServiceId,
new TEvBlobStorage::TEvControllerUpdateDiskStatus(
SelfVDiskId,
Expand All @@ -109,8 +110,8 @@ namespace NKikimr {
state,
replicated,
outOfSpaceFlags,
OverloadHandler ? OverloadHandler->IsThrottling() : false,
OverloadHandler ? OverloadHandler->GetThrottlingRate() : 0));
enableThrottlingReport ? std::make_optional(OverloadHandler ? OverloadHandler->IsThrottling() : false) : std::nullopt,
enableThrottlingReport ? std::make_optional(OverloadHandler ? OverloadHandler->GetThrottlingRate() : 0) : std::nullopt));
// repeat later
ctx.Schedule(Config->WhiteboardUpdateInterval, new TEvTimeToUpdateWhiteboard());
}
Expand Down
1 change: 1 addition & 0 deletions ydb/core/mind/bscontroller/impl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,6 +286,7 @@ class TBlobStorageController : public TActor<TBlobStorageController>, public TTa
const ui64 allocatedSizeBefore = Metrics.GetAllocatedSize();
const ui32 prevStatusFlags = Metrics.GetStatusFlags();
Metrics.MergeFrom(vDiskMetrics);
Metrics.DiscardUnknownFields();
MetricsDirty = true;
UpdateVDiskMetrics();
*allocatedSizeIncrementPtr = Metrics.GetAllocatedSize() - allocatedSizeBefore;
Expand Down
1 change: 1 addition & 0 deletions ydb/core/protos/feature_flags.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,4 +207,5 @@ message TFeatureFlags {
optional bool EnableEncryptedExport = 181 [default = false];
optional bool EnableAlterDatabase = 182 [default = false];
optional bool EnableExportAutoDropping = 183 [default = false];
optional bool EnableThrottlingReport = 184 [default = false];
}
Loading