fix(Nodes): better memory bars

ydb-platform · Aug 2, 2024 · 35362a7 · 35362a7
1 parent c862032
commit 35362a7
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 64 deletions.
diff --git a/src/components/ProgressViewer/ProgressViewer.tsx b/src/components/ProgressViewer/ProgressViewer.tsx
@@ -87,7 +87,6 @@ export function ProgressViewer({
             status = inverseColorize ? 'good' : 'danger';
         }
         if (!isNumeric(capacity)) {
-            status = 'good';
             fillWidth = 100;
         }
     }

diff --git a/src/containers/Nodes/getNodesColumns.tsx b/src/containers/Nodes/getNodesColumns.tsx
@@ -12,7 +12,7 @@ import type {NodesPreparedEntity} from '../../store/reducers/nodes/types';
 import {getLoadSeverityForNode} from '../../store/reducers/nodes/utils';
 import type {GetNodeRefFunc} from '../../types/additionalProps';
 import {EMPTY_DATA_PLACEHOLDER} from '../../utils/constants';
-import {formatStorageValues} from '../../utils/dataFormatters/dataFormatters';
+import {formatStorageValuesToGb} from '../../utils/dataFormatters/dataFormatters';
 
 export const NODES_COLUMNS_WIDTH_LS_KEY = 'nodesTableColumnsWidth';
 
@@ -111,7 +111,7 @@ const memoryColumn: NodesColumn = {
         <ProgressViewer
             value={row.MemoryUsed}
             capacity={row.MemoryLimit}
-            formatValues={formatStorageValues}
+            formatValues={formatStorageValuesToGb}
             colorizeProgress={true}
         />
     ),
@@ -198,7 +198,7 @@ const topNodesMemoryColumn: NodesColumn = {
         <ProgressViewer
             value={row.MemoryUsed}
             capacity={row.MemoryLimit}
-            formatValues={formatStorageValues}
+            formatValues={formatStorageValuesToGb}
             colorizeProgress={true}
         />
     ),
@@ -215,7 +215,7 @@ const sharedCacheUsageColumn: NodesColumn = {
         <ProgressViewer
             value={row.SharedCacheUsed}
             capacity={row.SharedCacheLimit}
-            formatValues={formatStorageValues}
+            formatValues={formatStorageValuesToGb}
             colorizeProgress={true}
         />
     ),

diff --git a/src/containers/Tenants/Tenants.tsx b/src/containers/Tenants/Tenants.tsx
@@ -31,9 +31,9 @@ import type {AdditionalTenantsProps} from '../../types/additionalProps';
 import {cn} from '../../utils/cn';
 import {DEFAULT_TABLE_SETTINGS} from '../../utils/constants';
 import {
-    formatBytesToGigabyte,
     formatCPU,
     formatNumber,
+    formatStorageValuesToGb,
 } from '../../utils/dataFormatters/dataFormatters';
 import {useAutoRefreshInterval, useTypedDispatch, useTypedSelector} from '../../utils/hooks';
 import {getTenantPath} from '../Tenant/TenantPages';
@@ -183,15 +183,15 @@ export const Tenants = ({additionalTenantsProps}: TenantsProps) => {
                 name: 'memory',
                 header: 'Memory',
                 width: 120,
-                render: ({row}) => (row.memory ? formatBytesToGigabyte(row.memory) : '—'),
+                render: ({row}) => (row.memory ? formatStorageValuesToGb(row.memory) : '—'),
                 align: DataTable.RIGHT,
                 defaultOrder: DataTable.DESCENDING,
             },
             {
                 name: 'storage',
                 header: 'Storage',
                 width: 120,
-                render: ({row}) => (row.storage ? formatBytesToGigabyte(row.storage) : '—'),
+                render: ({row}) => (row.storage ? formatStorageValuesToGb(row.storage) : '—'),
                 align: DataTable.RIGHT,
                 defaultOrder: DataTable.DESCENDING,
             },

