diff options
| author | Harald Musum <musum@verizonmedia.com> | 2019-08-01 19:18:24 +0200 |
|---|---|---|
| committer | Harald Musum <musum@verizonmedia.com> | 2019-08-01 19:18:24 +0200 |
| commit | f5fb694068351f2357f522db40946b6d3c1960d0 (patch) | |
| tree | 50a204c4b4f3693f6fc2a3fe62a907f79ab3d355 /node-repository | |
| parent | d7681022d05a5929b4fb4935538b122eb00767ee (diff) | |
Return 409 with error code LOAD_BALANCER_NOT_READY if deployment fails due to that
Move LoadBalancerServiceException to config-provisioning so that it can be used from
config server as well.
Return 409 and LOAD_BALANCER_NOT_READY as error code if we get a LoadBalancerServiceException.
Retry deploy on LOAD_BALANCER_NOT_READY.
Diffstat (limited to 'node-repository')
2 files changed, 1 insertions, 18 deletions
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/lb/LoadBalancerServiceException.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/lb/LoadBalancerServiceException.java deleted file mode 100644 index e5ab519ab94..00000000000 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/lb/LoadBalancerServiceException.java +++ /dev/null @@ -1,17 +0,0 @@ -// Copyright 2019 Oath Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.vespa.hosted.provision.lb; - -import com.yahoo.config.provision.TransientException; - -/** - * Transient exception thrown on behalf of a {@link LoadBalancerService}. - * - * @author mpolden - */ -public class LoadBalancerServiceException extends TransientException { - - public LoadBalancerServiceException(String message, Throwable cause) { - super(message, cause); - } - -} diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/LoadBalancerProvisioner.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/LoadBalancerProvisioner.java index 4f0081b6a7f..ea30fba9798 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/LoadBalancerProvisioner.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/LoadBalancerProvisioner.java @@ -14,7 +14,7 @@ import com.yahoo.vespa.hosted.provision.NodeRepository; import com.yahoo.vespa.hosted.provision.lb.LoadBalancer; import com.yahoo.vespa.hosted.provision.lb.LoadBalancerId; import com.yahoo.vespa.hosted.provision.lb.LoadBalancerInstance; -import com.yahoo.vespa.hosted.provision.lb.LoadBalancerServiceException; +import com.yahoo.config.provision.exception.LoadBalancerServiceException; import com.yahoo.vespa.hosted.provision.lb.LoadBalancerService; import com.yahoo.vespa.hosted.provision.lb.Real; import com.yahoo.vespa.hosted.provision.node.IP; |