You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ma...@apache.org on 2023/01/09 12:31:53 UTC
[iotdb] 01/01: move the place of setting metrics
This is an automated email from the ASF dual-hosted git repository.
marklau99 pushed a commit to branch IOTDB-5288
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 0812bdd76aa63b2f332a8a24822f461a05aeb913
Author: Liu Xuxin <li...@outlook.com>
AuthorDate: Mon Jan 9 20:31:37 2023 +0800
move the place of setting metrics
---
.../execute/task/CrossSpaceCompactionTask.java | 27 +++++++++++-----------
1 file changed, 14 insertions(+), 13 deletions(-)
diff --git a/server/src/main/java/org/apache/iotdb/db/engine/compaction/execute/task/CrossSpaceCompactionTask.java b/server/src/main/java/org/apache/iotdb/db/engine/compaction/execute/task/CrossSpaceCompactionTask.java
index cf9db3622c..a57aeddb84 100644
--- a/server/src/main/java/org/apache/iotdb/db/engine/compaction/execute/task/CrossSpaceCompactionTask.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/compaction/execute/task/CrossSpaceCompactionTask.java
@@ -184,19 +184,6 @@ public class CrossSpaceCompactionTask extends AbstractCompactionTask {
long sequenceFileSize = deleteOldFiles(selectedSequenceFiles);
long unsequenceFileSize = deleteOldFiles(selectedUnsequenceFiles);
- TsFileMetricManager.getInstance()
- .deleteFile(sequenceFileSize, true, selectedSequenceFiles.size());
- TsFileMetricManager.getInstance()
- .deleteFile(unsequenceFileSize, false, selectedUnsequenceFiles.size());
-
- for (TsFileResource targetResource : targetTsfileResourceList) {
- if (targetResource != null) {
- TsFileMetricManager.getInstance().addFile(targetResource.getTsFileSize(), true);
-
- // set target resources to CLOSED, so that they can be selected to compact
- targetResource.setStatus(TsFileResourceStatus.CLOSED);
- }
- }
CompactionUtils.deleteCompactionModsFile(selectedSequenceFiles, selectedUnsequenceFiles);
@@ -216,6 +203,20 @@ public class CrossSpaceCompactionTask extends AbstractCompactionTask {
subTaskSummary.PAGE_OVERLAP_OR_MODIFIED,
subTaskSummary.PAGE_FAKE_OVERLAP);
}
+
+ // update the metrics finally in case of any exception occurs
+ TsFileMetricManager.getInstance()
+ .deleteFile(sequenceFileSize, true, selectedSequenceFiles.size());
+ TsFileMetricManager.getInstance()
+ .deleteFile(unsequenceFileSize, false, selectedUnsequenceFiles.size());
+ for (TsFileResource targetResource : targetTsfileResourceList) {
+ if (targetResource != null) {
+ TsFileMetricManager.getInstance().addFile(targetResource.getTsFileSize(), true);
+
+ // set target resources to CLOSED, so that they can be selected to compact
+ targetResource.setStatus(TsFileResourceStatus.CLOSED);
+ }
+ }
long costTime = (System.currentTimeMillis() - startTime) / 1000;
LOGGER.info(
"{}-{} [Compaction] CrossSpaceCompaction task finishes successfully, time cost is {} s, compaction speed is {} MB/s",