diff options
author | Jon Bratseth <bratseth@gmail.com> | 2020-06-17 17:21:01 +0200 |
---|---|---|
committer | Jon Bratseth <bratseth@gmail.com> | 2020-06-17 17:21:01 +0200 |
commit | 28cf15bac333eadb4f3d133c9102c32bd0d72770 (patch) | |
tree | c53aded649ddecc6ab1fdcdcad2fdbccf1c221b1 /node-repository | |
parent | d589e157fce08e509011ba3ede109c7d71b327d6 (diff) |
Less max iterations as each do more exporation
Diffstat (limited to 'node-repository')
2 files changed, 4 insertions, 7 deletions
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/SpareCapacityMaintainer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/SpareCapacityMaintainer.java index 7fb6f929cb7..e436d3b926a 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/SpareCapacityMaintainer.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/SpareCapacityMaintainer.java @@ -47,7 +47,7 @@ public class SpareCapacityMaintainer extends NodeRepositoryMaintainer { Metric metric, Duration interval) { this(deployer, nodeRepository, metric, interval, - 1_000_000 // Should take a couple of seconds + 10_000 // Should take less than a few minutes ); } @@ -164,8 +164,6 @@ public class SpareCapacityMaintainer extends NodeRepositoryMaintainer { if (iterations++ > maxIterations) return null; - if ((iterations % 1000) == 0) - System.out.println(" Iteration " + iterations); if ( ! host.resources().satisfies(node.resources())) return null; NodeResources freeCapacity = freeCapacityWith(movesMade, host); if (freeCapacity.satisfies(node.resources())) return List.of(); @@ -181,8 +179,7 @@ public class SpareCapacityMaintainer extends NodeRepositoryMaintainer { shortest = moves; } if (shortest == null) return null; - List<Move> total = append(movesMade, shortest); - return total; + return append(movesMade, shortest); } private List<Move> move(List<Node> nodes, Node host, List<Node> hosts, List<Move> movesConsidered, List<Move> movesMade) { 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 8c945ad4aaa..fb84dc0a32a 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 @@ -233,7 +233,7 @@ public class SpareCapacityMaintainerTest { private int nodeIndex = 0; private SpareCapacityMaintainerTester() { - this(1000_000); + this(1000); } private SpareCapacityMaintainerTester(int maxIterations) { @@ -246,7 +246,7 @@ public class SpareCapacityMaintainerTest { new MockNameResolver().mockAnyLookup(), DockerImage.fromString("docker-registry.domain.tld:8080/dist/vespa"), true, false); deployer = new MockDeployer(nodeRepository); - maintainer = new SpareCapacityMaintainer(deployer, nodeRepository, metric, Duration.ofMinutes(1), maxIterations); + maintainer = new SpareCapacityMaintainer(deployer, nodeRepository, metric, Duration.ofDays(1), maxIterations); } private void addHosts(int count, NodeResources resources) { |