Skip to content
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

Merge 24-3. Fix ColorBorderOccupancy in PDisk #8872

Merged
merged 1 commit into from
Sep 6, 2024
Merged

Merge 24-3. Fix ColorBorderOccupancy in PDisk #8872

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
12 changes: 8 additions & 4 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 @@ -163,16 +163,20 @@ class TPerOwnerQuotaTracker {
str << "</tr>";
}

void PrintHTML(IOutputStream &str, TQuotaRecord *sharedQuota, NKikimrBlobStorage::TPDiskSpaceColor::E *colorBorder) {
void PrintHTML(IOutputStream &str, TQuotaRecord *sharedQuota, NKikimrBlobStorage::TPDiskSpaceColor::E *colorBorder, double *borderOccupancy) {
str << "<pre>";
str << "ColorLimits#\n";
ColorLimits.Print(str);
str << "\nTotal# " << Total;
str << "\nExpectedOwnerCount# " << ExpectedOwnerCount;
str << "\nActiveOwners# " << ActiveOwnerIds.size();
if (colorBorder) {
str << "\nColorBorder# " << NKikimrBlobStorage::TPDiskSpaceColor::E_Name(*colorBorder) << "\n";
str << "\nColorBorder# " << NKikimrBlobStorage::TPDiskSpaceColor::E_Name(*colorBorder);
}
if (borderOccupancy) {
str << "\nColorBorderOccupancy# " << *borderOccupancy;
}
str << "\n";
str << "</pre>";
str << "<table class='table table-sortable tablesorter tablesorter-bootstrap table-bordered'>";
str << R"_(<tr>
Expand Down Expand Up @@ -531,9 +535,9 @@ using TColor = NKikimrBlobStorage::TPDiskSpaceColor;

void PrintHTML(IOutputStream &str) {
str << "<h4>GlobalQuota</h4>";
GlobalQuota->PrintHTML(str, nullptr, nullptr);
GlobalQuota->PrintHTML(str, nullptr, nullptr, nullptr);
str << "<h4>OwnerQuota</h4>";
OwnerQuota->PrintHTML(str, SharedQuota.Get(), &ColorBorder);
OwnerQuota->PrintHTML(str, SharedQuota.Get(), &ColorBorder, &ColorBorderOccupancy);
}

ui32 ColorFlagLimit(TOwner owner, NKikimrBlobStorage::TPDiskSpaceColor::E color) {
Expand Down
20 changes: 10 additions & 10 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 @@ -26,7 +26,7 @@ struct TDiskColor {
}

double CalculateOccupancy(i64 total) const {
return (double)CalculateQuota(total) / total;
return 1 - (double)CalculateQuota(total) / total;
}
};

Expand Down Expand Up @@ -92,15 +92,15 @@ struct TColorLimits {

double GetOccupancyForColor(NKikimrBlobStorage::TPDiskSpaceColor::E color, i64 total) {
switch (color) {
case NKikimrBlobStorage::TPDiskSpaceColor::GREEN: return Cyan.CalculateOccupancy(total);
case NKikimrBlobStorage::TPDiskSpaceColor::CYAN: return LightYellow.CalculateOccupancy(total);
case NKikimrBlobStorage::TPDiskSpaceColor::LIGHT_YELLOW: return Yellow.CalculateOccupancy(total);
case NKikimrBlobStorage::TPDiskSpaceColor::YELLOW: return LightOrange.CalculateOccupancy(total);
case NKikimrBlobStorage::TPDiskSpaceColor::LIGHT_ORANGE: return PreOrange.CalculateOccupancy(total);
case NKikimrBlobStorage::TPDiskSpaceColor::PRE_ORANGE: return Orange.CalculateOccupancy(total);
case NKikimrBlobStorage::TPDiskSpaceColor::ORANGE: return Red.CalculateOccupancy(total);
case NKikimrBlobStorage::TPDiskSpaceColor::RED: return Black.CalculateOccupancy(total);
case NKikimrBlobStorage::TPDiskSpaceColor::BLACK: return 1.0;
case NKikimrBlobStorage::TPDiskSpaceColor::GREEN: return 0.0;
case NKikimrBlobStorage::TPDiskSpaceColor::CYAN: return Cyan.CalculateOccupancy(total);
case NKikimrBlobStorage::TPDiskSpaceColor::LIGHT_YELLOW: return LightYellow.CalculateOccupancy(total);
case NKikimrBlobStorage::TPDiskSpaceColor::YELLOW: return Yellow.CalculateOccupancy(total);
case NKikimrBlobStorage::TPDiskSpaceColor::LIGHT_ORANGE: return LightOrange.CalculateOccupancy(total);
case NKikimrBlobStorage::TPDiskSpaceColor::PRE_ORANGE: return PreOrange.CalculateOccupancy(total);
case NKikimrBlobStorage::TPDiskSpaceColor::ORANGE: return Orange.CalculateOccupancy(total);
case NKikimrBlobStorage::TPDiskSpaceColor::RED: return Red.CalculateOccupancy(total);
case NKikimrBlobStorage::TPDiskSpaceColor::BLACK: return Black.CalculateOccupancy(total);

case NKikimrBlobStorage::TPDiskSpaceColor_E_TPDiskSpaceColor_E_INT_MIN_SENTINEL_DO_NOT_USE_:
case NKikimrBlobStorage::TPDiskSpaceColor_E_TPDiskSpaceColor_E_INT_MAX_SENTINEL_DO_NOT_USE_:
Expand Down
2 changes: 2 additions & 0 deletions ydb/core/blobstorage/pdisk/blobstorage_pdisk_config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,6 +298,8 @@ struct TPDiskConfig : public TThrRefBase {
str << " OrangeLogChunksMultiplier# " << OrangeLogChunksMultiplier << x;
str << " WarningLogChunksMultiplier# " << WarningLogChunksMultiplier << x;
str << " YellowLogChunksMultiplier# " << YellowLogChunksMultiplier << x;
str << " MaxMetadataMegabytes# " << MaxMetadataMegabytes << x;
str << " SpaceColorBorder# " << SpaceColorBorder << x;
str << "}";
return str.Str();
}
Expand Down
Loading