You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ja...@apache.org on 2025/09/23 11:26:53 UTC

(iotdb) branch dev/1.3 updated: [To dev/1.3] Fix Metric name

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

jackietien pushed a commit to branch dev/1.3
in repository https://gitbox.apache.org/repos/asf/iotdb.git


The following commit(s) were added to refs/heads/dev/1.3 by this push:
     new fd3d7cb2e44 [To dev/1.3] Fix Metric name
fd3d7cb2e44 is described below

commit fd3d7cb2e44473d718ba1d1c30245673026a1272
Author: Jackie Tien <ja...@gmail.com>
AuthorDate: Tue Sep 23 19:26:48 2025 +0800

    [To dev/1.3] Fix Metric name
---
 .../execution/fragment/FragmentInstanceManager.java  |  4 ++--
 .../schedule/queue/IndexedBlockingReserveQueue.java  |  3 +--
 .../queryengine/metric/DriverSchedulerMetricSet.java | 20 ++++++++++----------
 3 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/fragment/FragmentInstanceManager.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/fragment/FragmentInstanceManager.java
index 5cb43d86bc0..9a2657101e7 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/fragment/FragmentInstanceManager.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/fragment/FragmentInstanceManager.java
@@ -189,7 +189,6 @@ public class FragmentInstanceManager {
                       instance.isExplainAnalyze(),
                       exchangeManager);
                 } catch (Throwable t) {
-                  clearFIRelatedResources(instanceId);
                   // deal with
                   if (t instanceof IllegalStateException
                       && TOO_MANY_CONCURRENT_QUERIES_ERROR_MSG.equals(t.getMessage())) {
@@ -202,6 +201,7 @@ public class FragmentInstanceManager {
                     logger.warn("error when create FragmentInstanceExecution.", t);
                     stateMachine.failed(t);
                   }
+                  clearFIRelatedResources(instanceId);
                   return null;
                 }
               });
@@ -280,7 +280,6 @@ public class FragmentInstanceManager {
                     false,
                     exchangeManager);
               } catch (Throwable t) {
-                clearFIRelatedResources(instanceId);
                 // deal with
                 if (t instanceof IllegalStateException
                     && TOO_MANY_CONCURRENT_QUERIES_ERROR_MSG.equals(t.getMessage())) {
@@ -293,6 +292,7 @@ public class FragmentInstanceManager {
                   logger.warn("Execute error caused by ", t);
                   stateMachine.failed(t);
                 }
+                clearFIRelatedResources(instanceId);
                 return null;
               }
             });
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/schedule/queue/IndexedBlockingReserveQueue.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/schedule/queue/IndexedBlockingReserveQueue.java
index ac54287bd42..1891fb63556 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/schedule/queue/IndexedBlockingReserveQueue.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/schedule/queue/IndexedBlockingReserveQueue.java
@@ -54,8 +54,7 @@ public abstract class IndexedBlockingReserveQueue<E extends IDIndexedAccessible>
     if (element == null) {
       throw new NullPointerException("pushed element is null");
     }
-    Preconditions.checkState(
-        size + reservedSize < capacity, "The system can't allow more query tasks.");
+    Preconditions.checkState(size + reservedSize < capacity, TOO_MANY_CONCURRENT_QUERIES_ERROR_MSG);
     pushToQueue(element);
     size++;
     this.notifyAll();
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/metric/DriverSchedulerMetricSet.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/metric/DriverSchedulerMetricSet.java
index a6915bf93bb..0b9e0c04f05 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/metric/DriverSchedulerMetricSet.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/metric/DriverSchedulerMetricSet.java
@@ -88,16 +88,6 @@ public class DriverSchedulerMetricSet implements IMetricSet {
         DriverScheduler::getQueryMapSize,
         Tag.NAME.toString(),
         QUERY_MAP_SIZE);
-    metricService.remove(
-        MetricType.AUTO_GAUGE,
-        Metric.DRIVER_SCHEDULER.toString(),
-        Tag.NAME.toString(),
-        TIMEOUT_QUEUE_SIZE);
-    metricService.remove(
-        MetricType.AUTO_GAUGE,
-        Metric.DRIVER_SCHEDULER.toString(),
-        Tag.NAME.toString(),
-        QUERY_MAP_SIZE);
   }
 
   @Override
@@ -124,6 +114,16 @@ public class DriverSchedulerMetricSet implements IMetricSet {
         Metric.DRIVER_SCHEDULER.toString(),
         Tag.NAME.toString(),
         BLOCK_QUEUE_TASK_COUNT);
+    metricService.remove(
+        MetricType.AUTO_GAUGE,
+        Metric.DRIVER_SCHEDULER.toString(),
+        Tag.NAME.toString(),
+        TIMEOUT_QUEUE_SIZE);
+    metricService.remove(
+        MetricType.AUTO_GAUGE,
+        Metric.DRIVER_SCHEDULER.toString(),
+        Tag.NAME.toString(),
+        QUERY_MAP_SIZE);
   }
 
   public void recordTaskQueueTime(String name, long queueTimeInNanos) {