deletion

iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/DataRegion.java

diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/DataRegion.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/DataRegion.java
index 933efba..75bb1a9 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/DataRegion.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/DataRegion.java
@@ -3395,6 +3395,15 @@
       } // else do nothing
     }
 
+    if (involvedModificationFiles.isEmpty() && deletedByFiles.isEmpty()) {
+      logger.info("[Deletion] Deletion {} does not involve any file", deletion);
+      return;
+    }
+
+    if (!involvedModificationFiles.isEmpty()) {
+      writeDeletionToModFiles(involvedModificationFiles, deletion);
+    }
+
     if (!deletedByFiles.isEmpty()) {
       deleteTsFileCompletely(deletedByFiles);
       if (logger.isDebugEnabled()) {
@@ -3402,13 +3411,17 @@
             "deleteTsFileCompletely execute successful, all tsfile are deleted successfully");
       }
     }
+  }
 
-    if (involvedModificationFiles.isEmpty()) {
-      logger.info("[Deletion] Deletion {} does not involve any file", deletion);
-      return;
-    }
+  private boolean isFileFullyMatchedByTime(
+      ModEntry deletion, long fileStartTime, long fileEndTime) {
+    return fileStartTime >= deletion.getStartTime() && fileEndTime <= deletion.getEndTime();
+  }
 
-    List<Exception> exceptions =
+  protected void writeDeletionToModFiles(
+      final Set<ModificationFile> involvedModificationFiles, final ModEntry deletion)
+      throws IOException {
+    final List<Exception> exceptions =
         involvedModificationFiles.parallelStream()
             .map(
                 modFile -> {
@@ -3438,11 +3451,6 @@
         involvedModificationFiles.size());
   }
 
-  private boolean isFileFullyMatchedByTime(
-      ModEntry deletion, long fileStartTime, long fileEndTime) {
-    return fileStartTime >= deletion.getStartTime() && fileEndTime <= deletion.getEndTime();
-  }
-
   /** Delete completely TsFile and related supporting files */
   private void deleteTsFileCompletely(List<TsFileResource> tsfileResourceList) {
     for (TsFileResource tsFileResource : tsfileResourceList) {
@@ -3474,14 +3482,8 @@
       } // else do nothing
     }
 
-    for (ModificationFile involvedModificationFile : involvedModificationFiles) {
-      // delete data in sealed file
-      involvedModificationFile.write(modEntry);
-      // The file size may be smaller than the original file, so the increment here may be
-      // negative
-      involvedModificationFile.close();
-      logger.debug(
-          "[Deletion] Deletion {} written into mods file:{}.", modEntry, involvedModificationFile);
+    if (!involvedModificationFiles.isEmpty()) {
+      writeDeletionToModFiles(involvedModificationFiles, modEntry);
     }
 
     // can be deleted by files

iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/DataRegionTest.java

diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/DataRegionTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/DataRegionTest.java
index 68d7676..74f884b 100644
--- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/DataRegionTest.java
+++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/DataRegionTest.java
@@ -61,6 +61,8 @@
 import org.apache.iotdb.db.storageengine.dataregion.flush.TsFileFlushPolicy;
 import org.apache.iotdb.db.storageengine.dataregion.memtable.ReadOnlyMemChunk;
 import org.apache.iotdb.db.storageengine.dataregion.memtable.TsFileProcessor;
+import org.apache.iotdb.db.storageengine.dataregion.modification.ModEntry;
+import org.apache.iotdb.db.storageengine.dataregion.modification.ModificationFile;
 import org.apache.iotdb.db.storageengine.dataregion.read.QueryDataSource;
 import org.apache.iotdb.db.storageengine.dataregion.tsfile.TsFileResource;
 import org.apache.iotdb.db.storageengine.dataregion.tsfile.generator.TsFileNameGenerator;
@@ -93,6 +95,7 @@
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
+import java.util.Set;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
@@ -1659,6 +1662,54 @@
         dataRegion.getWorkSequenceTsFileProcessors().contains(tsFileResource.getProcessor()));
   }
 
