[iotdb] branch tiered_storage updated: fix bug when trasiting status

[xi...@apache.org]

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

xingtanzjr pushed a commit to branch tiered_storage
in repository https://gitbox.apache.org/repos/asf/iotdb.git


The following commit(s) were added to refs/heads/tiered_storage by this push:
     new e5b6d3ec83a fix bug when trasiting status
e5b6d3ec83a is described below

commit e5b6d3ec83a58c0a692922ebf4e269efed1cb87c
Author: Jinrui.Zhang <xi...@gmail.com>
AuthorDate: Wed May 24 22:30:26 2023 +0800

    fix bug when trasiting status
---
 server/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java      | 6 +++---
 .../java/org/apache/iotdb/db/engine/migration/MigrationTask.java    | 1 +
 .../org/apache/iotdb/db/engine/storagegroup/TsFileResource.java     | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/server/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java b/server/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java
index 40a8c3387db..78830e0e417 100644
--- a/server/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java
+++ b/server/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java
@@ -414,13 +414,13 @@ public class IoTDBConfig {
   private int avgSeriesPointNumberThreshold = 100000;
 
   /** Enable inner space compaction for sequence files */
-  private boolean enableSeqSpaceCompaction = false;
+  private boolean enableSeqSpaceCompaction = true;
 
   /** Enable inner space compaction for unsequence files */
-  private boolean enableUnseqSpaceCompaction = false;
+  private boolean enableUnseqSpaceCompaction = true;
 
   /** Compact the unsequence files into the overlapped sequence files */
-  private boolean enableCrossSpaceCompaction = false;
+  private boolean enableCrossSpaceCompaction = true;
 
   /** Enable the service for MLNode */
   private boolean enableMLNodeService = false;
diff --git a/server/src/main/java/org/apache/iotdb/db/engine/migration/MigrationTask.java b/server/src/main/java/org/apache/iotdb/db/engine/migration/MigrationTask.java
index e84a5074803..711bd4048c8 100644
--- a/server/src/main/java/org/apache/iotdb/db/engine/migration/MigrationTask.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/migration/MigrationTask.java
@@ -80,6 +80,7 @@ public abstract class MigrationTask implements Runnable {
       migrate();
     } finally {
       // try to set the final status to NORMAL to avoid migrate failure
+      // TODO: this setting may occur side effects
       tsFileResource.setStatus(TsFileResourceStatus.NORMAL);
     }
   }
diff --git a/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/TsFileResource.java b/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/TsFileResource.java
index 4dc2e1bede7..39254300647 100644
--- a/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/TsFileResource.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/TsFileResource.java
@@ -696,7 +696,7 @@ public class TsFileResource {
         return compareAndSetStatus(
             TsFileResourceStatus.NORMAL, TsFileResourceStatus.COMPACTION_CANDIDATE);
       case MIGRATING:
-        return compareAndSetStatus(TsFileResourceStatus.NORMAL, TsFileResourceStatus.COMPACTING);
+        return compareAndSetStatus(TsFileResourceStatus.NORMAL, TsFileResourceStatus.MIGRATING);
       default:
         return false;
     }