clean up

# Conflicts:
#	x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/inference/assignment/TrainedModelAssignmentRebalancer.java
#	x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/inference/assignment/planning/AssignmentPlan.java
#	x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/inference/assignment/planning/ZoneAwareAssignmentPlanner.java

Author: valeriy42

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

@@ -132,10 +132,6 @@ private static AssignmentPlan mergePlans(
 
     /**
      *  Transfers assignments from the source AssignmentPlan to the destination AssignmentPlan.Builder.
-     *
-     * @param source
-     * @param dest
-     * @param originalNodeById
      */
     private static void copyAssignments(
         AssignmentPlan source,
@@ -147,13 +143,6 @@ private static void copyAssignments(
             for (Map.Entry<AssignmentPlan.Node, Integer> sourceAssignment : sourceNodeAssignments.entrySet()) {
                 AssignmentPlan.Node node = originalNodeById.get(sourceAssignment.getKey().id());
                 dest.assignModelToNode(deployment, node, sourceAssignment.getValue());
-                // if (deployment.currentAllocationsByNodeId().containsKey(node.id())) {
-                // // TODO (#101612) requiredMemory should be calculated by the AssignmentPlan.Builder
-                // // As the node has all its available memory we need to manually account memory of models with
-                // // current allocations.
-                // long requiredMemory = deployment.estimateMemoryUsageBytes(deployment.currentAllocationsByNodeId().get(node.id()));
-                // dest.accountMemory(deployment, node, requiredMemory);
-                // }
             }
         }
     }

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

@@ -461,21 +461,9 @@ public Builder assignModelToNode(Deployment deployment, Node node, int allocatio
         }
 
         private int getAssignedAllocations(Deployment deployment, Node node) {
-            // 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;
-        // }
-
-        // 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
             remainingNodeMemory.computeIfPresent(n, (k, v) -> v - requiredMemory);

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

@@ -212,15 +212,6 @@ private AssignmentPlan swapOriginalDeploymentsInPlan(
             for (Map.Entry<Node, Integer> assignment : nodeAssignments.entrySet()) {
                 Node originalNode = originalNodeById.get(assignment.getKey().id());
                 finalPlanBuilder.assignModelToNode(originalDeployment, originalNode, assignment.getValue());
-                // if (originalDeployment.currentAllocationsByNodeId().containsKey(originalNode.id())) {
-                // // TODO (#101612) requiredMemory should be calculated by the AssignmentPlan.Builder
-                // // As the node has all its available memory we need to manually account memory of models with
-                // // current allocations.
-                // long requiredMemory = originalDeployment.estimateMemoryUsageBytes(
-                // originalDeployment.currentAllocationsByNodeId().get(originalNode.id())
-                // );
-                // finalPlanBuilder.accountMemory(planDeployment, originalNode, requiredMemory);
-                // }
             }
         }
         return finalPlanBuilder.build();