use only assigned allocations

Author: valeriy42

x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/inference/assignment/planning/AssignmentPlan.java

@@ -450,7 +450,7 @@ public Builder assignModelToNode(Deployment deployment, Node node, int allocatio
                 );
             }
 
-            assignments.get(deployment).compute(node, (n, remAllocations) -> remAllocations + allocations);
+            assignments.get(deployment).compute(node, (n, assignedAllocations) -> assignedAllocations + allocations);
             accountMemory(deployment, node, requiredMemory);
 
             if (deployment.priority == Priority.NORMAL) {
@@ -461,20 +461,20 @@ public Builder assignModelToNode(Deployment deployment, Node node, int allocatio
         }
 
         private int getAssignedAllocations(Deployment deployment, Node node) {
-            int currentAllocations = getCurrentAllocations(deployment, node);
-            int assignmentAllocations = assignments.get(deployment).get(node);
-            return currentAllocations + assignmentAllocations;
+//            int currentAllocations = getCurrentAllocations(deployment, node);
+            return assignments.get(deployment).get(node);
+//            return currentAllocations + assignmentAllocations;
         }
 
-        private static int getCurrentAllocations(Deployment m, Node n) {
-            return m.currentAllocationsByNodeId.containsKey(n.id()) ? m.currentAllocationsByNodeId.get(n.id()) : 0;
-        }
+//        private static int getCurrentAllocations(Deployment m, Node n) {
+//            return m.currentAllocationsByNodeId.containsKey(n.id()) ? m.currentAllocationsByNodeId.get(n.id()) : 0;
+//        }
 
-        public void accountMemory(Deployment m, Node n) {
-            // TODO (#101612) remove or refactor unused method
-            long requiredMemory = getDeploymentMemoryRequirement(m, n, getCurrentAllocations(m, n));
-            accountMemory(m, n, requiredMemory);
-        }
+//        public void accountMemory(Deployment m, Node n) {
+//            // TODO (#101612) remove or refactor unused method
+//            long requiredMemory = getDeploymentMemoryRequirement(m, n, getCurrentAllocations(m, n));
+//            accountMemory(m, n, requiredMemory);
+//        }
 
         public void accountMemory(Deployment m, Node n, long requiredMemory) {
             // TODO (#101612) computation of required memory should be done internally