diff options
author | Jon Marius Venstad <jonmv@users.noreply.github.com> | 2023-06-19 12:04:37 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-06-19 12:04:37 +0200 |
commit | 47bf88ed10ae83bc3b5e805776e2d93b816a35ac (patch) | |
tree | 9b7348cda75d0c2bb6dcc1c024763899872eb99d | |
parent | 9e03c698d2c3a1d8916e896fca9882fb1ebf49e9 (diff) | |
parent | af07db5d189dbc6cc6453e5c30e91730a1dad679 (diff) |
Merge pull request #27476 from vespa-engine/jonmv/ignore-pinned-apps-for-confidence
Jonmv/ignore pinned apps for confidence
-rw-r--r-- | controller-server/src/main/java/com/yahoo/vespa/hosted/controller/versions/VespaVersion.java | 10 |
1 files changed, 5 insertions, 5 deletions
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 45c00848407..b03098bf18f 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 @@ -49,13 +49,13 @@ public record VespaVersion(Version version, if (nonCanaryApplicationsBroken(statistics.version(), failingOnThis, productionOnThis)) return Confidence.broken; - // 'low' unless all canary applications are upgraded - if (productionOnThis.with(UpgradePolicy.canary).size() < all.withProductionDeployment().with(UpgradePolicy.canary).size()) + // 'low' unless all unpinned canary applications are upgraded + if (productionOnThis.with(UpgradePolicy.canary).unpinned().size() < all.withProductionDeployment().with(UpgradePolicy.canary).unpinned().size()) return Confidence.low; - // 'high' if 90% of all default upgrade applications upgraded - if (productionOnThis.with(UpgradePolicy.defaultPolicy).groupingBy(TenantAndApplicationId::from).size() >= - all.withProductionDeployment().with(UpgradePolicy.defaultPolicy).groupingBy(TenantAndApplicationId::from).size() * 0.9) + // 'high' if 90% of all unpinned default upgrade applications upgraded + if (productionOnThis.with(UpgradePolicy.defaultPolicy).unpinned().groupingBy(TenantAndApplicationId::from).size() >= + all.withProductionDeployment().with(UpgradePolicy.defaultPolicy).unpinned().groupingBy(TenantAndApplicationId::from).size() * 0.9) return Confidence.high; return Confidence.normal; |