1 files changed, 14 insertions, 9 deletions

diff --git a/zkfacade/src/main/java/com/yahoo/vespa/curator/stats/LockStats.java b/zkfacade/src/main/java/com/yahoo/vespa/curator/stats/LockStats.java
index e4f78a4f9e9..ecb344dedb9 100644
--- a/zkfacade/src/main/java/com/yahoo/vespa/curator/stats/LockStats.java
+++ b/zkfacade/src/main/java/com/yahoo/vespa/curator/stats/LockStats.java
@@ -64,28 +64,33 @@ public class LockStats {
     }
 
     /** Must be invoked only after the first and non-reentry acquisition of the lock. */
-    void notifyOfThreadHoldingLock(Thread currentThread, String lockPath) {
+    void notifyOfThreadHoldingLock(Thread currentThread, String lockPath, String lockId,
+                                   long sequenceNumber, Map<Long, Long> reentriesByThreadId) {
         Thread oldThread = lockPathsHeld.put(lockPath, currentThread);
         if (oldThread != null) {
             getLockMetrics(lockPath).incrementAcquireWithoutReleaseCount();
-            logger.warning("Thread " + currentThread.getName() +
-                    " reports it has the lock on " + lockPath + ", but thread " + oldThread.getName() +
-                    " has not reported it released the lock");
+            logger.warning("Thread " + currentThread.getName() + " reports it has the lock on " +
+                           lockPath + ", but thread " + oldThread.getName() +
+                           " has not reported it released the lock. " + lockId + "#" + sequenceNumber +
+                           ", reentries by thread ID = " + reentriesByThreadId);
         }
     }
 
     /** Must be invoked only before the last and non-reentry release of the lock. */
-    void notifyOfThreadReleasingLock(Thread currentThread, String lockPath) {
+    void notifyOfThreadReleasingLock(Thread currentThread, String lockPath, String lockId,
+                                     long sequenceNumber, Map<Long, Long> reentriesByThreadId) {
         Thread oldThread = lockPathsHeld.remove(lockPath);
         if (oldThread == null) {
             getLockMetrics(lockPath).incrementNakedReleaseCount();
-            logger.warning("Thread " + currentThread.getName() +
-                    " is releasing the lock " + lockPath + ", but nobody owns that lock");
+            logger.warning("Thread " + currentThread.getName() + " is releasing the lock " + lockPath +
+                           ", but nobody owns that lock. " + lockId + "#" + sequenceNumber +
+                           ", reentries by thread ID = " + reentriesByThreadId);
         } else if (oldThread != currentThread) {
             getLockMetrics(lockPath).incrementForeignReleaseCount();
             logger.warning("Thread " + currentThread.getName() +
-                    " is releasing the lock " + lockPath + ", but it was owned by thread "
-                    + oldThread.getName());
+                           " is releasing the lock " + lockPath + ", but it was owned by thread " +
+                           oldThread.getName() + ". " + lockId + "#" + sequenceNumber +
+                           ", reentries by thread ID = " + reentriesByThreadId);
         }
     }