[To rel/0.13][IOTDB-4640] Allow setting the same data archiving task after canceling it (#7609)

Author: HeimingZ

integration/src/test/java/org/apache/iotdb/db/integration/IoTDBArchivingIT.java

@@ -293,7 +293,7 @@ public void testShowArchiving() throws SQLException {
 
   @Test
   @Category({ClusterTest.class})
-  public void testSetArchive() throws SQLException {
+  public void testSetArchiving() throws SQLException {
     try (Connection connection = EnvFactory.getEnv().getConnection();
         Statement statement = connection.createStatement()) {
       StorageEngine.getInstance().getArchivingManager().setCheckThreadTime(Long.MAX_VALUE);
@@ -342,4 +342,46 @@ public void testSetArchive() throws SQLException {
       }
     }
   }
+
+  @Test
+  @Category({ClusterTest.class})
+  public void testReSubmitArchiving() throws SQLException {
+    try (Connection connection = EnvFactory.getEnv().getConnection();
+        Statement statement = connection.createStatement()) {
+      StorageEngine.getInstance().getArchivingManager().setCheckThreadTime(Long.MAX_VALUE);
+
+      statement.execute("SET STORAGE GROUP TO root.ARCHIVING_SG4");
+
+      statement.execute(
+          "SET ARCHIVING TO root.ARCHIVING_SG4 3000-12-13 100 '" + testTargetDir.getPath() + "'");
+      ResultSet resultSet = statement.executeQuery("SHOW ARCHIVING");
+      boolean flag = false;
+      while (resultSet.next()) {
+        if (resultSet.getString(3).equals("root.ARCHIVING_SG4")) {
+          flag = true;
+          assertEquals("READY", resultSet.getString(4));
+          assertTrue(resultSet.getString(5).startsWith("3000-12-13"));
+          assertEquals(100, resultSet.getLong(6));
+          assertEquals(testTargetDir.getPath(), resultSet.getString(7));
+        }
+      }
+      assertTrue(flag);
+
+      statement.execute("CANCEL ARCHIVING 0");
+      statement.execute(
+          "SET ARCHIVING TO root.ARCHIVING_SG4 3000-12-13 100 '" + testTargetDir.getPath() + "'");
+      resultSet = statement.executeQuery("SHOW ARCHIVING");
+      flag = false;
+      while (resultSet.next()) {
+        if (resultSet.getString(3).equals("root.ARCHIVING_SG4")) {
+          flag = true;
+          assertEquals("READY", resultSet.getString(4));
+          assertTrue(resultSet.getString(5).startsWith("3000-12-13"));
+          assertEquals(100, resultSet.getLong(6));
+          assertEquals(testTargetDir.getPath(), resultSet.getString(7));
+        }
+      }
+      assertTrue(flag);
+    }
+  }
 }

server/src/main/java/org/apache/iotdb/db/engine/StorageEngine.java

@@ -1316,13 +1316,8 @@ protected void getSeriesSchemas(InsertPlan insertPlan, VirtualStorageGroupProces
   }
 
   /** push the archiving info to archivingManager */
-  public void setArchiving(PartialPath storageGroup, File targetDir, long ttl, long startTime) {
-    boolean result = archivingManager.setArchiving(storageGroup, targetDir, ttl, startTime);
-    if (result) {
-      logger.info("set archiving task successfully.");
-    } else {
-      logger.info("set archiving task failed.");
-    }
+  public boolean setArchiving(PartialPath storageGroup, File targetDir, long ttl, long startTime) {
+    return archivingManager.setArchiving(storageGroup, targetDir, ttl, startTime);
   }
 
   public boolean operateArchiving(

server/src/main/java/org/apache/iotdb/db/engine/archiving/ArchivingManager.java

@@ -212,11 +212,14 @@ public boolean setArchiving(PartialPath storageGroup, File targetDir, long ttl,
 
       // check if there are duplicates
       for (ArchivingTask archivingTask : archivingTasks) {
-        if (archivingTask.getStorageGroup().getFullPath().equals(storageGroup.getFullPath())
+        if (archivingTask.isActive()
+            && archivingTask.getStorageGroup().getFullPath().equals(storageGroup.getFullPath())
             && archivingTask.getTargetDir().equals(targetDir)
             && archivingTask.getTTL() == ttl
             && archivingTask.getStartTime() == startTime) {
-          logger.warn("archiving task already equals archiving task {}", archivingTask.getTaskId());
+          logger.warn(
+              "Fail to set archiving task, it's same as the archiving task {}",
+              archivingTask.getTaskId());
           return false;
         }
       }

server/src/main/java/org/apache/iotdb/db/qp/executor/PlanExecutor.java

@@ -1713,16 +1713,28 @@ private void operateSetArchiving(SetArchivingPlan plan) throws QueryProcessExcep
         throw new QueryProcessException("Fail to cancel archiving task.");
       }
     } else {
+      List<PartialPath> storageGroupPaths;
       try {
-        List<PartialPath> storageGroupPaths =
+        storageGroupPaths =
             IoTDB.metaManager.getMatchedStorageGroups(plan.getStorageGroup(), plan.isPrefixMatch());
-        for (PartialPath storagePath : storageGroupPaths) {
-          StorageEngine.getInstance()
-              .setArchiving(storagePath, plan.getTargetDir(), plan.getTTL(), plan.getStartTime());
-        }
       } catch (MetadataException e) {
         throw new QueryProcessException(e);
       }
+
+      List<String> failedStorageGroups = new ArrayList<>();
+      for (PartialPath storagePath : storageGroupPaths) {
+        boolean success =
+            StorageEngine.getInstance()
+                .setArchiving(storagePath, plan.getTargetDir(), plan.getTTL(), plan.getStartTime());
+        if (!success) {
+          failedStorageGroups.add(storagePath.getFullPath());
+        }
+      }
+      if (!failedStorageGroups.isEmpty()) {
+        throw new QueryProcessException(
+            String.format(
+                "Fail to set archiving tasks for %s", String.join(", ", failedStorageGroups)));
+      }
     }
   }