diff options
| author | Jon Marius Venstad <jonmv@users.noreply.github.com> | 2018-09-24 10:26:14 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-24 10:26:14 +0200 |
| commit | 53c7f12a5205b4828964370f4895b5bd1f82bbdb (patch) | |
| tree | 83286215b65e839059e94daec8acdeb27f5d4c2d /controller-server | |
| parent | c64c7a0bb849ef6ac4aff89aea720071c3e01b39 (diff) | |
| parent | fe0d25dac741bedb70f0fda173243b31787d851e (diff) | |
Merge pull request #7059 from vespa-engine/jvenstad/no-issues-for-integration-test-apps
Ignore apps without project Ids
Diffstat (limited to 'controller-server')
2 files changed, 12 insertions, 3 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ApplicationOwnershipConfirmer.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ApplicationOwnershipConfirmer.java index 93578e97cc4..349f4390fd1 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ApplicationOwnershipConfirmer.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ApplicationOwnershipConfirmer.java @@ -50,6 +50,7 @@ public class ApplicationOwnershipConfirmer extends Maintainer { private void confirmApplicationOwnerships() { ApplicationList.from(controller().applications().asList()) .notPullRequest() + .withProjectId() .hasProductionDeployment() .asList() .stream() 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 a1351ab570c..70bc4133772 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 @@ -48,15 +48,23 @@ public class DeploymentIssueReporter extends Maintainer { @Override protected void maintain() { try { - maintainDeploymentIssues(controller().applications().asList()); - maintainPlatformIssue(controller().applications().asList()); - escalateInactiveDeploymentIssues(controller().applications().asList()); + maintainDeploymentIssues(applications()); + maintainPlatformIssue(applications()); + escalateInactiveDeploymentIssues(applications()); } catch (UncheckedIOException e) { log.log(Level.INFO, () -> "IO exception handling issues, will retry in " + maintenanceInterval() + ": '" + Exceptions.toMessageString(e)); } } + /** Returns the applications to maintain issue status for. */ + private List<Application> applications() { + return ApplicationList.from(controller().applications().asList()) + .withProjectId() + .notPullRequest() + .asList(); + } + /** * File issues for applications which have failed deployment for longer than maxFailureAge * and store the issue id for the filed issues. Also, clear the issueIds of applications |