fun. release write lock

symious · May 7, 2024 · 52e222e · 52e222e
1 parent 62f1d26
commit 52e222e
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 2 deletions.
diff --git a/ratis-common/src/main/java/org/apache/ratis/util/AutoCloseableLock.java b/ratis-common/src/main/java/org/apache/ratis/util/AutoCloseableLock.java
@@ -17,6 +17,9 @@
  */
 package org.apache.ratis.util;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.locks.Lock;
 
@@ -25,6 +28,7 @@
  * so that the {@link #close()} method will unlock the lock.
  */
 public final class AutoCloseableLock implements AutoCloseable {
+  static final Logger LOG = LoggerFactory.getLogger(AutoCloseableLock.class);
   /**
    * Acquire the given lock and then wrap it with {@link AutoCloseableLock}
    * so that the given lock can be released by calling {@link #close()},
@@ -41,7 +45,14 @@ public static AutoCloseableLock acquire(final Lock lock) {
 
   @SuppressWarnings("java:S2222") // Locks should be release by calling {@link #close()}
   public static AutoCloseableLock acquire(final Lock lock, Runnable preUnlock) {
+    return acquire(lock, preUnlock, false);
+  }
+
+  public static AutoCloseableLock acquire(final Lock lock, Runnable preUnlock, boolean log) {
     lock.lock();
+    if (log) {
+      LOG.info("Thread: " + Thread.currentThread().getName() + " acquired lock: " + lock);
+    }
     return new AutoCloseableLock(lock, preUnlock);
   }
 

diff --git a/ratis-server/src/main/java/org/apache/ratis/server/raftlog/RaftLogBase.java b/ratis-server/src/main/java/org/apache/ratis/server/raftlog/RaftLogBase.java
@@ -393,11 +393,23 @@ public String toString() {
   }
 
   public AutoCloseableLock readLock() {
-    return AutoCloseableLock.acquire(lock.readLock());
+    Runnable log = new Runnable() {
+      @Override
+      public void run() {
+        LOG.info("Thread " + Thread.currentThread() + " released " + lock.readLock());
+      }
+    };
+    return AutoCloseableLock.acquire(lock.readLock(), log, true);
   }
 
   public AutoCloseableLock writeLock() {
-    return AutoCloseableLock.acquire(lock.writeLock());
+    Runnable log = new Runnable() {
+      @Override
+      public void run() {
+        LOG.info("Thread " + Thread.currentThread() + " released " + lock.writeLock());
+      }
+    };
+    return AutoCloseableLock.acquire(lock.writeLock(), log, true);
   }
 
   public boolean hasWriteLock() {