Fix deadlock during GC of non-persistent topic (#4003)

apache · Apr 8, 2019 · 7a6f2cc · 7a6f2cc
1 parent 0fc17cc
commit 7a6f2cc
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/...oker/src/main/java/org/apache/pulsar/broker/service/nonpersistent/NonPersistentTopic.java b/...oker/src/main/java/org/apache/pulsar/broker/service/nonpersistent/NonPersistentTopic.java
@@ -465,9 +465,13 @@ private CompletableFuture<Void> delete(boolean failIfHasSubscriptions, boolean c
                             isFenced = false;
                             deleteFuture.completeExceptionally(ex);
                         } else {
-                            brokerService.removeTopicFromCache(topic);
-                            log.info("[{}] Topic deleted", topic);
-                            deleteFuture.complete(null);
+                            // topic GC iterates over topics map and removing from the map with the same thread creates
+                            // deadlock. so, execute it in different thread
+                            brokerService.executor().execute(() -> {
+                                brokerService.removeTopicFromCache(topic);
+                                log.info("[{}] Topic deleted", topic);
+                                deleteFuture.complete(null);
+                            });
                         }
                     });
                 } else {