diff options
| -rw-r--r-- | zkfacade/src/main/java/com/yahoo/vespa/curator/stats/ThreadLockStats.java | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/zkfacade/src/main/java/com/yahoo/vespa/curator/stats/ThreadLockStats.java b/zkfacade/src/main/java/com/yahoo/vespa/curator/stats/ThreadLockStats.java index 73ce731390d..6438dcb77b7 100644 --- a/zkfacade/src/main/java/com/yahoo/vespa/curator/stats/ThreadLockStats.java +++ b/zkfacade/src/main/java/com/yahoo/vespa/curator/stats/ThreadLockStats.java @@ -181,15 +181,16 @@ public class ThreadLockStats { } Thread threadHoldingLockPath = threadLockStats.get().thread; + if (threadAcquiringLockPath == threadHoldingLockPath) { + // reentry + return; + } + errorMessage.append(", trying to acquire lock ") .append(lockPath) .append(" held by thread ") .append(threadHoldingLockPath.getName()); - - if (threadAcquiringLockPath == threadHoldingLockPath) { - // reentry - return; - } else if (threadsAcquiring.contains(threadHoldingLockPath)) { + if (threadsAcquiring.contains(threadHoldingLockPath)) { // deadlock getGlobalLockMetrics(pathToAcquire).incrementDeadlockCount(); logger.warning(errorMessage.toString()); |