Fix delete data TsFileProcessor NPE (#14748)

apache · Jan 22, 2025 · 9be5eeb · 9be5eeb
1 parent 3491493
commit 9be5eeb
Showing 1 changed file with 14 additions and 9 deletions.
diff --git a/...-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/DataRegion.java b/...-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/DataRegion.java
@@ -2505,17 +2505,22 @@ private void deleteDataInUnsealedFiles(
       if (tsFileResource.isClosed()) {
         sealedTsFiles.add(tsFileResource);
       } else {
-        tsFileResource.getProcessor().getFlushQueryLock().writeLock().lock();
-        if (tsFileResource.isClosed()) {
+        TsFileProcessor tsFileProcessor = tsFileResource.getProcessor();
+        if (tsFileProcessor == null) {
           sealedTsFiles.add(tsFileResource);
-          tsFileResource.getProcessor().getFlushQueryLock().writeLock().unlock();
         } else {
-          try {
-            if (!tsFileResource.getProcessor().deleteDataInMemory(deletion)) {
-              sealedTsFiles.add(tsFileResource);
-            } // else do nothing
-          } finally {
-            tsFileResource.getProcessor().getFlushQueryLock().writeLock().unlock();
+          tsFileProcessor.getFlushQueryLock().writeLock().lock();
+          if (tsFileResource.isClosed()) {
+            sealedTsFiles.add(tsFileResource);
+            tsFileProcessor.getFlushQueryLock().writeLock().unlock();
+          } else {
+            try {
+              if (!tsFileProcessor.deleteDataInMemory(deletion)) {
+                sealedTsFiles.add(tsFileResource);
+              } // else do nothing
+            } finally {
+              tsFileProcessor.getFlushQueryLock().writeLock().unlock();
+            }
           }
         }
       }