[iotdb] branch master updated: [IOTDB-3422] Fix metric tag in compaction task (#6191)

[rong]

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

rong 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 dc08d01081 [IOTDB-3422] Fix metric tag in compaction task (#6191)
dc08d01081 is described below

commit dc08d01081967fc6f402da5f09acd459dd98f36c
Author: xinzhongtianxia <453935...@qq.com>
AuthorDate: Wed Jun 8 16:41:52 2022 +0800

    [IOTDB-3422] Fix metric tag in compaction task (#6191)
    
    * fix metric name
    
    * compute task cost time before record metrics
    
    Co-authored-by: 还真 <huanzhen...@alibaba-inc.com>
---
 .../org/apache/iotdb/db/engine/compaction/CompactionMetricsManager.java | 2 +-
 .../apache/iotdb/db/engine/compaction/task/AbstractCompactionTask.java  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git 
a/server/src/main/java/org/apache/iotdb/db/engine/compaction/CompactionMetricsManager.java
 
b/server/src/main/java/org/apache/iotdb/db/engine/compaction/CompactionMetricsManager.java
index 9748cd5ccf..3f42678141 100644
--- 
a/server/src/main/java/org/apache/iotdb/db/engine/compaction/CompactionMetricsManager.java
+++ 
b/server/src/main/java/org/apache/iotdb/db/engine/compaction/CompactionMetricsManager.java
@@ -142,7 +142,7 @@ public class CompactionMetricsManager {
                 MetricLevel.IMPORTANT,
                 Tag.NAME.toString(),
                 "compaction",
-                Tag.NAME.toString(),
+                Tag.TYPE.toString(),
                 isInnerTask ? "inner" : "cross");
         if (isInnerTask) {
           MetricsService.getInstance()
diff --git 
a/server/src/main/java/org/apache/iotdb/db/engine/compaction/task/AbstractCompactionTask.java
 
b/server/src/main/java/org/apache/iotdb/db/engine/compaction/task/AbstractCompactionTask.java
index 13d50d3757..e6752b754a 100644
--- 
a/server/src/main/java/org/apache/iotdb/db/engine/compaction/task/AbstractCompactionTask.java
+++ 
b/server/src/main/java/org/apache/iotdb/db/engine/compaction/task/AbstractCompactionTask.java
@@ -81,8 +81,8 @@ public abstract class AbstractCompactionTask implements 
Callable<CompactionTaskS
       LOGGER.error("{} [Compaction] Running compaction task failed", 
fullStorageGroupName, e);
     } finally {
       this.currentTaskNum.decrementAndGet();
-      CompactionTaskManager.getInstance().removeRunningTaskFuture(this);
       timeCost = System.currentTimeMillis() - startTime;
+      CompactionTaskManager.getInstance().removeRunningTaskFuture(this);
       finished = true;
     }
     return new CompactionTaskSummary(isSuccess);