diff options
author | Valerij Fredriksen <freva@users.noreply.github.com> | 2022-08-11 16:31:47 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-08-11 16:31:47 +0200 |
commit | 046cae924701cf6446db73b12720194874daad01 (patch) | |
tree | 2f71bc196852527e933f72150ef3be7c236a6c65 /controller-server | |
parent | 482ba60da0512eba63ecb766915d333052cb351d (diff) | |
parent | 5f46b531be2a88e42e69e94af24330ad68fafa35 (diff) |
Merge pull request #23632 from vespa-engine/jonmv/speed-test
Add --speedTest to feed client CLI, and dryRun to /doc/v1
Diffstat (limited to 'controller-server')
-rw-r--r-- | controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java index b9432fdc375..78063a383dc 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java @@ -550,10 +550,9 @@ public class ApplicationController { controller.jobController().deploymentStatus(application.get()); for (Notification notification : controller.notificationsDb().listNotifications(NotificationSource.from(application.get().id()), true)) { - if ( ! notification.source().instance().map(declaredInstances::contains).orElse(true)) - controller.notificationsDb().removeNotifications(notification.source()); - if (notification.source().instance().isPresent() && - ! notification.source().zoneId().map(application.get().require(notification.source().instance().get()).deployments()::containsKey).orElse(false)) + if ( notification.source().instance().isPresent() + && ( ! declaredInstances.contains(notification.source().instance().get()) + || ! notification.source().zoneId().map(application.get().require(notification.source().instance().get()).deployments()::containsKey).orElse(false))) controller.notificationsDb().removeNotifications(notification.source()); } @@ -647,7 +646,7 @@ public class ApplicationController { .filter(zone -> deploymentSpec.instance(instance).isEmpty() || ! deploymentSpec.requireInstance(instance).deploysTo(zone.environment(), zone.region())) - .collect(toList()); + .toList(); if (deploymentsToRemove.isEmpty()) return application; |