From bb4b68b54f51feb71f46fd5f9fa11ed95d22dd79 Mon Sep 17 00:00:00 2001
From: Harald Musum <musum@yahoo-inc.com>
Date: Sun, 30 Oct 2016 10:05:53 +0100
Subject: Add some logging to debug VESPA-5231

---
 .../main/java/com/yahoo/vespa/config/server/deploy/Deployment.java   | 4 ++++
 .../main/java/com/yahoo/vespa/config/server/tenant/ActivateLock.java | 5 +++++
 2 files changed, 9 insertions(+)

(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 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();
+    }
+
 }
-- 
cgit v1.2.3