diff options
author | Valerij Fredriksen <freva@users.noreply.github.com> | 2023-09-07 14:05:40 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-09-07 14:05:40 +0200 |
commit | 0ae2ba10acbd196f77459f0da2813d2b44590e8f (patch) | |
tree | e01422a94174a5ac85d3427b72345b10e15146a9 /controller-server | |
parent | 6d2c5adecc0ab35da0f516861c10b97285905a93 (diff) | |
parent | 71cd3d051a8b4a32426d942349a82b4637f2c5fc (diff) |
Merge pull request #28271 from vespa-engine/revert-28268-hakonhall/ignore-gcp-enclave-when-determining-system-version
Revert "Ignore GCP enclave when determining system version [MERGEOK]"
Diffstat (limited to 'controller-server')
3 files changed, 10 insertions, 8 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/SystemUpgrader.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/SystemUpgrader.java index 40b51e692f3..622653e6f84 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/SystemUpgrader.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/SystemUpgrader.java @@ -3,6 +3,7 @@ package com.yahoo.vespa.hosted.controller.maintenance; import com.yahoo.component.Version; import com.yahoo.config.provision.CloudName; +import com.yahoo.config.provision.SystemName; import com.yahoo.config.provision.zone.NodeSlice; import com.yahoo.config.provision.zone.ZoneApi; import com.yahoo.text.Text; @@ -51,7 +52,11 @@ public class SystemUpgrader extends InfrastructureUpgrader<VespaVersionTarget> { @Override protected boolean expectUpgradeOf(Node node, SystemApplication application, ZoneApi zone) { - return eligibleForUpgrade(node, zone); + // Temporary hack until GCP enclave works again + if (zone.getCloudName().equals(CloudName.GCP) && node.hostname().value().startsWith("e")) + return false; + + return eligibleForUpgrade(node); } @Override @@ -91,11 +96,7 @@ public class SystemUpgrader extends InfrastructureUpgrader<VespaVersionTarget> { } /** Returns whether node in application should be upgraded by this */ - public static boolean eligibleForUpgrade(Node node, ZoneApi zone) { - // Temporary hack until GCP enclave works again - if (zone.getCloudName().equals(CloudName.GCP) && node.hostname().value().startsWith("e")) - return false; - + public static boolean eligibleForUpgrade(Node node) { return upgradableNodeStates.contains(node.state()); } diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/versions/VersionStatus.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/versions/VersionStatus.java index a93c0dfda76..9fb87735b42 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/versions/VersionStatus.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/versions/VersionStatus.java @@ -185,7 +185,7 @@ public record VersionStatus(List<VespaVersion> versions, int currentMajor) { for (var application : SystemApplication.notController()) { var nodes = controller.serviceRegistry().configServer().nodeRepository() .list(zone.getId(), NodeFilter.all().applications(application.id())).stream() - .filter(node -> SystemUpgrader.eligibleForUpgrade(node, zone)) + .filter(SystemUpgrader::eligibleForUpgrade) .toList(); if (nodes.isEmpty()) continue; boolean configConverged = application.configConvergedIn(zone.getId(), controller, Optional.empty()); diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/SystemUpgraderTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/SystemUpgraderTest.java index a3595ca587c..d3d66715202 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/SystemUpgraderTest.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/SystemUpgraderTest.java @@ -16,6 +16,7 @@ import org.junit.jupiter.api.Test; import java.time.Duration; import java.util.List; import java.util.function.Function; +import java.util.stream.Collectors; import java.util.stream.Stream; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -462,7 +463,7 @@ public class SystemUpgraderTest { private List<Node> listNodes(ZoneApi zone, SystemApplication application) { return nodeRepository().list(zone.getId(), NodeFilter.all().applications(application.id())).stream() - .filter(node -> SystemUpgrader.eligibleForUpgrade(node, zone)) + .filter(SystemUpgrader::eligibleForUpgrade) .toList(); } |