[incubator-iotdb] branch fix_merge_stuck updated: add merge clean up log

[ejttianyu]

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 89094e2  add merge clean up log
89094e2 is described below

commit 89094e2d23760138dc4f22222fee031f913d6ece
Author: EJTTianyu <1653503...@qq.com>
AuthorDate: Mon Apr 27 09:59:17 2020 +0800

    add merge clean up log
---
 .../java/org/apache/iotdb/db/engine/merge/task/MergeTask.java     | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git 
a/server/src/main/java/org/apache/iotdb/db/engine/merge/task/MergeTask.java 
b/server/src/main/java/org/apache/iotdb/db/engine/merge/task/MergeTask.java
index 6d1a6fc..440c461 100644
--- a/server/src/main/java/org/apache/iotdb/db/engine/merge/task/MergeTask.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/merge/task/MergeTask.java
@@ -159,7 +159,11 @@ public class MergeTask implements Callable<Void> {
     logger.info("{} is cleaning up", taskName);
 
     resource.clear();
+    //TODO: delete when fix merge bug
+    logger.info("resource is clean up");
     mergeContext.clear();
+    //TODO: delete when fix merge bug
+    logger.info("context is clean up");
 
     if (mergeLogger != null) {
       mergeLogger.close();
@@ -167,7 +171,11 @@ public class MergeTask implements Callable<Void> {
 
     for (TsFileResource seqFile : resource.getSeqFiles()) {
       File mergeFile = new File(seqFile.getPath() + MERGE_SUFFIX);
+      //TODO: delete when fix merge bug
+      logger.info("{} start delete", mergeFile.getName());
       mergeFile.delete();
+      //TODO: delete when fix merge bug
+      logger.info("{} is deleted", mergeFile.getName());
       seqFile.setMerging(false);
     }
     for (TsFileResource unseqFile : resource.getUnseqFiles()) {