aboutsummaryrefslogtreecommitdiffstats
path: root/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/os/RebuildingOsUpgrader.java
diff options
context:
space:
mode:
Diffstat (limited to 'node-repository/src/main/java/com/yahoo/vespa/hosted/provision/os/RebuildingOsUpgrader.java')
-rw-r--r--node-repository/src/main/java/com/yahoo/vespa/hosted/provision/os/RebuildingOsUpgrader.java7
1 files changed, 4 insertions, 3 deletions
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/os/RebuildingOsUpgrader.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/os/RebuildingOsUpgrader.java
index 108093d8379..31e6a4e6e26 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/os/RebuildingOsUpgrader.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/os/RebuildingOsUpgrader.java
@@ -9,6 +9,7 @@ import com.yahoo.vespa.hosted.provision.NodeRepository;
import com.yahoo.vespa.hosted.provision.node.Agent;
import com.yahoo.vespa.hosted.provision.node.ClusterId;
import com.yahoo.vespa.hosted.provision.node.filter.NodeListFilter;
+import com.yahoo.vespa.hosted.provision.provisioning.HostProvisioner;
import java.time.Instant;
import java.util.ArrayList;
@@ -35,8 +36,8 @@ public class RebuildingOsUpgrader extends OsUpgrader {
private final boolean softRebuild;
- public RebuildingOsUpgrader(NodeRepository nodeRepository, boolean softRebuild) {
- super(nodeRepository);
+ public RebuildingOsUpgrader(NodeRepository nodeRepository, Optional<HostProvisioner> hostProvisioner, boolean softRebuild) {
+ super(nodeRepository, hostProvisioner);
this.softRebuild = softRebuild;
}
@@ -71,7 +72,7 @@ public class RebuildingOsUpgrader extends OsUpgrader {
List<Node> hostsToRebuild = new ArrayList<>(rebuildLimit);
NodeList candidates = hosts.not().rebuilding(softRebuild)
.not().onOsVersion(target.version())
- .matching(node -> canUpgradeAt(now, node))
+ .matching(node -> canUpgradeTo(target.version(), now, node))
.byIncreasingOsVersion();
for (Node host : candidates) {
if (hostsToRebuild.size() == rebuildLimit) break;