+  @Test
+  public void testDeleteByDeviceShouldNotDeleteFullyMatchedFilesBeforeModWriteSucceeds()
+      throws Exception {
+    final FailingModWriteDataRegion dataRegion1 =
+        new FailingModWriteDataRegion(systemDir, "root.delete_fail");
+    try {
+      for (int time = 0; time < 100; time++) {
+        TSRecord record = new TSRecord("root.delete_fail.d0", time);
+        record.addTuple(
+            DataPoint.getDataPoint(TSDataType.INT32, measurementId, String.valueOf(time)));
+        dataRegion1.insert(buildInsertRowNodeByTSRecord(record));
+      }
+      dataRegion1.syncCloseAllWorkingTsFileProcessors();
+      final TsFileResource fullyMatchedFile = dataRegion1.getSequenceFileList().get(0);
+
+      for (int time = 100; time < 200; time++) {
+        TSRecord record = new TSRecord("root.delete_fail.d0", time);
+        record.addTuple(
+            DataPoint.getDataPoint(TSDataType.INT32, measurementId, String.valueOf(time)));
+        dataRegion1.insert(buildInsertRowNodeByTSRecord(record));
+      }
+      dataRegion1.syncCloseAllWorkingTsFileProcessors();
+      final TsFileResource partiallyMatchedFile = dataRegion1.getSequenceFileList().get(1);
+
+      dataRegion1.setFailWriteDeletionToModFiles(true);
+
+      final MeasurementPath path = new MeasurementPath("root.delete_fail.d0.s0");
+      final DeleteDataNode deleteDataNode =
+          new DeleteDataNode(new PlanNodeId("1"), Collections.singletonList(path), 0, 150);
+      deleteDataNode.setSearchIndex(0);
+
+      try {
+        dataRegion1.deleteByDevice(path, deleteDataNode);
+        Assert.fail("Expected IOException");
+      } catch (IOException e) {
+        final Throwable cause = e.getCause() == null ? e : e.getCause();
+        Assert.assertTrue(cause.getMessage().contains("mock mod write failure"));
+      }
+
+      Assert.assertTrue(fullyMatchedFile.getTsFile().exists());
+      Assert.assertTrue(partiallyMatchedFile.getTsFile().exists());
+      Assert.assertFalse(fullyMatchedFile.anyModFileExists());
+      Assert.assertFalse(partiallyMatchedFile.anyModFileExists());
+    } finally {
+      dataRegion1.syncDeleteDataFiles();
+    }
+  }
+
   public static class DummyDataRegion extends DataRegion {
 
     public DummyDataRegion(String systemInfoDir, String storageGroupName)
@@ -1667,6 +1718,30 @@
     }
   }
 
+  public static class FailingModWriteDataRegion extends DummyDataRegion {
+
+    private boolean failWriteDeletionToModFiles;
+
+    public FailingModWriteDataRegion(String systemInfoDir, String storageGroupName)
+        throws DataRegionException {
+      super(systemInfoDir, storageGroupName);
+    }
+
+    public void setFailWriteDeletionToModFiles(boolean failWriteDeletionToModFiles) {
+      this.failWriteDeletionToModFiles = failWriteDeletionToModFiles;
+    }
+
+    @Override
+    protected void writeDeletionToModFiles(
+        final Set<ModificationFile> involvedModificationFiles, final ModEntry deletion)
+        throws IOException {
+      if (failWriteDeletionToModFiles && !involvedModificationFiles.isEmpty()) {
+        throw new IOException("mock mod write failure");
+      }
+      super.writeDeletionToModFiles(involvedModificationFiles, deletion);
+    }
+  }
+
   // -- test for deleting data directly
   // -- delete data and file only when:
   // 1. tsfile is closed