[FLINK-35446][checkpoint] Fix NPE when disabling file merging but res…

…toring from merged files This fixes apache#24840
Zakelly · May 26, 2024 · 096b4a6 · 096b4a6
1 parent 5b535e1
commit 096b4a6
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/.../java/org/apache/flink/runtime/checkpoint/filemerging/FileMergingSnapshotManagerBase.java b/.../java/org/apache/flink/runtime/checkpoint/filemerging/FileMergingSnapshotManagerBase.java
@@ -684,10 +684,11 @@ public void restoreStateHandles(
                                         fileHandle.getFilePath(),
                                         path -> {
                                             boolean managedByFileMergingManager =
-                                                    isManagedByFileMergingManager(
-                                                            path,
-                                                            subtaskKey,
-                                                            fileHandle.getScope());
+                                                    fileSystemInitiated
+                                                            && isManagedByFileMergingManager(
+                                                                    path,
+                                                                    subtaskKey,
+                                                                    fileHandle.getScope());
                                             if (managedByFileMergingManager) {
                                                 spaceStat.onPhysicalFileCreate();
                                             }