More tests

2 files changed, 20 insertions, 7 deletions

diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/CapacityChecker.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/CapacityChecker.java
index 4d21a92d10c..f583728f9b8 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/CapacityChecker.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/CapacityChecker.java
@@ -97,7 +97,6 @@ public class CapacityChecker {
 
         List<Node> parentRemovalPriorityList = heuristic.entrySet().stream()
                                                         .sorted(this::hostMitigationOrder)
-//                                                        .sorted(Comparator.comparingInt(Map.Entry::getValue))
                                                         .map(Map.Entry::getKey)
                                                         .collect(Collectors.toList());
 
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/SpareCapacityMaintainerTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/SpareCapacityMaintainerTest.java
index 8ee8565410e..ae8d363934a 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/SpareCapacityMaintainerTest.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/SpareCapacityMaintainerTest.java
@@ -136,7 +136,26 @@ public class SpareCapacityMaintainerTest {
         // By moving the 4 small nodes from host 2 we free up sufficient space on the third host to act as a spare for
         // application 0
         var tester = new SpareCapacityMaintainerTester();
+        setupMultipleHosts(tester, 5);
 
+        tester.maintainer.maintain();
+        assertEquals(1, tester.deployer.redeployments);
+        assertEquals(1, tester.nodeRepository.list().retired().size());
+        assertEquals(1, tester.metric.values.get("spareHostCapacity"));
+    }
+
+    @Test
+    public void testMultipleNodesMustMoveFromOneHostButInsufficientCapacity() {
+        var tester = new SpareCapacityMaintainerTester();
+        setupMultipleHosts(tester, 4);
+
+        tester.maintainer.maintain();
+        assertEquals(0, tester.deployer.redeployments);
+        assertEquals(0, tester.nodeRepository.list().retired().size());
+        assertEquals(0, tester.metric.values.get("spareHostCapacity"));
+    }
+
+    private void setupMultipleHosts(SpareCapacityMaintainerTester tester, int smallNodeCount) {
         tester.addHosts(2, new NodeResources(10, 100, 1000, 1));
         tester.addNodes(0, 2, new NodeResources(10, 100, 1000, 1.0), 0);
 
@@ -149,12 +168,7 @@ public class SpareCapacityMaintainerTest {
         tester.addNodes(6, 1, new NodeResources(2, 20, 200, 2.0), 2);
         tester.addNodes(7, 1, new NodeResources(2, 20, 200, 2.0), 2);
 
-        tester.addHosts(5, new NodeResources(2, 20, 200, 2.0));
-
-        tester.maintainer.maintain();
-        assertEquals(1, tester.deployer.redeployments);
-        assertEquals(1, tester.nodeRepository.list().retired().size());
-        assertEquals(1, tester.metric.values.get("spareHostCapacity"));
+        tester.addHosts(smallNodeCount, new NodeResources(2, 20, 200, 2.0));
     }
 
     @Test