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 5a374abe054 Pipe: Fix PIPE_DATANODE_REMAINING_EVENT_COUNT is not
removed & some legacy metric still exists (#12836)
5a374abe054 is described below
commit 5a374abe054e2c705a86bb071cc2ff5973460043
Author: Caideyipi <[email protected]>
AuthorDate: Tue Jul 2 15:12:09 2024 +0800
Pipe: Fix PIPE_DATANODE_REMAINING_EVENT_COUNT is not removed & some legacy
metric still exists (#12836)
---
.../PipeDataNodeRemainingEventAndTimeMetrics.java | 7 ++++
.../iotdb/db/pipe/metric/PipeProcessorMetrics.java | 37 +---------------------
.../subtask/processor/PipeProcessorSubtask.java | 1 +
.../iotdb/commons/service/metric/enums/Metric.java | 3 --
4 files changed, 9 insertions(+), 39 deletions(-)
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/metric/PipeDataNodeRemainingEventAndTimeMetrics.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/metric/PipeDataNodeRemainingEventAndTimeMetrics.java
index 3daebdf0d84..2e8bf3c490b 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/metric/PipeDataNodeRemainingEventAndTimeMetrics.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/metric/PipeDataNodeRemainingEventAndTimeMetrics.java
@@ -101,6 +101,13 @@ public class PipeDataNodeRemainingEventAndTimeMetrics
implements IMetricSet {
private void removeAutoGauge(final String pipeID) {
final PipeDataNodeRemainingEventAndTimeOperator operator =
remainingEventAndTimeOperatorMap.get(pipeID);
+ metricService.remove(
+ MetricType.AUTO_GAUGE,
+ Metric.PIPE_DATANODE_REMAINING_EVENT_COUNT.toString(),
+ Tag.NAME.toString(),
+ operator.getPipeName(),
+ Tag.CREATION_TIME.toString(),
+ String.valueOf(operator.getCreationTime()));
metricService.remove(
MetricType.AUTO_GAUGE,
Metric.PIPE_DATANODE_REMAINING_TIME.toString(),
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/metric/PipeProcessorMetrics.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/metric/PipeProcessorMetrics.java
index 7f6697430bd..70ddf1d24af 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/metric/PipeProcessorMetrics.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/metric/PipeProcessorMetrics.java
@@ -117,42 +117,9 @@ public class PipeProcessorMetrics implements IMetricSet {
}
private void removeMetrics(final String taskID) {
- removeAutoGauge(taskID);
removeRate(taskID);
}
- private void removeAutoGauge(final String taskID) {
- PipeProcessorSubtask processor = processorMap.get(taskID);
- // pending event count
- metricService.remove(
- MetricType.AUTO_GAUGE,
- Metric.BUFFERED_TABLET_COUNT.toString(),
- Tag.NAME.toString(),
- processor.getPipeName(),
- Tag.REGION.toString(),
- String.valueOf(processor.getRegionId()),
- Tag.CREATION_TIME.toString(),
- String.valueOf(processor.getCreationTime()));
- metricService.remove(
- MetricType.AUTO_GAUGE,
- Metric.BUFFERED_TSFILE_COUNT.toString(),
- Tag.NAME.toString(),
- processor.getPipeName(),
- Tag.REGION.toString(),
- String.valueOf(processor.getRegionId()),
- Tag.CREATION_TIME.toString(),
- String.valueOf(processor.getCreationTime()));
- metricService.remove(
- MetricType.AUTO_GAUGE,
- Metric.BUFFERED_HEARTBEAT_COUNT.toString(),
- Tag.NAME.toString(),
- processor.getPipeName(),
- Tag.REGION.toString(),
- String.valueOf(processor.getRegionId()),
- Tag.CREATION_TIME.toString(),
- String.valueOf(processor.getCreationTime()));
- }
-
private void removeRate(final String taskID) {
PipeProcessorSubtask processor = processorMap.get(taskID);
// process event rate
@@ -200,9 +167,7 @@ public class PipeProcessorMetrics implements IMetricSet {
public void deregister(final String taskID) {
if (!processorMap.containsKey(taskID)) {
- LOGGER.warn(
- "Failed to deregister pipe processor metrics,
PipeProcessorSubtask({}) does not exist",
- taskID);
+ // Allow calls from schema region tasks
return;
}
if (Objects.nonNull(metricService)) {
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/task/subtask/processor/PipeProcessorSubtask.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/task/subtask/processor/PipeProcessorSubtask.java
index 8532c29c202..812b47a978a 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/task/subtask/processor/PipeProcessorSubtask.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/task/subtask/processor/PipeProcessorSubtask.java
@@ -221,6 +221,7 @@ public class PipeProcessorSubtask extends
PipeReportableSubtask {
@Override
public void close() {
+ // Always deregister the metrics to avoid the deletion of the data region
PipeProcessorMetrics.getInstance().deregister(taskID);
try {
isClosed.set(true);
diff --git
a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/service/metric/enums/Metric.java
b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/service/metric/enums/Metric.java
index 7a2068a0a90..fe7033c88c1 100644
---
a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/service/metric/enums/Metric.java
+++
b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/service/metric/enums/Metric.java
@@ -130,9 +130,6 @@ public enum Metric {
UNPROCESSED_HISTORICAL_TSFILE_COUNT("unprocessed_historical_tsfile_count"),
UNPROCESSED_REALTIME_TSFILE_COUNT("unprocessed_realtime_tsfile_count"),
UNPROCESSED_HEARTBEAT_COUNT("unprocessed_heartbeat_count"),
- BUFFERED_TABLET_COUNT("buffered_tablet_count"),
- BUFFERED_TSFILE_COUNT("buffered_tsfile_count"),
- BUFFERED_HEARTBEAT_COUNT("buffered_heartbeat_count"),
UNTRANSFERRED_TABLET_COUNT("untransferred_tablet_count"),
UNTRANSFERRED_TSFILE_COUNT("untransferred_tsfile_count"),
UNTRANSFERRED_HEARTBEAT_COUNT("untransferred_heartbeat_count"),
