diff options
| author | Jon Marius Venstad <venstad@gmail.com> | 2018-01-03 18:46:24 +0100 |
|---|---|---|
| committer | Jon Marius Venstad <venstad@gmail.com> | 2018-01-03 18:46:24 +0100 |
| commit | 576490b8aac91cb73ef4f7ed77536a77569b519d (patch) | |
| tree | 80e7fc84a1ba201de25b711457e8de5b2fc31977 /controller-server | |
| parent | dcf02a340bd2218d8a9105d6dda099ce92071165 (diff) | |
Fix names and simplify something
Diffstat (limited to 'controller-server')
3 files changed, 4 insertions, 6 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/ApplicationList.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/ApplicationList.java index d4baa7efcc4..07d51b2b9c7 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/ApplicationList.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/ApplicationList.java @@ -121,8 +121,8 @@ public class ApplicationList { return listOf(list.stream().filter(a -> !a.productionDeployments().isEmpty())); } - /** Returns the subset of applications which started failing after the given instant */ - public ApplicationList startedFailingOnVersionAfter(Version version) { + /** Returns the subset of applications which started failing on the given version */ + public ApplicationList startedFailingOn(Version version) { return listOf(list.stream().filter(application -> ! JobList.from(application).firstFailing().on(version).isEmpty())); } diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/DeploymentIssueReporter.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/DeploymentIssueReporter.java index 4c477cc7e5b..e30ccbe7950 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/DeploymentIssueReporter.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/DeploymentIssueReporter.java @@ -88,9 +88,7 @@ public class DeploymentIssueReporter extends Maintainer { List<ApplicationId> failingApplications = ApplicationList.from(applications) .failingUpgradeToVersionSince(systemVersion, controller().clock().instant()) - .asList().stream() - .map(Application::id) - .collect(Collectors.toList()); + .idList(); deploymentIssues.fileUnlessOpen(failingApplications, systemVersion); } diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/versions/VespaVersion.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/versions/VespaVersion.java index 04ee176c9a4..ea89a70543c 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/versions/VespaVersion.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/versions/VespaVersion.java @@ -145,7 +145,7 @@ public class VespaVersion implements Comparable<VespaVersion> { ApplicationList failingOnThis, ApplicationList productionOnThis, CuratorDb curator) { - ApplicationList failingNonCanaries = failingOnThis.without(UpgradePolicy.canary).startedFailingOnVersionAfter(version); + ApplicationList failingNonCanaries = failingOnThis.without(UpgradePolicy.canary).startedFailingOn(version); ApplicationList productionNonCanaries = productionOnThis.without(UpgradePolicy.canary); if (productionNonCanaries.size() + failingNonCanaries.size() == 0 || curator.readIgnoreConfidence()) return false; |