Skip to content

stable-25-3: Fix incorrect PDisk ColorBorder setting #28386

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
Nov 10, 2025
Merged

stable-25-3: Fix incorrect PDisk ColorBorder setting #28386

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
10 changes: 7 additions & 3 deletions ydb/core/blobstorage/pdisk/blobstorage_pdisk_chunk_tracker.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,9 +232,13 @@ class TPerOwnerQuotaTracker {
str << "\n</table>";
}

ui32 ColorFlagLimit(TOwner id, NKikimrBlobStorage::TPDiskSpaceColor::E color) {
ui32 ColorFlagLimit(TOwner id, NKikimrBlobStorage::TPDiskSpaceColor::E color) const {
return QuotaForOwner[id].ColorFlagLimit(color);
}

double GetOccupancyForColor(NKikimrBlobStorage::TPDiskSpaceColor::E color) const {
return ColorLimits.GetOccupancyForColor(color, Total);
}
};

////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
Expand Down Expand Up @@ -367,7 +371,7 @@ using TColor = NKikimrBlobStorage::TPDiskSpaceColor;
}

ColorBorder = params.SpaceColorBorder;
ColorBorderOccupancy = chunkLimits.GetOccupancyForColor(ColorBorder, GlobalQuota->GetHardLimit(OwnerBeginUser));
ColorBorderOccupancy = OwnerQuota->GetOccupancyForColor(ColorBorder);
return true;
}

Expand Down Expand Up @@ -615,7 +619,7 @@ using TColor = NKikimrBlobStorage::TPDiskSpaceColor;

void SetColorBorder(NKikimrBlobStorage::TPDiskSpaceColor::E colorBorder) {
ColorBorder = colorBorder;
ColorBorderOccupancy = ColorLimits.GetOccupancyForColor(ColorBorder, GlobalQuota->GetHardLimit(OwnerBeginUser));
ColorBorderOccupancy = OwnerQuota->GetOccupancyForColor(ColorBorder);
}
};

Expand Down
3 changes: 1 addition & 2 deletions ydb/core/blobstorage/pdisk/blobstorage_pdisk_color_limits.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ struct TColorLimits {
};
}

double GetOccupancyForColor(NKikimrBlobStorage::TPDiskSpaceColor::E color, i64 total) {
double GetOccupancyForColor(NKikimrBlobStorage::TPDiskSpaceColor::E color, i64 total) const {
switch (color) {
case NKikimrBlobStorage::TPDiskSpaceColor::GREEN: return 0.0;
case NKikimrBlobStorage::TPDiskSpaceColor::CYAN: return Cyan.CalculateOccupancy(total);
Expand Down Expand Up @@ -139,4 +139,3 @@ struct TColorLimits {

} // NPDisk
} // NKikimr

2 changes: 1 addition & 1 deletion ydb/core/blobstorage/pdisk/blobstorage_pdisk_quota_record.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ class TQuotaRecord {
}
}

ui32 ColorFlagLimit(NKikimrBlobStorage::TPDiskSpaceColor::E color) {
ui32 ColorFlagLimit(NKikimrBlobStorage::TPDiskSpaceColor::E color) const {
using TColor = NKikimrBlobStorage::TPDiskSpaceColor;

switch (color) {
Expand Down
Loading