You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by qi...@apache.org on 2022/05/16 15:30:58 UTC
[iotdb] branch master updated: [IOTDB-2978][compaction error log ] Log level and "null" error message handling (#5917)
This is an automated email from the ASF dual-hosted git repository.
qiaojialin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/master by this push:
new dbee2b89be [IOTDB-2978][compaction error log ] Log level and "null" error message handling (#5917)
dbee2b89be is described below
commit dbee2b89bedea6a9e7610bf92089d779e3a75e60
Author: 周沛辰 <45...@users.noreply.github.com>
AuthorDate: Mon May 16 23:30:52 2022 +0800
[IOTDB-2978][compaction error log ] Log level and "null" error message handling (#5917)
---
.../compaction/cross/CrossSpaceCompactionTask.java | 9 +++++++--
.../compaction/inner/InnerSpaceCompactionTask.java | 16 +++++++---------
.../performer/impl/ReadPointCompactionPerformer.java | 7 +++----
.../engine/compaction/task/AbstractCompactionTask.java | 7 ++++---
4 files changed, 21 insertions(+), 18 deletions(-)
diff --git a/server/src/main/java/org/apache/iotdb/db/engine/compaction/cross/CrossSpaceCompactionTask.java b/server/src/main/java/org/apache/iotdb/db/engine/compaction/cross/CrossSpaceCompactionTask.java
index 155c9795fa..58077be480 100644
--- a/server/src/main/java/org/apache/iotdb/db/engine/compaction/cross/CrossSpaceCompactionTask.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/compaction/cross/CrossSpaceCompactionTask.java
@@ -159,8 +159,13 @@ public class CrossSpaceCompactionTask extends AbstractCompactionTask {
((double) selectedFileSize) / 1024.0d / 1024.0d / costTime);
}
} catch (Throwable throwable) {
- // catch throwable instead of exception to handle OOM errors
- LOGGER.error("Meet errors in cross space compaction.");
+ // catch throwable to handle OOM errors
+ if (!(throwable instanceof InterruptedException)) {
+ LOGGER.error(
+ "{} [Compaction] Meet errors in cross space compaction.", fullStorageGroupName);
+ }
+
+ // handle exception
CompactionExceptionHandler.handleException(
fullStorageGroupName,
logFile,
diff --git a/server/src/main/java/org/apache/iotdb/db/engine/compaction/inner/InnerSpaceCompactionTask.java b/server/src/main/java/org/apache/iotdb/db/engine/compaction/inner/InnerSpaceCompactionTask.java
index 649468660b..8f9b538816 100644
--- a/server/src/main/java/org/apache/iotdb/db/engine/compaction/inner/InnerSpaceCompactionTask.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/compaction/inner/InnerSpaceCompactionTask.java
@@ -113,9 +113,7 @@ public class InnerSpaceCompactionTask extends AbstractCompactionTask {
+ File.separator
+ targetTsFileResource.getTsFile().getName()
+ CompactionLogger.INNER_COMPACTION_LOG_NAME_SUFFIX);
- CompactionLogger compactionLogger = null;
- try {
- compactionLogger = new CompactionLogger(logFile);
+ try (CompactionLogger compactionLogger = new CompactionLogger(logFile)) {
compactionLogger.logFiles(selectedTsFileResourceList, CompactionLogger.STR_SOURCE_FILES);
compactionLogger.logFiles(targetTsFileList, CompactionLogger.STR_TARGET_FILES);
LOGGER.info("{} [InnerSpaceCompactionTask] Close the logger", fullStorageGroupName);
@@ -200,13 +198,13 @@ public class InnerSpaceCompactionTask extends AbstractCompactionTask {
FileUtils.delete(logFile);
}
} catch (Throwable throwable) {
- LOGGER.warn("{} [Compaction] Start to handle exception", fullStorageGroupName);
- if (throwable instanceof InterruptedException) {
- Thread.currentThread().interrupt();
- }
- if (compactionLogger != null) {
- compactionLogger.close();
+ // catch throwable to handle OOM errors
+ if (!(throwable instanceof InterruptedException)) {
+ LOGGER.error(
+ "{} [Compaction] Meet errors in inner space compaction.", fullStorageGroupName);
}
+
+ // handle exception
if (isSequence()) {
CompactionExceptionHandler.handleException(
fullStorageGroupName,
diff --git a/server/src/main/java/org/apache/iotdb/db/engine/compaction/performer/impl/ReadPointCompactionPerformer.java b/server/src/main/java/org/apache/iotdb/db/engine/compaction/performer/impl/ReadPointCompactionPerformer.java
index 4b7d215622..3dc0c5ab11 100644
--- a/server/src/main/java/org/apache/iotdb/db/engine/compaction/performer/impl/ReadPointCompactionPerformer.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/compaction/performer/impl/ReadPointCompactionPerformer.java
@@ -228,10 +228,9 @@ public class ReadPointCompactionPerformer
for (int i = 0; i < subTaskNums; i++) {
try {
futures.get(i).get();
- } catch (InterruptedException | ExecutionException e) {
- LOGGER.error("SubCompactionTask meet errors ", e);
- Thread.currentThread().interrupt();
- throw new InterruptedException();
+ } catch (ExecutionException e) {
+ LOGGER.error("[Compaction] SubCompactionTask meet errors ", e);
+ throw new IOException(e);
}
}
diff --git a/server/src/main/java/org/apache/iotdb/db/engine/compaction/task/AbstractCompactionTask.java b/server/src/main/java/org/apache/iotdb/db/engine/compaction/task/AbstractCompactionTask.java
index 0fbe2e7d40..c384671619 100644
--- a/server/src/main/java/org/apache/iotdb/db/engine/compaction/task/AbstractCompactionTask.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/compaction/task/AbstractCompactionTask.java
@@ -74,9 +74,10 @@ public abstract class AbstractCompactionTask implements Callable<CompactionTaskS
doCompaction();
isSuccess = true;
} catch (InterruptedException e) {
- LOGGER.warn("Current task is interrupted");
- } catch (Exception e) {
- LOGGER.error("Running compaction task failed", e);
+ LOGGER.warn("{} [Compaction] Current task is interrupted", fullStorageGroupName);
+ } catch (Throwable e) {
+ // Use throwable to catch OOM exception.
+ LOGGER.error("{} [Compaction] Running compaction task failed", fullStorageGroupName, e);
} finally {
this.currentTaskNum.decrementAndGet();
CompactionTaskManager.getInstance().removeRunningTaskFuture(this);