Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 4 additions & 3 deletions ydb/core/blob_depot/data.h
Original file line number Diff line number Diff line change
Expand Up @@ -755,9 +755,10 @@ namespace NKikimr::NBlobDepot {

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

ui64 GetTotalStoredDataSize() const {
return TotalStoredDataSize;
}
ui64 GetTotalStoredDataSize() const { return TotalStoredDataSize; }
ui64 GetTotalStoredTrashSize() const { return TotalStoredTrashSize; }
ui64 GetInFlightTrashSize() const { return InFlightTrashSize; }
ui64 GetTotalS3DataSize() const { return TotalS3DataSize; }

void RenderMainPage(IOutputStream& s);

Expand Down
47 changes: 10 additions & 37 deletions ydb/core/blob_depot/mon_main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -486,24 +486,10 @@ document.addEventListener("DOMContentLoaded", ready);
}
DIV_CLASS("panel-body") {
KEYVALUE_TABLE({

ui64 total = 0;
ui64 trashInFlight = 0;
ui64 trashPending = 0;
Data->EnumerateRefCount([&](const auto& key, ui32) {
TOverloaded callback{
[&](TLogoBlobID id) { total += id.BlobSize(); },
[&](TS3Locator) {}
};
callback(key);
});
Data->EnumerateTrash([&](ui32 /*groupId*/, TLogoBlobID id, bool inFlight) {
(inFlight ? trashInFlight : trashPending) += id.BlobSize();
});

KEYVALUE_UP("Data, bytes", "data", FormatByteSize(total));
KEYVALUE_UP("Trash in flight, bytes", "trash_in_flight", FormatByteSize(trashInFlight));
KEYVALUE_UP("Trash pending, bytes", "trash_pending", FormatByteSize(trashPending));
KEYVALUE_UP("Data, bytes", "data", FormatByteSize(Data->GetTotalStoredDataSize()));
KEYVALUE_UP("Data in S3, bytes", "data_s3", FormatByteSize(Data->GetTotalS3DataSize()));
KEYVALUE_UP("Trash in flight, bytes", "trash_in_flight", FormatByteSize(Data->GetInFlightTrashSize()));
KEYVALUE_UP("Trash pending, bytes", "trash_pending", FormatByteSize(Data->GetTotalStoredTrashSize()));

std::vector<ui32> groups;
for (const auto& [groupId, _] : Groups) {
Expand All @@ -513,7 +499,7 @@ document.addEventListener("DOMContentLoaded", ready);
for (const ui32 groupId : groups) {
TGroupInfo& group = Groups[groupId];
KEYVALUE_UP(TStringBuilder() << "Data in GroupId# " << groupId << ", bytes",
'g' << groupId, FormatByteSize(group.AllocatedBytes));
TStringBuilder() << 'g' << groupId, FormatByteSize(group.AllocatedBytes));
}
})
}
Expand Down Expand Up @@ -579,28 +565,15 @@ document.addEventListener("DOMContentLoaded", ready);
}
};

ui64 total = 0;
ui64 trashInFlight = 0;
ui64 trashPending = 0;
Data->EnumerateRefCount([&](const auto& key, ui32) {
TOverloaded callback{
[&](TLogoBlobID id) { total += id.BlobSize(); },
[&](TS3Locator) {}
};
callback(key);
});
Data->EnumerateTrash([&](ui32 /*groupId*/, TLogoBlobID id, bool inFlight) {
(inFlight ? trashInFlight : trashPending) += id.BlobSize();
});

NJson::TJsonMap data{
{"data", formatSize(total)},
{"trash_in_flight", formatSize(trashInFlight)},
{"trash_pending", formatSize(trashPending)},
{"data", formatSize(Data->GetTotalStoredDataSize())},
{"data_s3", formatSize(Data->GetTotalS3DataSize())},
{"trash_in_flight", formatSize(Data->GetInFlightTrashSize())},
{"trash_pending", formatSize(Data->GetTotalStoredTrashSize())},
};

for (const auto& [groupId, group] : Groups) {
data[TStringBuilder() << "g" << groupId] = formatSize(group.AllocatedBytes);
data[TStringBuilder() << 'g' << groupId] = formatSize(group.AllocatedBytes);
}

if (Configured && Config.GetIsDecommittingGroup()) {
Expand Down
Loading