[CI] Auto commit changes from spotless

Author: elasticsearchmachine

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

@@ -147,13 +147,13 @@ 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);
-//                }
+                // 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,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 currentAllocations = getCurrentAllocations(deployment, node);
             return assignments.get(deployment).get(node);
-//            return currentAllocations + assignmentAllocations;
+            // 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

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

@@ -212,15 +212,15 @@ 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);
-//                }
+                // 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();

x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/inference/assignment/planning/AssignmentPlanTests.java

@@ -217,8 +217,8 @@ public void testAssignModelToNode_GivenNewPlanDoesNotSatisfyCurrentAssignment()
             builder.assignModelToNode(m, n, 1);
 
             assertThat(builder.getRemainingCores(n), equalTo(2));
-            // base memory:  240+2*25 = 290MB
-            //since perDeployment memory is specified, we compute the new memory format usage:
+            // base memory: 240+2*25 = 290MB
+            // since perDeployment memory is specified, we compute the new memory format usage:
             // 250 (perDeployment) + 1*25 (perAllocation) + 25 (modelDefinition) = 300MB
             // Then we take the maximum of 290 and 300, which is 300MB
             assertThat(builder.getRemainingMemory(n), equalTo(ByteSizeValue.ofMb(0).getBytes()));
@@ -383,7 +383,7 @@ public void testCanAssign_GivenPreviouslyAssignedModelDoesNotFit() {
             // old memory format
             Deployment m = new Deployment("m_1", "m_1", ByteSizeValue.ofMb(31).getBytes(), 1, 1, Map.of("n_1", 1), 0, null, 0, 0);
             AssignmentPlan.Builder builder = AssignmentPlan.builder(List.of(n), List.of(m));
-            //240 + 2*31 = 302MB, this doesn't fit in 300MB. We don't care that the deployment is currently allocated since
+            // 240 + 2*31 = 302MB, this doesn't fit in 300MB. We don't care that the deployment is currently allocated since
             // only previous assignments should be considered
             assertThat(builder.canAssign(m, n, 1), is(false));
         }