Test out-of-order release

1 files changed, 38 insertions, 0 deletions

diff --git a/zkfacade/src/test/java/com/yahoo/vespa/curator/stats/LockTest.java b/zkfacade/src/test/java/com/yahoo/vespa/curator/stats/LockTest.java
index e5a1ea7c683..524fcd3abd1 100644
--- a/zkfacade/src/test/java/com/yahoo/vespa/curator/stats/LockTest.java
+++ b/zkfacade/src/test/java/com/yahoo/vespa/curator/stats/LockTest.java
@@ -200,8 +200,46 @@ public class LockTest {
         assertEquals(lock2Path, lockAttempts.get(1).getLockPath());
         assertEquals(LockAttempt.LockState.ACQUIRED, lockAttempts.get(1).getLockState());
 
+        lock2.close();
         lock.close();
+    }
+
+    @Test
+    public void locksReleaseOutOfOrder() throws Exception {
+        when(mutex.acquire(anyLong(), any())).thenReturn(true);
+
+        lock.acquire(acquireTimeout);
+        assertLockMetricsIs(new LockMetrics().setAcquireCount(1)
+                                             .setCumulativeAcquireCount(1)
+                                             .setAcquireSucceededCount(1)
+                                             .setCumulativeAcquireSucceededCount(1));
+        lock2.acquire(acquireTimeout);
+        assertLock2MetricsIs(new LockMetrics().setAcquireCount(1)
+                                              .setCumulativeAcquireCount(1)
+                                              .setAcquireSucceededCount(1)
+                                              .setCumulativeAcquireSucceededCount(1));
         lock.close();
+        assertLockMetricsIs(new LockMetrics().setAcquireCount(0)
+                                             .setCumulativeAcquireCount(1)
+                                             .setAcquireSucceededCount(0)
+                                             .setCumulativeAcquireSucceededCount(1)
+                                             .setReleaseCount(1)
+                                             .setCumulativeReleaseCount(1));
+
+        List<ThreadLockStats> threadLockStats = LockStats.getGlobal().getThreadLockStats();
+        assertEquals(1, threadLockStats.size());
+        List<LockAttempt> lockAttempts = threadLockStats.get(0).getOngoingLockAttempts();
+        assertEquals(1, lockAttempts.size());
+        assertEquals(lock2Path, lockAttempts.get(0).getLockPath());
+        assertEquals(LockAttempt.LockState.ACQUIRED, lockAttempts.get(0).getLockState());
+
+        lock2.close();
+        assertLock2MetricsIs(new LockMetrics().setAcquireCount(0)
+                                              .setCumulativeAcquireCount(1)
+                                              .setAcquireSucceededCount(0)
+                                              .setCumulativeAcquireSucceededCount(1)
+                                              .setReleaseCount(1)
+                                              .setCumulativeReleaseCount(1));
     }
 
     @Test