[cdc-base] Fix TM hangs caused by uncaught exception (apache#2511)

GOODBOY008 · Sep 21, 2023 · 7172695 · 7172695
1 parent 07db169
commit 7172695
Showing 1 changed file with 18 additions and 7 deletions.
diff --git a/...om/ververica/cdc/connectors/base/source/reader/external/IncrementalSourceScanFetcher.java b/...om/ververica/cdc/connectors/base/source/reader/external/IncrementalSourceScanFetcher.java
@@ -75,6 +75,8 @@ public IncrementalSourceScanFetcher(FetchTask.Context taskContext, int subtaskId
         ThreadFactory threadFactory =
                 new ThreadFactoryBuilder()
                         .setNameFormat("debezium-snapshot-reader-" + subtaskId)
+                        .setUncaughtExceptionHandler(
+                                (thread, throwable) -> setReadException(throwable))
                         .build();
         this.executorService = Executors.newSingleThreadExecutor(threadFactory);
         this.hasNextElement = new AtomicBoolean(false);
@@ -89,17 +91,13 @@ public void submitTask(FetchTask<SourceSplitBase> fetchTask) {
         this.queue = taskContext.getQueue();
         this.hasNextElement.set(true);
         this.reachEnd.set(false);
-        executorService.submit(
+
+        executorService.execute(
                 () -> {
                     try {
                         snapshotSplitReadTask.execute(taskContext);
                     } catch (Exception e) {
-                        LOG.error(
-                                String.format(
-                                        "Execute snapshot read task for snapshot split %s fail",
-                                        currentSnapshotSplit),
-                                e);
-                        readException = e;
+                        setReadException(e);
                     }
                 });
     }
@@ -186,6 +184,19 @@ private void checkReadException() {
         }
     }
 
+    private void setReadException(Throwable throwable) {
+        LOG.error(
+                String.format(
+                        "Execute snapshot read task for snapshot split %s fail",
+                        currentSnapshotSplit),
+                throwable);
+        if (readException == null) {
+            readException = throwable;
+        } else {
+            readException.addSuppressed(throwable);
+        }
+    }
+
     @Override
     public void close() {
         try {