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 e0f1a906aca7..15cdd907f8b6 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 @@ -208,7 +208,7 @@ public static void main(String[] args) { ioTPrinter.println( "Successfully load " + loadFileSuccessfulNum.sum() - + " file(s) (--on_success operation(s): " + + " tsfile(s) (--on_success operation(s): " + processingLoadSuccessfulFileSuccessfulNum.sum() + " succeed, " + (loadFileSuccessfulNum.sum() - processingLoadSuccessfulFileSuccessfulNum.sum()) @@ -386,6 +386,7 @@ public static void importTsFile() { try { sessionPool.executeNonQueryStatement(sql); + loadFileSuccessfulNum.increment(); ioTPrinter.println("Imported [ " + filePath + " ] file successfully!"); @@ -401,6 +402,14 @@ public static void importTsFile() { + processSuccessException.getMessage()); } } catch (Exception e) { + // 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."); + tsfileQueue.put(filePath); + continue; + } + loadFileFailedNum.increment(); ioTPrinter.println("Failed to import [ " + filePath + " ] file: " + e.getMessage());