You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ha...@apache.org on 2024/01/11 02:18:54 UTC
(iotdb) branch master updated: set status of compaction target file to NORMAL after delete compaction log file (#11551)
This is an automated email from the ASF dual-hosted git repository.
haonan 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 97af4d47101 set status of compaction target file to NORMAL after delete compaction log file (#11551)
97af4d47101 is described below
commit 97af4d4710186175ff858c625aa5084a1f15ddec
Author: shuwenwei <55...@users.noreply.github.com>
AuthorDate: Thu Jan 11 10:18:48 2024 +0800
set status of compaction target file to NORMAL after delete compaction log file (#11551)
---
.../compaction/execute/task/CrossSpaceCompactionTask.java | 6 ++++--
.../compaction/execute/task/InnerSpaceCompactionTask.java | 5 ++---
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/compaction/execute/task/CrossSpaceCompactionTask.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/compaction/execute/task/CrossSpaceCompactionTask.java
index 3c9cdee87ae..f5a4071503a 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/compaction/execute/task/CrossSpaceCompactionTask.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/compaction/execute/task/CrossSpaceCompactionTask.java
@@ -248,8 +248,6 @@ public class CrossSpaceCompactionTask extends AbstractCompactionTask {
true,
targetResource.getTsFile().getName());
- // set target resources to CLOSED, so that they can be selected to compact
- targetResource.setStatus(TsFileResourceStatus.NORMAL);
} else {
// target resource is empty after compaction, then delete it
targetResource.remove();
@@ -273,6 +271,10 @@ public class CrossSpaceCompactionTask extends AbstractCompactionTask {
summary);
} finally {
Files.deleteIfExists(logFile.toPath());
+ for (TsFileResource resource : targetTsfileResourceList) {
+ // may failed to set status if the status of current resource is DELETED
+ resource.setStatus(TsFileResourceStatus.NORMAL);
+ }
}
} catch (Exception e) {
isSuccess = false;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/compaction/execute/task/InnerSpaceCompactionTask.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/compaction/execute/task/InnerSpaceCompactionTask.java
index 3d27622cf56..503894f9869 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/compaction/execute/task/InnerSpaceCompactionTask.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/compaction/execute/task/InnerSpaceCompactionTask.java
@@ -277,9 +277,6 @@ public class InnerSpaceCompactionTask extends AbstractCompactionTask {
targetTsFileResource.getTsFile().length(),
sequence,
targetTsFileResource.getTsFile().getName());
-
- // set target resource to CLOSED, so that it can be selected to compact
- targetTsFileResource.setStatus(TsFileResourceStatus.NORMAL);
} else {
// target resource is empty after compaction, then delete it
targetTsFileResource.remove();
@@ -301,6 +298,8 @@ public class InnerSpaceCompactionTask extends AbstractCompactionTask {
summary);
} finally {
Files.deleteIfExists(logFile.toPath());
+ // may failed to set status if the status of target resource is DELETED
+ targetTsFileResource.setStatus(TsFileResourceStatus.NORMAL);
}
} catch (Exception e) {
isSuccess = false;