fix applying memory overhead

darnautov · Oct 26, 2021 · 0cf38fb · 0cf38fb
1 parent 83ffa38
commit 0cf38fb
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/x-pack/plugins/ml/server/models/data_frame_analytics/model_provider.test.ts b/x-pack/plugins/ml/server/models/data_frame_analytics/model_provider.test.ts
@@ -247,7 +247,7 @@ describe('Model service', () => {
                   model_size: 100139008,
                 },
               ],
-              total: 793309535,
+              total: 761852255,
             },
           },
           roles: ['data', 'ingest', 'master', 'ml', 'transform'],
@@ -367,7 +367,7 @@ describe('Model service', () => {
                   model_size: 100139008,
                 },
               ],
-              total: 793309535,
+              total: 761852255,
             },
           },
           roles: ['data', 'master', 'ml', 'transform'],
@@ -490,7 +490,7 @@ describe('Model service', () => {
                   model_size: 100139008,
                 },
               ],
-              total: 793309535,
+              total: 761852255,
             },
           },
           name: 'node1',

diff --git a/x-pack/plugins/ml/server/models/data_frame_analytics/models_provider.ts b/x-pack/plugins/ml/server/models/data_frame_analytics/models_provider.ts
@@ -114,6 +114,8 @@ export function modelsProvider(
             };
           });
 
+          const trainedModelsTotalMemory = sumBy(modelsMemoryUsage, 'model_size');
+
           const memoryRes = {
             adTotalMemory: sumBy(
               adMemoryReport.filter((ad) => ad.node_id === nodeId),
@@ -123,7 +125,6 @@ export function modelsProvider(
               dfaMemoryReport.filter((dfa) => dfa.node_id === nodeId),
               'model_size'
             ),
-            trainedModelsTotalMemory: sumBy(modelsMemoryUsage, 'model_size'),
           };
 
           for (const key of Object.keys(memoryRes)) {
@@ -155,7 +156,7 @@ export function modelsProvider(
                 total: memoryRes.dfaTotalMemory,
               },
               trained_models: {
-                total: memoryRes.trainedModelsTotalMemory,
+                total: trainedModelsTotalMemory,
                 by_model: modelsMemoryUsage,
               },
             },