[iotdb] branch master updated: Try to fix remove partition IT problem (#2524)

[jackietien]

This is an automated email from the ASF dual-hosted git repository.

jackietien 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 85bfdab  Try to fix remove partition IT problem (#2524)
85bfdab is described below

commit 85bfdabb497c037c7e44c5b6c24f38a03f7c2239
Author: SilverNarcissus <151250...@smail.nju.edu.cn>
AuthorDate: Wed Jan 20 20:12:03 2021 +0800

    Try to fix remove partition IT problem (#2524)
    
    Try to fix remove partition IT problem
---
 .../db/engine/storagegroup/StorageGroupProcessor.java      | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 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 ed8f199..3652709 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
@@ -425,7 +425,7 @@ public class StorageGroupProcessor {
         recoverTsFiles(value, false);
       }
 
-      String taskName = virtualStorageGroupId + "-" + 
System.currentTimeMillis();
+      String taskName = logicalStorageGroupName + "-" + virtualStorageGroupId 
+ "-" + System.currentTimeMillis();
       File mergingMods = SystemFileFactory.INSTANCE.getFile(storageGroupSysDir,
           MERGING_MODIFICATION_FILE_NAME);
       if (mergingMods.exists()) {
@@ -436,8 +436,8 @@ public class StorageGroupProcessor {
           tsFileManagement.getTsFileList(false), storageGroupSysDir.getPath(),
           tsFileManagement::mergeEndAction,
           taskName,
-          IoTDBDescriptor.getInstance().getConfig().isForceFullMerge(), 
logicalStorageGroupName);
-      logger.info("{} a RecoverMergeTask {} starts...", virtualStorageGroupId, 
taskName);
+          IoTDBDescriptor.getInstance().getConfig().isForceFullMerge(), 
logicalStorageGroupName + "-" + virtualStorageGroupId);
+      logger.info("{} - {} a RecoverMergeTask {} starts...", 
logicalStorageGroupName, virtualStorageGroupId, taskName);
       recoverMergeTask
           
.recoverMerge(IoTDBDescriptor.getInstance().getConfig().isContinueMergeAfterReboot());
       if 
(!IoTDBDescriptor.getInstance().getConfig().isContinueMergeAfterReboot()) {
@@ -469,18 +469,18 @@ public class StorageGroupProcessor {
   private void recoverCompaction() {
     if (!CompactionMergeTaskPoolManager.getInstance().isTerminated()) {
       compactionMergeWorking = true;
-      logger.info("{} submit a compaction merge task", virtualStorageGroupId);
+      logger.info("{} - {} submit a compaction merge task", 
logicalStorageGroupName, virtualStorageGroupId);
       try {
         CompactionMergeTaskPoolManager.getInstance()
             .submitTask(
                 tsFileManagement.new 
CompactionRecoverTask(this::closeCompactionMergeCallBack));
       } catch (RejectedExecutionException e) {
         this.closeCompactionMergeCallBack();
-        logger.error("{} compaction submit task failed", 
virtualStorageGroupId);
+        logger.error("{} - {} compaction submit task failed", 
logicalStorageGroupName, virtualStorageGroupId);
       }
     } else {
       logger.error("{} compaction pool not started ,recover failed",
-          virtualStorageGroupId);
+          logicalStorageGroupName + "-" + virtualStorageGroupId);
     }
   }
 
@@ -2515,7 +2515,7 @@ public class StorageGroupProcessor {
     tsFileManagement.writeLock();
     try {
       // abort ongoing merges
-      MergeManager.getINSTANCE().abortMerge(virtualStorageGroupId);
+      MergeManager.getINSTANCE().abortMerge(logicalStorageGroupName);
       // close all working files that should be removed
       removePartitions(filter, workSequenceTsFileProcessors.entrySet());
       removePartitions(filter, workUnsequenceTsFileProcessors.entrySet());