Merge branch 'dev/1.3' of https://github.com/apache/iotdb into multi-fix

Author: Caideyipi

integration-test/src/test/java/org/apache/iotdb/confignode/it/IoTDBConfigNodeSnapshot2IT.java

@@ -0,0 +1,47 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.iotdb.confignode.it;
+
+import org.apache.iotdb.consensus.ConsensusFactory;
+import org.apache.iotdb.it.env.EnvFactory;
+import org.apache.iotdb.it.framework.IoTDBTestRunner;
+import org.apache.iotdb.itbase.category.ClusterIT;
+
+import org.junit.Before;
+import org.junit.experimental.categories.Category;
+import org.junit.runner.RunWith;
+
+@RunWith(IoTDBTestRunner.class)
+@Category({ClusterIT.class})
+public class IoTDBConfigNodeSnapshot2IT extends IoTDBConfigNodeSnapshotIT {
+  @Before
+  public void setUp() throws Exception {
+    // set setConfigNodeRatisSnapshotTriggerThreshold to 1
+    EnvFactory.getEnv()
+        .getConfig()
+        .getCommonConfig()
+        .setConfigNodeConsensusProtocolClass(ConsensusFactory.RATIS_CONSENSUS)
+        .setConfigNodeRatisSnapshotTriggerThreshold(1)
+        .setTimePartitionInterval(testTimePartitionInterval);
+
+    // Init 2C2D cluster environment
+    EnvFactory.getEnv().initClusterEnvironment(2, 2);
+  }
+}

integration-test/src/test/java/org/apache/iotdb/confignode/it/IoTDBConfigNodeSnapshotIT.java

@@ -78,16 +78,15 @@
 @RunWith(IoTDBTestRunner.class)
 @Category({ClusterIT.class})
 public class IoTDBConfigNodeSnapshotIT {
-  private static final int testRatisSnapshotTriggerThreshold = 100;
-  private static final long testTimePartitionInterval = 86400;
+  protected final long testTimePartitionInterval = 86400;
 
   @Before
   public void setUp() throws Exception {
     EnvFactory.getEnv()
         .getConfig()
         .getCommonConfig()
         .setConfigNodeConsensusProtocolClass(ConsensusFactory.RATIS_CONSENSUS)
-        .setConfigNodeRatisSnapshotTriggerThreshold(testRatisSnapshotTriggerThreshold)
+        .setConfigNodeRatisSnapshotTriggerThreshold(100)
         .setTimePartitionInterval(testTimePartitionInterval);
 
     // Init 2C2D cluster environment

iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/persistence/TriggerInfo.java

@@ -247,7 +247,6 @@ public boolean processTakeSnapshot(File snapshotDir) throws TException, IOExcept
       return false;
     }
 
-    acquireTriggerTableLock();
     try (FileOutputStream fileOutputStream = new FileOutputStream(snapshotFile)) {
 
       serializeExistedJarToMD5(fileOutputStream);
@@ -257,8 +256,6 @@ public boolean processTakeSnapshot(File snapshotDir) throws TException, IOExcept
       // fsync
       fileOutputStream.getFD().sync();
       return true;
-    } finally {
-      releaseTriggerTableLock();
     }
   }
 

iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/persistence/UDFInfo.java

@@ -194,7 +194,6 @@ public boolean processTakeSnapshot(File snapshotDir) throws IOException {
       return false;
     }
 
-    acquireUDFTableLock();
     try (FileOutputStream fileOutputStream = new FileOutputStream(snapshotFile)) {
 
       serializeExistedJarToMD5(fileOutputStream);
@@ -205,8 +204,6 @@ public boolean processTakeSnapshot(File snapshotDir) throws IOException {
       fileOutputStream.getFD().sync();
 
       return true;
-    } finally {
-      releaseUDFTableLock();
     }
   }
 

iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/fragment/FragmentInstanceExecution.java

@@ -306,9 +306,6 @@ private void initialize(IDriverScheduler scheduler, boolean isExplainAnalyze) {
 
             clearShuffleSinkHandle(newState);
 
-            // delete tmp file if exists
-            deleteTmpFile();
-
             // close the driver after sink is aborted or closed because in driver.close() it
             // will try to call ISink.setNoMoreTsBlocks()
             for (IDriver driver : drivers) {
@@ -320,6 +317,9 @@ private void initialize(IDriverScheduler scheduler, boolean isExplainAnalyze) {
             // release file handlers
             context.releaseResourceWhenAllDriversAreClosed();
 
+            // delete tmp file if exists
+            deleteTmpFile();
+
             // release memory
             exchangeManager.deRegisterFragmentInstanceFromMemoryPool(
                 instanceId.getQueryId().getId(), instanceId.getFragmentInstanceId(), true);