diff options
author | Martin Polden <mpolden@mpolden.no> | 2023-09-04 10:54:22 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-09-04 10:54:22 +0200 |
commit | 3e4a2ecdd9ad0b3dab563fd8572644bb3cfae2e3 (patch) | |
tree | 6e63966ecf8bd5af833632db3d88f9b0d6aaf8f8 | |
parent | 5bd05c45c9fa25c16abc52314fa9f05ef1dd9b13 (diff) | |
parent | 105fc5ed0b386e27567849d69367e5fc49a901fe (diff) |
Merge pull request #28369 from vespa-engine/mpolden/remove-unused
Remove unused executor
-rw-r--r-- | node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/DiskReplacer.java | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/DiskReplacer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/DiskReplacer.java index 0c1d6291baa..ab310761140 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/DiskReplacer.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/DiskReplacer.java @@ -1,7 +1,6 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespa.hosted.provision.maintenance; -import com.yahoo.concurrent.DaemonThreadFactory; import com.yahoo.jdisc.Metric; import com.yahoo.vespa.hosted.provision.Node; import com.yahoo.vespa.hosted.provision.NodeList; @@ -14,8 +13,6 @@ import com.yahoo.yolean.Exceptions; import java.time.Duration; import java.util.List; import java.util.Optional; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; import java.util.logging.Level; import java.util.logging.Logger; @@ -27,10 +24,8 @@ import java.util.logging.Logger; public class DiskReplacer extends NodeRepositoryMaintainer { private static final Logger log = Logger.getLogger(DiskReplacer.class.getName()); - private static final int maxBatchSize = 100; private final HostProvisioner hostProvisioner; - private final ExecutorService executor = Executors.newCachedThreadPool(new DaemonThreadFactory("disk-replacer")); DiskReplacer(NodeRepository nodeRepository, Duration interval, Metric metric, HostProvisioner hostProvisioner) { super(nodeRepository, interval, metric); @@ -39,10 +34,13 @@ public class DiskReplacer extends NodeRepositoryMaintainer { @Override protected double maintain() { - NodeList nodes = nodeRepository().nodes().list().rebuilding(true); + NodeList candidates = nodeRepository().nodes().list().rebuilding(true); + if (candidates.isEmpty()) { + return 0; + } int failures = 0; List<Node> rebuilding; - try (var locked = nodeRepository().nodes().lockAndGetAll(nodes.asList(), Optional.of(Duration.ofSeconds(10)))) { + try (var locked = nodeRepository().nodes().lockAndGetAll(candidates.asList(), Optional.of(Duration.ofSeconds(10)))) { rebuilding = locked.nodes().stream().map(NodeMutex::node).toList(); RebuildResult result = hostProvisioner.replaceRootDisk(rebuilding); @@ -56,13 +54,7 @@ public class DiskReplacer extends NodeRepositoryMaintainer { interval() + ": " + Exceptions.toMessageString(entry.getValue())); } } - return this.asSuccessFactorDeviation(rebuilding.size(), failures); - } - - @Override - public void shutdown() { - super.shutdown(); - executor.shutdown(); + return asSuccessFactorDeviation(rebuilding.size(), failures); } } |