diff options
author | Valerij Fredriksen <freva@users.noreply.github.com> | 2023-01-21 10:37:15 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-01-21 10:37:15 +0100 |
commit | 00d86602a88c66486c8f4c68a1c8bdff096c7273 (patch) | |
tree | 56b685cacc98ed6d0662e1fc2423fe10892b9dfa | |
parent | cdc7f11db4af83cf674c5d980523ede99b8d3b0e (diff) | |
parent | 9aaafe0c24e5eb961e644b886be364bbd2ec966d (diff) |
Merge pull request #25665 from vespa-engine/jonmv/private-endpoints
Just do nothing on-prem, as no access types are supported, but do not…
2 files changed, 5 insertions, 6 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 2693fdcbd7c..d053106fcee 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 @@ -504,7 +504,6 @@ public class ApplicationController { instance = application.get().require(job.application().instance()); containerEndpoints = controller.routing().of(deployment).prepare(application); - } // Release application lock while doing the deployment, which is a lengthy task. Supplier<Optional<EndpointCertificateMetadata>> endpointCertificateMetadata = () -> { @@ -867,9 +866,11 @@ public class ApplicationController { /** Deactivate application in the given zone. Even if the application itself does not exist, deactivation of the deployment will still be attempted */ public void deactivate(ApplicationId instanceId, ZoneId zone) { TenantAndApplicationId applicationId = TenantAndApplicationId.from(instanceId); - try (Mutex lock = lock(applicationId)) { - Optional<LockedApplication> application = getApplication(applicationId).map(app -> new LockedApplication(app, lock)); - deactivate(instanceId, zone, application).ifPresent(this::store); + try (Mutex deploymentLock = lockForDeployment(instanceId, zone)) { + try (Mutex lock = lock(applicationId)) { + Optional<LockedApplication> application = getApplication(applicationId).map(app -> new LockedApplication(app, lock)); + deactivate(instanceId, zone, application).ifPresent(this::store); + } } } diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/lb/SharedLoadBalancerService.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/lb/SharedLoadBalancerService.java index 5dc099460a4..0722bb8e1dc 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/lb/SharedLoadBalancerService.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/lb/SharedLoadBalancerService.java @@ -29,8 +29,6 @@ public class SharedLoadBalancerService implements LoadBalancerService { @Override public LoadBalancerInstance create(LoadBalancerSpec spec, boolean force) { - if (spec.settings().isPresent() && ! spec.settings().get().isDefault()) - throw new IllegalArgumentException("custom zone endpoint settings are not supported with " + getClass()); return new LoadBalancerInstance(Optional.of(DomainName.of(vipHostname)), Optional.empty(), Optional.empty(), |