You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ro...@apache.org on 2024/10/12 11:54:23 UTC
(iotdb) branch rc/1.3.3 updated: Load: Fix tsfile that was failed to load exceptionally deleted by LoadTsFileScheduler (#13705) (#13751)
This is an automated email from the ASF dual-hosted git repository.
rong pushed a commit to branch rc/1.3.3
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/rc/1.3.3 by this push:
new c8b95286bc3 Load: Fix tsfile that was failed to load exceptionally deleted by LoadTsFileScheduler (#13705) (#13751)
c8b95286bc3 is described below
commit c8b95286bc382a3bec387922421429915dbab01a
Author: YC27 <76...@users.noreply.github.com>
AuthorDate: Sat Oct 12 19:54:17 2024 +0800
Load: Fix tsfile that was failed to load exceptionally deleted by LoadTsFileScheduler (#13705) (#13751)
Co-authored-by: Steve Yurong Su <ro...@apache.org>
(cherry picked from commit dfb7fb93e73d16e121310552d7adb44a2145b01e)
---
.../queryengine/plan/planner/plan/node/load/LoadSingleTsFileNode.java | 2 +-
.../iotdb/db/queryengine/plan/scheduler/load/LoadTsFileScheduler.java | 4 +---
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/load/LoadSingleTsFileNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/load/LoadSingleTsFileNode.java
index 3623e976007..2232548a124 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/load/LoadSingleTsFileNode.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/load/LoadSingleTsFileNode.java
@@ -211,7 +211,7 @@ public class LoadSingleTsFileNode extends WritePlanNode {
Files.deleteIfExists(
new File(tsFile.getAbsolutePath() + ModificationFile.FILE_SUFFIX).toPath());
}
- } catch (IOException e) {
+ } catch (final IOException e) {
LOGGER.warn("Delete After Loading {} error.", tsFile, e);
}
}
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/scheduler/load/LoadTsFileScheduler.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/scheduler/load/LoadTsFileScheduler.java
index 7faecd2708d..bdecbc7802f 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/scheduler/load/LoadTsFileScheduler.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/scheduler/load/LoadTsFileScheduler.java
@@ -188,8 +188,6 @@ public class LoadTsFileScheduler implements IScheduler {
LOAD_TSFILE_COST_METRICS_SET.recordPhaseTimeCost(
LoadTsFileCostMetricsSet.LOAD_LOCALLY, System.nanoTime() - startTime);
}
-
- node.clean();
} else { // need decode, load locally or remotely, use two phases method
String uuid = UUID.randomUUID().toString();
dispatcher.setUuid(uuid);
@@ -214,13 +212,13 @@ public class LoadTsFileScheduler implements IScheduler {
LoadTsFileCostMetricsSet.SECOND_PHASE, System.nanoTime() - startTime);
}
- node.clean();
if (!isFirstPhaseSuccess || !isSecondPhaseSuccess) {
isLoadSingleTsFileSuccess = false;
}
}
if (isLoadSingleTsFileSuccess) {
+ node.clean();
LOGGER.info(
"Load TsFile {} Successfully, load process [{}/{}]",
filePath,