diff options
author | Harald Musum <musum@yahoo-inc.com> | 2016-10-30 10:05:53 +0100 |
---|---|---|
committer | Harald Musum <musum@yahoo-inc.com> | 2016-10-30 10:05:53 +0100 |
commit | bb4b68b54f51feb71f46fd5f9fa11ed95d22dd79 (patch) | |
tree | afd374608d3facf6933db4d79f31c6daf64bc275 /configserver | |
parent | 74d1065ce23f039a3d587be52f9d630f2c6e563d (diff) |
Add some logging to debug VESPA-5231
Diffstat (limited to 'configserver')
-rw-r--r-- | configserver/src/main/java/com/yahoo/vespa/config/server/deploy/Deployment.java | 4 | ||||
-rw-r--r-- | configserver/src/main/java/com/yahoo/vespa/config/server/tenant/ActivateLock.java | 5 |
2 files changed, 9 insertions, 0 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 e88965389b6..4ac0385fccd 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 @@ -129,7 +129,9 @@ public class Deployment implements com.yahoo.config.provision.Deployment { long sessionId = session.getSessionId(); validateSessionStatus(session); try { + log.log(LogLevel.INFO, "Trying to acquire lock: " + activateLock); activateLock.acquire(timeoutBudget, ignoreLockFailure); + log.log(LogLevel.INFO, "Lock acquired: " + activateLock); NestedTransaction transaction = new NestedTransaction(); transaction.add(deactivateCurrentActivateNew(localSessionRepo.getActiveSession(session.getApplicationId()), session, ignoreSessionStaleFailure)); @@ -146,7 +148,9 @@ public class Deployment implements com.yahoo.config.provision.Deployment { } catch (Exception e) { throw new InternalServerException("Error activating application", e); } finally { + log.log(LogLevel.INFO, "Trying to release lock: " + activateLock); activateLock.release(); + log.log(LogLevel.INFO, "Lock released: " + activateLock); } log.log(LogLevel.INFO, session.logPre() + "Session " + sessionId + " activated successfully using " + diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/ActivateLock.java b/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/ActivateLock.java index 7581509722f..634b38f6d25 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/ActivateLock.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/ActivateLock.java @@ -39,4 +39,9 @@ public class ActivateLock { } } + @Override + public String toString() { + return "ActivateLock (" + curatorLock + "), has lock: " + curatorLock.hasLock(); + } + } |