ARTEMIS-2603 Deadlock between pageStore.getCurrentID and page.cleanup

This happened when JournalStorageManager.startReplication and PageStore.cleanup were called between multiple threads.
apache · Jan 17, 2020 · 1a6c4e5 · 1a6c4e5
1 parent 02cc2b5
commit 1a6c4e5
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/...is-server/src/main/java/org/apache/activemq/artemis/core/paging/impl/PagingStoreImpl.java b/...is-server/src/main/java/org/apache/activemq/artemis/core/paging/impl/PagingStoreImpl.java
@@ -1169,7 +1169,7 @@ public boolean isRejectingMessages() {
 
    @Override
    public Collection<Integer> getCurrentIds() throws Exception {
-      lock.writeLock().lock();
+      lock.readLock().lock();
       try {
          List<Integer> ids = new ArrayList<>();
          SequentialFileFactory factory = fileFactory;
@@ -1180,7 +1180,7 @@ public Collection<Integer> getCurrentIds() throws Exception {
          }
          return ids;
       } finally {
-         lock.writeLock().unlock();
+         lock.readLock().unlock();
       }
    }