[iotdb] branch rel/0.13 updated: [To rel/0.13][IOTDB-4554] Start compaction only when IoTDB is fully recovered (#7476)

[qiaojialin]

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

qiaojialin pushed a commit to branch rel/0.13
in repository https://gitbox.apache.org/repos/asf/iotdb.git


The following commit(s) were added to refs/heads/rel/0.13 by this push:
     new ee597b9df3 [To rel/0.13][IOTDB-4554] Start compaction only when IoTDB 
is fully recovered (#7476)
ee597b9df3 is described below

commit ee597b9df38cf9355fdaebe1d3070eff659c8ccb
Author: Liu Xuxin <37140360+thumark...@users.noreply.github.com>
AuthorDate: Thu Sep 29 09:01:53 2022 +0800

    [To rel/0.13][IOTDB-4554] Start compaction only when IoTDB is fully 
recovered (#7476)
---
 .../org/apache/iotdb/db/engine/compaction/CompactionTaskManager.java  | 4 +++-
 .../java/org/apache/iotdb/db/engine/compaction/CompactionUtils.java   | 2 +-
 .../db/engine/compaction/inner/utils/InnerSpaceCompactionUtils.java   | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git 
a/server/src/main/java/org/apache/iotdb/db/engine/compaction/CompactionTaskManager.java
 
b/server/src/main/java/org/apache/iotdb/db/engine/compaction/CompactionTaskManager.java
index 117aee27ab..070f0224d1 100644
--- 
a/server/src/main/java/org/apache/iotdb/db/engine/compaction/CompactionTaskManager.java
+++ 
b/server/src/main/java/org/apache/iotdb/db/engine/compaction/CompactionTaskManager.java
@@ -29,6 +29,7 @@ import 
org.apache.iotdb.db.engine.compaction.constant.CompactionTaskStatus;
 import org.apache.iotdb.db.engine.compaction.task.AbstractCompactionTask;
 import org.apache.iotdb.db.engine.compaction.task.CompactionTaskSummary;
 import org.apache.iotdb.db.service.IService;
+import org.apache.iotdb.db.service.IoTDB;
 import org.apache.iotdb.db.service.ServiceType;
 import org.apache.iotdb.db.utils.TestOnly;
 import org.apache.iotdb.db.utils.datastructure.FixedPriorityBlockingQueue;
@@ -248,7 +249,8 @@ public class CompactionTaskManager implements IService {
    */
   public synchronized void submitTaskFromTaskQueue() {
     try {
-      while (currentTaskNum.get()
+      while (IoTDB.activated
+          && currentTaskNum.get()
               < 
IoTDBDescriptor.getInstance().getConfig().getConcurrentCompactionThread()
           && !candidateCompactionTaskQueue.isEmpty()) {
         AbstractCompactionTask task = candidateCompactionTaskQueue.take();
diff --git 
a/server/src/main/java/org/apache/iotdb/db/engine/compaction/CompactionUtils.java
 
b/server/src/main/java/org/apache/iotdb/db/engine/compaction/CompactionUtils.java
index d8b081c649..97bcff78ff 100644
--- 
a/server/src/main/java/org/apache/iotdb/db/engine/compaction/CompactionUtils.java
+++ 
b/server/src/main/java/org/apache/iotdb/db/engine/compaction/CompactionUtils.java
@@ -417,7 +417,7 @@ public class CompactionUtils {
 
   private static void checkThreadInterrupted(List<TsFileResource> 
tsFileResource)
       throws InterruptedException {
-    if (Thread.currentThread().isInterrupted() || !IoTDB.activated) {
+    if (Thread.interrupted() || !IoTDB.activated) {
       throw new InterruptedException(
           String.format(
               "[Compaction] compaction for target file %s abort", 
tsFileResource.toString()));
diff --git 
a/server/src/main/java/org/apache/iotdb/db/engine/compaction/inner/utils/InnerSpaceCompactionUtils.java
 
b/server/src/main/java/org/apache/iotdb/db/engine/compaction/inner/utils/InnerSpaceCompactionUtils.java
index e7590e5589..06004c9c6e 100644
--- 
a/server/src/main/java/org/apache/iotdb/db/engine/compaction/inner/utils/InnerSpaceCompactionUtils.java
+++ 
b/server/src/main/java/org/apache/iotdb/db/engine/compaction/inner/utils/InnerSpaceCompactionUtils.java
@@ -90,7 +90,7 @@ public class InnerSpaceCompactionUtils {
 
   private static void checkThreadInterrupted(TsFileResource tsFileResource)
       throws InterruptedException {
-    if (Thread.currentThread().isInterrupted() || !IoTDB.activated) {
+    if (Thread.interrupted() || !IoTDB.activated) {
       throw new InterruptedException(
           String.format(
               "[Compaction] compaction for target file %s abort", 
tsFileResource.toString()));