diff --git a/src/store/reducers/tenants/utils.ts b/src/store/reducers/tenants/utils.ts
@@ -70,7 +70,6 @@ export const calculateTenantMetrics = (tenant: TTenant = {}) => {
         DatabaseQuotas = {},
         StorageUsage,
         QuotaUsage,
-        MemoryStats,
     } = tenant;
 
     const cpu = Number(CoresUsed) * 1_000_000 || 0;
@@ -151,28 +150,6 @@ export const calculateTenantMetrics = (tenant: TTenant = {}) => {
         },
     ];
 
-    if (MemoryStats) {
-        if (
-            isNumeric(MemoryStats.ExternalConsumption) &&
-            Number(MemoryStats.ExternalConsumption) > 0
-        ) {
-            memoryStats.push({
-                name: 'External',
-                used: Number(MemoryStats.ExternalConsumption),
-                limit: MemoryStats.MemTotal,
-                usage: calculateUsage(memory, memoryLimit),
-            });
-        }
-        if (isNumeric(MemoryStats.ConsumersConsumption)) {
-            memoryStats.push({
-                name: 'Caches',
-                used: Number(MemoryStats.ConsumersConsumption),
-                limit: MemoryStats.ConsumersLimit,
-                usage: calculateUsage(memory, memoryLimit),
-            });
-        }
-    }
-
     return {
         memory,
         blobStorage,

diff --git a/src/types/api/nodes.ts b/src/types/api/nodes.ts
@@ -102,31 +102,6 @@ export interface TLegacyNodeLocation {
     Body?: number;
 }
 
-export interface TMemoryStats {
-    AnonRss?: number;
-    CGroupLimit?: number;
-    MemTotal?: number;
-    MemAvailable?: number;
-
-    AllocatedMemory?: number;
-    AllocatorCachesMemory?: number;
-
-    HardLimit?: number;
-    SoftLimit?: number;
-    TargetUtilization?: number;
-
-    ConsumersConsumption?: number;
-    ConsumersLimit?: number;
-    OtherConsumption?: number;
-    ExternalConsumption?: number;
-
-    SharedCacheConsumption?: number;
-    SharedCacheLimit?: number;
-
-    MemTableConsumption?: number;
-    MemTableLimit?: number;
-}
-
 interface TNodeLocation {
     // compatibility section -- will be removed in future versions
     DataCenterNum?: number; // deprecated

diff --git a/src/types/api/tenant.ts b/src/types/api/tenant.ts
@@ -1,5 +1,5 @@
 import type {EFlag} from './enums';
-import type {TMemoryStats, TPoolStats, TSystemStateInfo} from './nodes';
+import type {TPoolStats, TSystemStateInfo} from './nodes';
 import type {TTabletStateInfo} from './tablet';
 
 /**
@@ -63,8 +63,6 @@ export interface TTenant {
 
     StorageUsage?: TStorageUsage[];
     QuotaUsage?: TStorageUsage[];
-
-    MemoryStats?: TMemoryStats;
 }
 
 export interface THiveDomainStatsStateCount {

diff --git a/src/utils/dataFormatters/dataFormatters.ts b/src/utils/dataFormatters/dataFormatters.ts
@@ -6,7 +6,7 @@ import {
     getSizeWithSignificantDigits,
 } from '../bytesParsers/formatBytes';
 import type {BytesSizes} from '../bytesParsers/formatBytes';
-import {DAY_IN_SECONDS, GIGABYTE, HOUR_IN_SECONDS} from '../constants';
+import {DAY_IN_SECONDS, HOUR_IN_SECONDS} from '../constants';
 import {configuredNumeral} from '../numeral';
 import {isNumeric} from '../utils';
 
@@ -33,10 +33,6 @@ export const formatBps = (bytes?: string | number) => {
     return formattedBytes + '/s';
 };
 
-export const formatBytesToGigabyte = (bytes: number | string) => {
-    return `${Math.floor(Number(bytes) / GIGABYTE)} GB`;
-};
-
 export const stringifyVdiskId = (id?: TVDiskID | TVSlotId) => {
     return id ? Object.values(id).join('-') : '';
 };