diff options
| author | Jon Marius Venstad <jvenstad@yahoo-inc.com> | 2017-12-07 14:19:43 +0100 |
|---|---|---|
| committer | Jon Marius Venstad <jvenstad@yahoo-inc.com> | 2017-12-07 14:19:43 +0100 |
| commit | 5f333355c6d8e486f7dd3f1fe3c784f02fa28455 (patch) | |
| tree | 7886bd7c9fdf808733ade2f3dbb5f5f5fce6dc8e /controller-server | |
| parent | 56deb93f655849712b4cc17fc69df6331e0253a3 (diff) | |
Ignore ocnfigserver versios in AWS
Diffstat (limited to 'controller-server')
| -rw-r--r-- | controller-server/src/main/java/com/yahoo/vespa/hosted/controller/versions/VersionStatus.java | 8 |
1 files changed, 5 insertions, 3 deletions
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 d152cf80472..0e07f7b7589 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 @@ -5,6 +5,7 @@ import com.google.common.collect.ImmutableList; import com.yahoo.collections.ListMap; import com.yahoo.component.Version; import com.yahoo.component.Vtag; +import com.yahoo.config.provision.RegionName; import com.yahoo.vespa.hosted.controller.Application; import com.yahoo.vespa.hosted.controller.Controller; import com.yahoo.vespa.hosted.controller.api.integration.github.GitSha; @@ -119,15 +120,16 @@ public class VersionStatus { private static ListMap<Version, String> findConfigServerVersions(Controller controller) { List<URI> configServers = controller.zoneRegistry().zones().stream() - .flatMap(zone -> controller.getConfigServerUris(zone.environment(), zone.region()).stream()) - .collect(Collectors.toList()); + .filter(zone -> ! zone.region().equals(RegionName.from("us-east-2a"))) + .flatMap(zone -> controller.getConfigServerUris(zone.environment(), zone.region()).stream()) + .collect(Collectors.toList()); ListMap<Version, String> versions = new ListMap<>(); for (URI configServer : configServers) versions.put(controller.applications().configserverClient().version(configServer), configServer.getHost()); return versions; } - + private static Collection<DeploymentStatistics> computeDeploymentStatistics(Set<Version> infrastructureVersions, List<Application> applications, Instant jobTimeoutLimit) { |