diff options
| author | Martin Polden <mpolden@mpolden.no> | 2021-08-23 10:38:04 +0200 |
|---|---|---|
| committer | Martin Polden <mpolden@mpolden.no> | 2021-08-23 10:38:04 +0200 |
| commit | 938cd932719567004f0b66ca24cd0793c33b50d8 (patch) | |
| tree | e4e2e7f66147bdbd1fbfad921cc5b49f6af299df /controller-server | |
| parent | db3f0094fa849ee87b31af2aecb7c49b04da769f (diff) | |
Make required parameter non-optional
Diffstat (limited to 'controller-server')
2 files changed, 3 insertions, 3 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/OsUpgrader.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/OsUpgrader.java index e3bf2d401d3..c561a44857b 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/OsUpgrader.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/OsUpgrader.java @@ -50,7 +50,7 @@ public class OsUpgrader extends InfrastructureUpgrader<OsVersionTarget> { " with time budget " + zoneUpgradeBudget)); controller().serviceRegistry().configServer().nodeRepository().upgradeOs(zone.getVirtualId(), application.nodeType(), target.osVersion().version(), - Optional.of(zoneUpgradeBudget)); + zoneUpgradeBudget); } @Override diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/NodeRepositoryMock.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/NodeRepositoryMock.java index 543d89a2240..33e86157857 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/NodeRepositoryMock.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/NodeRepositoryMock.java @@ -141,8 +141,8 @@ public class NodeRepositoryMock implements NodeRepository { } @Override - public void upgradeOs(ZoneId zone, NodeType type, Version version, Optional<Duration> upgradeBudget) { - upgradeBudget.ifPresent(d -> this.osUpgradeBudgets.put(Objects.hash(zone, type, version), d)); + public void upgradeOs(ZoneId zone, NodeType type, Version version, Duration upgradeBudget) { + this.osUpgradeBudgets.put(Objects.hash(zone, type, version), upgradeBudget); this.targetVersions.compute(zone, (ignored, targetVersions) -> { if (targetVersions == null) { targetVersions = TargetVersions.EMPTY; |