diff options
author | Jon Bratseth <bratseth@oath.com> | 2020-06-08 23:13:07 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-06-08 23:13:07 +0200 |
commit | 27081279b64608f7fc813288be6beb870ad1657c (patch) | |
tree | efdc542c50b207901514731dc636847bfcf95e2f | |
parent | 8ca1bf57e27d804b46cc68730fcececf91bcd29a (diff) | |
parent | 5be014159c66c0bb4b6a6d429eeccb5c487200f8 (diff) |
Merge pull request #13510 from vespa-engine/bratseth/deactivate-some-maintenance
Deactivate some maintenance
-rw-r--r-- | node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/PeriodicApplicationMaintainer.java | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/PeriodicApplicationMaintainer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/PeriodicApplicationMaintainer.java index d06d24872e1..06ecb1f4a01 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/PeriodicApplicationMaintainer.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/PeriodicApplicationMaintainer.java @@ -64,9 +64,16 @@ public class PeriodicApplicationMaintainer extends ApplicationMaintainer { return deploymentTimes.entrySet().stream() .sorted(Map.Entry.comparingByValue()) .map(Map.Entry::getKey) + .filter(id -> shouldMaintain(id)) .collect(Collectors.toCollection(LinkedHashSet::new)); } + private boolean shouldMaintain(ApplicationId id) { + if (id.tenant().value().equals("stream") && id.application().value().equals("stream-ranking")) return false; + if (id.tenant().value().equals("stream") && id.application().value().equals("stream-ranking-canary")) return false; + return true; + } + // TODO: Do not start deploying until some time has gone (ideally only until bootstrap of config server is finished) private boolean waitInitially() { return clock.instant().isBefore(start.plus(minTimeBetweenRedeployments)); |