[iotdb] branch rel/0.13 updated: Fix InnerSpaceCompactionExceptionTest (#6641)

[ma...@apache.org]

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

marklau99 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 a04a1b5a9a Fix InnerSpaceCompactionExceptionTest (#6641)
a04a1b5a9a is described below

commit a04a1b5a9a7c6f004b47e38cddd9d52a0a79301e
Author: Liu Xuxin <37...@users.noreply.github.com>
AuthorDate: Tue Jul 12 18:34:50 2022 +0800

    Fix InnerSpaceCompactionExceptionTest (#6641)
---
 .../engine/compaction/inner/InnerSpaceCompactionExceptionHandler.java  | 3 ---
 .../apache/iotdb/db/engine/compaction/task/CompactionRecoverTask.java  | 1 -
 .../db/engine/compaction/inner/InnerSpaceCompactionExceptionTest.java  | 3 ---
 3 files changed, 7 deletions(-)

diff --git a/server/src/main/java/org/apache/iotdb/db/engine/compaction/inner/InnerSpaceCompactionExceptionHandler.java b/server/src/main/java/org/apache/iotdb/db/engine/compaction/inner/InnerSpaceCompactionExceptionHandler.java
index 5478e21438..0c0f9810de 100644
--- a/server/src/main/java/org/apache/iotdb/db/engine/compaction/inner/InnerSpaceCompactionExceptionHandler.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/compaction/inner/InnerSpaceCompactionExceptionHandler.java
@@ -19,7 +19,6 @@
 package org.apache.iotdb.db.engine.compaction.inner;
 
 import org.apache.iotdb.db.conf.IoTDBConstant;
-import org.apache.iotdb.db.conf.IoTDBDescriptor;
 import org.apache.iotdb.db.engine.compaction.CompactionUtils;
 import org.apache.iotdb.db.engine.storagegroup.TsFileManager;
 import org.apache.iotdb.db.engine.storagegroup.TsFileResource;
@@ -93,7 +92,6 @@ public class InnerSpaceCompactionExceptionHandler {
             "{} [Compaction][ExceptionHandler] target file {} does not exist either, do nothing. Set system to read-only",
             fullStorageGroupName,
             targetTsFile);
-        IoTDBDescriptor.getInstance().getConfig().setReadOnly(true);
         handleSuccess = false;
       } else {
         handleSuccess =
@@ -261,7 +259,6 @@ public class InnerSpaceCompactionExceptionHandler {
             fullStorageGroupName,
             targetTsFile,
             lostSourceFiles);
-        IoTDBDescriptor.getInstance().getConfig().setReadOnly(true);
         handleSuccess = false;
       }
     } catch (Throwable e) {
diff --git a/server/src/main/java/org/apache/iotdb/db/engine/compaction/task/CompactionRecoverTask.java b/server/src/main/java/org/apache/iotdb/db/engine/compaction/task/CompactionRecoverTask.java
index af306c1127..9af0f4d6ae 100644
--- a/server/src/main/java/org/apache/iotdb/db/engine/compaction/task/CompactionRecoverTask.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/compaction/task/CompactionRecoverTask.java
@@ -301,7 +301,6 @@ public class CompactionRecoverTask {
             "{} [Compaction][ExceptionHandler] target file {} is not complete, and some source files is lost, do nothing. Set allowCompaction to false",
             fullStorageGroupName,
             targetFileIdentifier.getFilePath());
-        IoTDBDescriptor.getInstance().getConfig().setReadOnly(true);
         return false;
       }
     }
diff --git a/server/src/test/java/org/apache/iotdb/db/engine/compaction/inner/InnerSpaceCompactionExceptionTest.java b/server/src/test/java/org/apache/iotdb/db/engine/compaction/inner/InnerSpaceCompactionExceptionTest.java
index 541e18309c..c9b49a6138 100644
--- a/server/src/test/java/org/apache/iotdb/db/engine/compaction/inner/InnerSpaceCompactionExceptionTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/engine/compaction/inner/InnerSpaceCompactionExceptionTest.java
@@ -18,7 +18,6 @@
  */
 package org.apache.iotdb.db.engine.compaction.inner;
 
-import org.apache.iotdb.db.conf.IoTDBDescriptor;
 import org.apache.iotdb.db.engine.compaction.inner.utils.InnerSpaceCompactionUtils;
 import org.apache.iotdb.db.engine.compaction.task.CompactionExceptionHandler;
 import org.apache.iotdb.db.engine.compaction.utils.CompactionFileGeneratorUtils;
@@ -239,8 +238,6 @@ public class InnerSpaceCompactionExceptionTest extends AbstractInnerSpaceCompact
     }
 
     Assert.assertFalse(tsFileManager.isAllowCompaction());
-    Assert.assertTrue(IoTDBDescriptor.getInstance().getConfig().isReadOnly());
-    IoTDBDescriptor.getInstance().getConfig().setReadOnly(false);
   }
 
   /**