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 03:37:57 UTC
(iotdb) branch ty/correctMetric-1.3 created (now d1ff27129d5)
This is an automated email from the ASF dual-hosted git repository.
jackietien pushed a change to branch ty/correctMetric-1.3
in repository https://gitbox.apache.org/repos/asf/iotdb.git
at d1ff27129d5 [To dev/1.3] Fix Metric name
This branch includes the following new commits:
new 4d317c69902 Fix some metrics
new d1ff27129d5 [To dev/1.3] Fix Metric name
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
(iotdb) 01/02: Fix some metrics
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jackietien pushed a commit to branch ty/correctMetric-1.3
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 4d317c69902e83b731cb293968b77250da71b165
Author: JackieTien97 <ja...@gmail.com>
AuthorDate: Tue Sep 23 11:32:14 2025 +0800
Fix some metrics
---
.../schedule/queue/IndexedBlockingReserveQueue.java | 3 +--
.../queryengine/metric/DriverSchedulerMetricSet.java | 20 ++++++++++----------
2 files changed, 11 insertions(+), 12 deletions(-)
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) {
(iotdb) 02/02: [To dev/1.3] Fix Metric name
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jackietien pushed a commit to branch ty/correctMetric-1.3
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit d1ff27129d5c7d140171fa9c1595da96028d1b7b
Author: JackieTien97 <ja...@gmail.com>
AuthorDate: Tue Sep 23 11:37:41 2025 +0800
[To dev/1.3] Fix Metric name
---
.../db/queryengine/execution/fragment/FragmentInstanceManager.java | 4 ++--
1 file changed, 2 insertions(+), 2 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;
}
});