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/06/21 03:57:56 UTC
(iotdb) branch load-oom-retry created (now fb64bef7801)
This is an automated email from the ASF dual-hosted git repository.
rong pushed a change to branch load-oom-retry
in repository https://gitbox.apache.org/repos/asf/iotdb.git
at fb64bef7801 Update ImportTsFile.java
This branch includes the following new commits:
new fdc3ba22bda Update ImportTsFile.java
new be15c191ffd Merge branch 'master' of https://github.com/apache/iotdb into load-oom-retry
new fb64bef7801 Update ImportTsFile.java
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
(iotdb) 02/03: Merge branch 'master' of https://github.com/apache/iotdb into load-oom-retry
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rong pushed a commit to branch load-oom-retry
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit be15c191ffd6753a9ee22504e040d633009974c9
Merge: fdc3ba22bda e58d427f2f6
Author: Steve Yurong Su <ro...@apache.org>
AuthorDate: Fri Jun 21 11:53:30 2024 +0800
Merge branch 'master' of https://github.com/apache/iotdb into load-oom-retry
.../java/org/apache/iotdb/tool/ImportTsFile.java | 22 ++++++++++++----------
.../queryengine/plan/analyze/AnalyzeVisitor.java | 4 +++-
.../plan/analyze/LoadTsfileAnalyzer.java | 4 +---
3 files changed, 16 insertions(+), 14 deletions(-)
(iotdb) 03/03: Update ImportTsFile.java
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rong pushed a commit to branch load-oom-retry
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit fb64bef780159a0de6d9ba93e8693c7b15b0d885
Author: Steve Yurong Su <ro...@apache.org>
AuthorDate: Fri Jun 21 11:57:48 2024 +0800
Update ImportTsFile.java
---
.../cli/src/main/java/org/apache/iotdb/tool/ImportTsFile.java | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/iotdb-client/cli/src/main/java/org/apache/iotdb/tool/ImportTsFile.java b/iotdb-client/cli/src/main/java/org/apache/iotdb/tool/ImportTsFile.java
index 7f82fca4afe..d69b4c1731e 100644
--- a/iotdb-client/cli/src/main/java/org/apache/iotdb/tool/ImportTsFile.java
+++ b/iotdb-client/cli/src/main/java/org/apache/iotdb/tool/ImportTsFile.java
@@ -386,6 +386,7 @@ public class ImportTsFile extends AbstractTsFileTool {
try {
sessionPool.executeNonQueryStatement(sql);
+
loadFileSuccessfulNum.increment();
ioTPrinter.println("Imported [ " + filePath + " ] file successfully!");
@@ -401,10 +402,7 @@ public class ImportTsFile extends AbstractTsFileTool {
+ processSuccessException.getMessage());
}
} catch (Exception e) {
- loadFileFailedNum.increment();
- ioTPrinter.println("Failed to import [ " + filePath + " ] file: " + e.getMessage());
-
- // Reject because of memory controls
+ // Reject because of memory controls, do retry later
if (Objects.nonNull(e.getMessage()) && e.getMessage().contains("memory")) {
ioTPrinter.println(
"Rejecting file [ " + filePath + " ] due to memory constraints, will retry later.");
@@ -412,6 +410,9 @@ public class ImportTsFile extends AbstractTsFileTool {
continue;
}
+ loadFileFailedNum.increment();
+ ioTPrinter.println("Failed to import [ " + filePath + " ] file: " + e.getMessage());
+
try {
processingFile(filePath, failDir, failOperation);
processingLoadFailedFileSuccessfulNum.increment();
(iotdb) 01/03: Update ImportTsFile.java
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rong pushed a commit to branch load-oom-retry
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit fdc3ba22bda8ae260159744f30154af94cafccf5
Author: Steve Yurong Su <ro...@apache.org>
AuthorDate: Fri Jun 21 11:53:21 2024 +0800
Update ImportTsFile.java
---
.../cli/src/main/java/org/apache/iotdb/tool/ImportTsFile.java | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/iotdb-client/cli/src/main/java/org/apache/iotdb/tool/ImportTsFile.java b/iotdb-client/cli/src/main/java/org/apache/iotdb/tool/ImportTsFile.java
index 320b03334df..ea9ff2126b9 100644
--- a/iotdb-client/cli/src/main/java/org/apache/iotdb/tool/ImportTsFile.java
+++ b/iotdb-client/cli/src/main/java/org/apache/iotdb/tool/ImportTsFile.java
@@ -402,6 +402,14 @@ public class ImportTsFile extends AbstractTsFileTool {
loadFileFailedNum.increment();
ioTPrinter.println("Failed to import [ " + filePath + " ] file: " + e.getMessage());
+ // Reject because of memory controls
+ if (Objects.nonNull(e.getMessage()) && e.getMessage().contains("memory")) {
+ ioTPrinter.println(
+ "Rejecting file [ " + filePath + " ] due to memory constraints, will retry later.");
+ tsfileQueue.put(filePath);
+ continue;
+ }
+
try {
processingFile(filePath, failDir, failOperation);
processingLoadFailedFileSuccessfulNum.increment();