From 34cef6c3192518b9915a2eeb1a70567b09fb54f7 Mon Sep 17 00:00:00 2001 From: Harald Musum Date: Wed, 3 Jan 2018 14:20:35 +0100 Subject: Throw ActivationConflictException when unable to acquire activate lock --- .../src/main/java/com/yahoo/vespa/config/server/deploy/Deployment.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'configserver') 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); -- cgit v1.2.3