diff options
author | Harald Musum <musum@oath.com> | 2018-01-03 14:20:35 +0100 |
---|---|---|
committer | Harald Musum <musum@oath.com> | 2018-01-03 14:20:35 +0100 |
commit | 34cef6c3192518b9915a2eeb1a70567b09fb54f7 (patch) | |
tree | 4ccaa6e15bdfc5aaa469fdd973a5ed658762f8eb /configserver/src | |
parent | c9c50209a4ccdfdd72f32b5b346d2d4c72bae88b (diff) |
Throw ActivationConflictException when unable to acquire activate lock
Diffstat (limited to 'configserver/src')
-rw-r--r-- | configserver/src/main/java/com/yahoo/vespa/config/server/deploy/Deployment.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/Deployment.java b/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/Deployment.java index c19ae86157a..5005ddf309d 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/Deployment.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/Deployment.java @@ -126,7 +126,7 @@ public class Deployment implements com.yahoo.config.provision.Deployment { log.log(LogLevel.DEBUG, "Trying to acquire lock " + activateLock + " for session " + sessionId); boolean acquired = activateLock.acquire(timeoutBudget, ignoreLockFailure); if ( ! acquired) { - throw new InternalServerException("Did not get activate lock for session " + sessionId + " within " + timeout); + throw new ActivationConflictException("Did not get activate lock for session " + sessionId + " within " + timeout); } log.log(LogLevel.DEBUG, "Lock acquired " + activateLock + " for session " + sessionId); |