summaryrefslogtreecommitdiffstats
path: root/controller-server
diff options
context:
space:
mode:
authorMartin Polden <mpolden@mpolden.no>2020-06-04 14:33:57 +0200
committerGitHub <noreply@github.com>2020-06-04 14:33:57 +0200
commit7cbc790d3d4aefe89e43cf5a39ec2916d8432eb1 (patch)
treeddd019960872ef9ea11aea67f2d9624b2b5c7eba /controller-server
parent9365dbcc4927f6f6f2094c8d78691bbae1fa29c6 (diff)
parentf4cef55781dae802c7004b43882bb235edbad80a (diff)
Merge pull request #13484 from vespa-engine/jvenstad/aborted-jobs-shouldn-not-affect-confidence
Aborted jobs are by purpose, and should not affect confidence
Diffstat (limited to 'controller-server')
-rw-r--r--controller-server/src/main/java/com/yahoo/vespa/hosted/controller/versions/DeploymentStatistics.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/versions/DeploymentStatistics.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/versions/DeploymentStatistics.java
index b91ed3734f1..99cf7542d53 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/versions/DeploymentStatistics.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/versions/DeploymentStatistics.java
@@ -88,9 +88,9 @@ public class DeploymentStatistics {
// Add all unsuccessful runs for failing jobs as any run may have resulted in an incomplete deployment
// where a subset of nodes have upgraded.
- // TODO jonmv: canary-pipeline.custom on 7.188.11, but not really, in staging ...
failing.not().failingApplicationChange()
.not().withStatus(RunStatus.outOfCapacity)
+ .not().withStatus(RunStatus.aborted)
.mapToList(JobStatus::runs)
.forEach(runs -> runs.descendingMap().values().stream()
.dropWhile(run -> ! run.hasEnded())
@@ -103,6 +103,7 @@ public class DeploymentStatistics {
failing.failingApplicationChange()
.concat(failing.withStatus(RunStatus.outOfCapacity))
+ .concat(failing.withStatus(RunStatus.aborted))
.lastCompleted().asList()
.forEach(run -> {
otherFailing.putIfAbsent(run.versions().targetPlatform(), new ArrayList<>());