Merge pull request #304 from Myllyenko/fixing_race_condition_on_Async…

…ReaderImpl_shutdown Fixing race condition in AsyncReaderImpl::shutdown
ydb-platform · Aug 19, 2024 · fd38171 · fd38171
2 parents 16f2600 + e741432
commit fd38171
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/topic/src/main/java/tech/ydb/topic/read/impl/AsyncReaderImpl.java b/topic/src/main/java/tech/ydb/topic/read/impl/AsyncReaderImpl.java
@@ -152,21 +152,21 @@ protected void handleClosePartitionSession(tech.ydb.topic.read.PartitionSession
         });
     }
 
-    protected void handleReaderClosed() {
-        handlerExecutor.execute(() -> {
+    protected CompletableFuture<Void> handleReaderClosed() {
+        return CompletableFuture.runAsync(() -> {
             try {
                 eventHandler.onReaderClosed(new ReaderClosedEvent());
             } catch (Throwable th) {
                 logUserThrowableAndStopWorking(th, "onReaderClosed");
                 throw th;
             }
-        });
+        }, handlerExecutor);
     }
 
     @Override
     protected void onShutdown(String reason) {
         super.onShutdown(reason);
-        handleReaderClosed();
+        handleReaderClosed().join();
         if (defaultHandlerExecutorService != null) {
             logger.debug("Shutting down default handler executor");
             defaultHandlerExecutorService.shutdown();