Skip to content

Commit 6fd288d

Browse files
rosikydbot
authored andcommitted
Fix incorrect PDisk ColorBorder setting (#28254)
1 parent 366f5eb commit 6fd288d

File tree

3 files changed

+9
-6
lines changed

3 files changed

+9
-6
lines changed

ydb/core/blobstorage/pdisk/blobstorage_pdisk_chunk_tracker.h

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -232,9 +232,13 @@ class TPerOwnerQuotaTracker {
232232
str << "\n</table>";
233233
}
234234

235-
ui32 ColorFlagLimit(TOwner id, NKikimrBlobStorage::TPDiskSpaceColor::E color) {
235+
ui32 ColorFlagLimit(TOwner id, NKikimrBlobStorage::TPDiskSpaceColor::E color) const {
236236
return QuotaForOwner[id].ColorFlagLimit(color);
237237
}
238+
239+
double GetOccupancyForColor(NKikimrBlobStorage::TPDiskSpaceColor::E color) const {
240+
return ColorLimits.GetOccupancyForColor(color, Total);
241+
}
238242
};
239243

240244
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -367,7 +371,7 @@ using TColor = NKikimrBlobStorage::TPDiskSpaceColor;
367371
}
368372

369373
ColorBorder = params.SpaceColorBorder;
370-
ColorBorderOccupancy = chunkLimits.GetOccupancyForColor(ColorBorder, GlobalQuota->GetHardLimit(OwnerBeginUser));
374+
ColorBorderOccupancy = OwnerQuota->GetOccupancyForColor(ColorBorder);
371375
return true;
372376
}
373377

@@ -615,7 +619,7 @@ using TColor = NKikimrBlobStorage::TPDiskSpaceColor;
615619

616620
void SetColorBorder(NKikimrBlobStorage::TPDiskSpaceColor::E colorBorder) {
617621
ColorBorder = colorBorder;
618-
ColorBorderOccupancy = ColorLimits.GetOccupancyForColor(ColorBorder, GlobalQuota->GetHardLimit(OwnerBeginUser));
622+
ColorBorderOccupancy = OwnerQuota->GetOccupancyForColor(ColorBorder);
619623
}
620624
};
621625

ydb/core/blobstorage/pdisk/blobstorage_pdisk_color_limits.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ struct TColorLimits {
100100
};
101101
}
102102

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

140140
} // NPDisk
141141
} // NKikimr
142-

ydb/core/blobstorage/pdisk/blobstorage_pdisk_quota_record.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ class TQuotaRecord {
174174
}
175175
}
176176

177-
ui32 ColorFlagLimit(NKikimrBlobStorage::TPDiskSpaceColor::E color) {
177+
ui32 ColorFlagLimit(NKikimrBlobStorage::TPDiskSpaceColor::E color) const {
178178
using TColor = NKikimrBlobStorage::TPDiskSpaceColor;
179179

180180
switch (color) {

0 commit comments

Comments
 (0)