Skip to content

fix: floor disk usage values #2253

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 2 commits into from
May 5, 2025
Merged

fix: floor disk usage values #2253

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c0b6886
fix: floor disk usage values
artemmufazalov May 5, 2025
9280189
fix: fix tests
artemmufazalov May 5, 2025
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
2 changes: 1 addition & 1 deletion src/components/DiskStateProgressBar/DiskStateProgressBar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ export function DiskStateProgressBar({
}

if (!compact && diskAllocatedPercent >= 0) {
return <div className={b('title')}>{`${Math.round(diskAllocatedPercent)}%`}</div>;
return <div className={b('title')}>{`${Math.floor(diskAllocatedPercent)}%`}</div>;
}

return null;
Expand Down
2 changes: 1 addition & 1 deletion src/components/MemoryViewer/MemoryViewer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ export function MemoryViewer({

const theme = useTheme();
let fillWidth =
Math.round((parseFloat(String(memoryUsage)) / parseFloat(String(capacity))) * 100) || 0;
Math.floor((parseFloat(String(memoryUsage)) / parseFloat(String(capacity))) * 100) || 0;
fillWidth = fillWidth > 100 ? 100 : fillWidth;
let valueText: number | string | undefined = memoryUsage,
capacityText: number | string | undefined = capacity,
Expand Down
2 changes: 1 addition & 1 deletion src/components/ProgressViewer/ProgressViewer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ export function ProgressViewer({
const theme = useTheme();

let fillWidth =
Math.round((parseFloat(String(value)) / parseFloat(String(capacity))) * 100) || 0;
Math.floor((parseFloat(String(value)) / parseFloat(String(capacity))) * 100) || 0;
fillWidth = fillWidth > 100 ? 100 : fillWidth;
let valueText: number | string | undefined = value,
capacityText: number | string | undefined = capacity,
Expand Down
2 changes: 1 addition & 1 deletion src/containers/Cluster/ClusterInfo/components/DiskGroupsStatsBars/DiskGroupsStats.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ export function DiskGroupsStats({stats, storageType}: GroupsStatsPopupContentPro
const convertedAllocatedSize = formatBytes({value: allocatedSize, size: sizeToConvert});
const convertedAvailableSize = formatBytes({value: availableSize, size: sizeToConvert});

const usage = Math.round((allocatedSize / (allocatedSize + availableSize)) * 100);
const usage = Math.floor((allocatedSize / (allocatedSize + availableSize)) * 100);

const info = [
{
Expand Down
6 changes: 3 additions & 3 deletions src/store/reducers/storage/__tests__/prepareGroupsDisks.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ describe('prepareGroupsVDisk', () => {
AllocatedSize: 30943477760,
AvailableSize: 234461593600,
TotalSize: 265405071360,
AllocatedPercent: 12,
AllocatedPercent: 11,

Donors: undefined,

Expand Down Expand Up @@ -135,7 +135,7 @@ describe('prepareGroupsVDisk', () => {
AllocatedSize: 30943477760,
AvailableSize: 234461593600,
TotalSize: 265405071360,
AllocatedPercent: 12,
AllocatedPercent: 11,

PDisk: {
AllocatedPercent: NaN,
Expand Down Expand Up @@ -237,7 +237,7 @@ describe('prepareGroupsVDisk', () => {
AllocatedSize: 30943477760,
AvailableSize: 234461593600,
TotalSize: 265405071360,
AllocatedPercent: 12,
AllocatedPercent: 11,

Donors: undefined,

Expand Down
4 changes: 2 additions & 2 deletions src/utils/disks/__test__/prepareDisks.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ describe('prepareWhiteboardVDiskData', () => {
AvailableSize: 188523479040,
AllocatedSize: 8996782080,
TotalSize: 197520261120,
AllocatedPercent: 5,
AllocatedPercent: 4,
};

const preparedData = prepareWhiteboardVDiskData(data);
Expand Down Expand Up @@ -162,7 +162,7 @@ describe('prepareWhiteboardPDiskData', () => {
AvailableSize: 3107979264000,
TotalSize: 3199556648960,
AllocatedSize: 91577384960,
AllocatedPercent: 3,
AllocatedPercent: 2,

ExpectedSlotCount: 16,
NumActiveSlots: 10,
Expand Down
4 changes: 2 additions & 2 deletions src/utils/disks/prepareDisks.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ export function prepareVDiskSizeFields({
const available = Number(AvailableSize);
const allocated = Number(AllocatedSize);
const total = allocated + available;
const allocatedPercent = Math.round((allocated * 100) / total);
const allocatedPercent = Math.floor((allocated * 100) / total);

return {
AvailableSize: available,
Expand All @@ -145,7 +145,7 @@ export function preparePDiskSizeFields({
const available = Number(AvailableSize);
const total = Number(TotalSize);
const allocated = total - available;
const allocatedPercent = Math.round((allocated * 100) / total);
const allocatedPercent = Math.floor((allocated * 100) / total);

return {
AvailableSize: available,
Expand Down
Loading