(feat) Avoid deadlock when disruptor queue is full.

sofastack · Nov 4, 2019 · b1cc39a · b1cc39a
1 parent bc4c4b8
commit b1cc39a
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/jraft-core/src/main/java/com/alipay/sofa/jraft/core/FSMCallerImpl.java b/jraft-core/src/main/java/com/alipay/sofa/jraft/core/FSMCallerImpl.java
@@ -210,12 +210,14 @@ public synchronized void shutdown() {
 
         if (this.taskQueue != null) {
             final CountDownLatch latch = new CountDownLatch(1);
-            enqueueTask((task, sequence) -> {
-                task.reset();
-                task.type = TaskType.SHUTDOWN;
-                task.shutdownLatch = latch;
-            });
             this.shutdownLatch = latch;
+            Utils.runInThread(() -> {
+                this.taskQueue.publishEvent((task, sequence) -> {
+                    task.reset();
+                    task.type = TaskType.SHUTDOWN;
+                    task.shutdownLatch = latch;
+                });
+            });
         }
         doShutdown();
     }

diff --git a/jraft-core/src/main/java/com/alipay/sofa/jraft/storage/impl/LogManagerImpl.java b/jraft-core/src/main/java/com/alipay/sofa/jraft/storage/impl/LogManagerImpl.java
@@ -216,9 +216,11 @@ public boolean init(final LogManagerOptions opts) {
 
     private void stopDiskThread() {
         this.shutDownLatch = new CountDownLatch(1);
-        this.diskQueue.publishEvent((event, sequence) -> {
-            event.reset();
-            event.type = EventType.SHUTDOWN;
+        Utils.runInThread(() -> {
+            this.diskQueue.publishEvent((event, sequence) -> {
+                event.reset();
+                event.type = EventType.SHUTDOWN;
+            });
         });
     }