You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ej...@apache.org on 2020/04/27 11:25:35 UTC
[incubator-iotdb] branch fix_merge_stuck updated: change log level
in ending merge
This is an automated email from the ASF dual-hosted git repository.
ejttianyu pushed a commit to branch fix_merge_stuck
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
The following commit(s) were added to refs/heads/fix_merge_stuck by this push:
new 9b69bea change log level in ending merge
9b69bea is described below
commit 9b69beab25c41aa61d485e67d9633e706b8fa7ce
Author: EJTTianyu <16...@qq.com>
AuthorDate: Mon Apr 27 19:24:57 2020 +0800
change log level in ending merge
---
.../iotdb/db/engine/storagegroup/StorageGroupProcessor.java | 12 +++++++++---
server/src/test/resources/logback.xml | 1 +
2 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/StorageGroupProcessor.java b/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/StorageGroupProcessor.java
index 803e147..ac40adf 100755
--- a/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/StorageGroupProcessor.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/StorageGroupProcessor.java
@@ -1430,6 +1430,7 @@ public class StorageGroupProcessor {
@SuppressWarnings("squid:S1141")
private void updateMergeModification(TsFileResource seqFile) {
+ logger.warn("start update merge mod");
seqFile.getWriteQueryLock().writeLock().lock();
try {
// remove old modifications and write modifications generated during merge
@@ -1450,6 +1451,7 @@ public class StorageGroupProcessor {
seqFile.getFile(), e);
} finally {
seqFile.getWriteQueryLock().writeLock().unlock();
+ logger.warn("end update merge mod");
}
}
@@ -1466,21 +1468,24 @@ public class StorageGroupProcessor {
protected void mergeEndAction(List<TsFileResource> seqFiles, List<TsFileResource> unseqFiles,
File mergeLog) {
- logger.info("{} a merge task is ending...", storageGroupName);
+ logger.warn("{} a merge task is ending...", storageGroupName);
if (unseqFiles.isEmpty()) {
// merge runtime exception arose, just end this merge
isMerging = false;
- logger.info("{} a merge task abnormally ends", storageGroupName);
+ logger.warn("{} a merge task abnormally ends", storageGroupName);
return;
}
+ logger.warn("start delete unseq files");
removeUnseqFiles(unseqFiles);
+ logger.warn("end delete");
for (int i = 0; i < seqFiles.size(); i++) {
TsFileResource seqFile = seqFiles.get(i);
mergeLock.writeLock().lock();
try {
+ logger.warn("start merge modification");
updateMergeModification(seqFile);
if (i == seqFiles.size() - 1) {
//FIXME if there is an exception, the the modification file will be not closed.
@@ -1488,11 +1493,12 @@ public class StorageGroupProcessor {
isMerging = false;
mergeLog.delete();
}
+ logger.warn("end merge modification");
} finally {
mergeLock.writeLock().unlock();
}
}
- logger.info("{} a merge task ends", storageGroupName);
+ logger.warn("{} a merge task ends", storageGroupName);
}
/**
diff --git a/server/src/test/resources/logback.xml b/server/src/test/resources/logback.xml
index a1c1c44..43ded7e 100644
--- a/server/src/test/resources/logback.xml
+++ b/server/src/test/resources/logback.xml
@@ -41,6 +41,7 @@
<logger name="FileMonitor" level="info"/>
-->
<logger name="org.apache.iotdb.db.engine.merge" level="DEBUG"/>
+ <!--<logger name="org.apache.iotdb.db.engine.storagegroup.StorageGroupProcessor" level="INFO"/>-->
<logger name="org.eclipse.jetty.util.thread.QueuedThreadPool" level="DEBUG"/>
<logger name="org.apache.iotdb.db.service.MetricsService" level="INFO"/>
<logger name="org.apache.iotdb.db.engine.flush.FlushManager" level="INFO"/>