[iotdb] branch IOTDB-5288 updated: edit the metrics in the end of compaction

[marklau99]

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


The following commit(s) were added to refs/heads/IOTDB-5288 by this push:
     new 07edcc5d9a edit the metrics in the end of compaction
07edcc5d9a is described below

commit 07edcc5d9a24b2385c9693630e7062a120c9a937
Author: Liu Xuxin <liuxu...@outlook.com>
AuthorDate: Tue Jan 10 12:30:10 2023 +0800

    edit the metrics in the end of compaction
---
 .../execute/task/CrossSpaceCompactionTask.java     |  8 +++---
 .../execute/task/InnerSpaceCompactionTask.java     | 29 +++++++++++-----------
 2 files changed, 19 insertions(+), 18 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 a57aeddb84..21401ef335 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
@@ -205,10 +205,6 @@ public class CrossSpaceCompactionTask extends 
AbstractCompactionTask {
         }
 
         // 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);
@@ -217,6 +213,10 @@ public class CrossSpaceCompactionTask extends 
AbstractCompactionTask {
             targetResource.setStatus(TsFileResourceStatus.CLOSED);
           }
         }
+        TsFileMetricManager.getInstance()
+            .deleteFile(sequenceFileSize, true, selectedSequenceFiles.size());
+        TsFileMetricManager.getInstance()
+            .deleteFile(unsequenceFileSize, false, 
selectedUnsequenceFiles.size());
         long costTime = (System.currentTimeMillis() - startTime) / 1000;
         LOGGER.info(
             "{}-{} [Compaction] CrossSpaceCompaction task finishes 
successfully, time cost is {} s, compaction speed is {} MB/s",
diff --git 
a/server/src/main/java/org/apache/iotdb/db/engine/compaction/execute/task/InnerSpaceCompactionTask.java
 
b/server/src/main/java/org/apache/iotdb/db/engine/compaction/execute/task/InnerSpaceCompactionTask.java
index fccd39b781..b8406abc00 100644
--- 
a/server/src/main/java/org/apache/iotdb/db/engine/compaction/execute/task/InnerSpaceCompactionTask.java
+++ 
b/server/src/main/java/org/apache/iotdb/db/engine/compaction/execute/task/InnerSpaceCompactionTask.java
@@ -223,16 +223,6 @@ public class InnerSpaceCompactionTask extends 
AbstractCompactionTask {
           selectedTsFileResourceList, storageGroupName + "-" + dataRegionId);
       CompactionUtils.deleteModificationForSourceFile(
           selectedTsFileResourceList, storageGroupName + "-" + dataRegionId);
-      TsFileMetricManager.getInstance()
-          .deleteFile(totalSizeOfDeletedFile, sequence, 
selectedTsFileResourceList.size());
-      // inner space compaction task has only one target file
-      if (targetTsFileList.get(0) != null) {
-        TsFileMetricManager.getInstance()
-            .addFile(targetTsFileList.get(0).getTsFile().length(), sequence);
-
-        // set target resources to CLOSED, so that they can be selected to 
compact
-        targetTsFileList.get(0).setStatus(TsFileResourceStatus.CLOSED);
-      }
 
       if (performer instanceof FastCompactionPerformer) {
         SubCompactionTaskSummary subTaskSummary =
@@ -248,6 +238,21 @@ public class InnerSpaceCompactionTask extends 
AbstractCompactionTask {
             subTaskSummary.PAGE_FAKE_OVERLAP);
       }
 
+      if (logFile.exists()) {
+        FileUtils.delete(logFile);
+      }
+
+      // inner space compaction task has only one target file
+      if (targetTsFileList.get(0) != null) {
+        TsFileMetricManager.getInstance()
+            .addFile(targetTsFileList.get(0).getTsFile().length(), sequence);
+
+        // set target resources to CLOSED, so that they can be selected to 
compact
+        targetTsFileList.get(0).setStatus(TsFileResourceStatus.CLOSED);
+      }
+      TsFileMetricManager.getInstance()
+          .deleteFile(totalSizeOfDeletedFile, sequence, 
selectedTsFileResourceList.size());
+
       double costTime = (System.currentTimeMillis() - startTime) / 1000.0d;
       LOGGER.info(
           "{}-{} [Compaction] InnerSpaceCompaction task finishes successfully, 
target file is {},"
@@ -257,10 +262,6 @@ public class InnerSpaceCompactionTask extends 
AbstractCompactionTask {
           targetTsFileResource.getTsFile().getName(),
           costTime,
           selectedFileSize / 1024.0d / 1024.0d / costTime);
-
-      if (logFile.exists()) {
-        FileUtils.delete(logFile);
-      }
     } catch (Throwable throwable) {
       // catch throwable to handle OOM errors
       if (!(throwable instanceof InterruptedException)) {