You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by fa...@apache.org on 2024/07/08 09:46:31 UTC
(flink) branch release-1.19 updated: [FLINK-35750][runtime/metrics] Fix that the latency marker metrics aren't updated after failover.
This is an automated email from the ASF dual-hosted git repository.
fanrui pushed a commit to branch release-1.19
in repository https://gitbox.apache.org/repos/asf/flink.git
The following commit(s) were added to refs/heads/release-1.19 by this push:
new 040343f0511 [FLINK-35750][runtime/metrics] Fix that the latency marker metrics aren't updated after failover.
040343f0511 is described below
commit 040343f05114cae72fba9f9551401e81c974a83c
Author: Roc Marshal <fl...@126.com>
AuthorDate: Thu Jul 4 13:08:51 2024 +0800
[FLINK-35750][runtime/metrics] Fix that the latency marker metrics aren't updated after failover.
(cherry picked from commit 615d19735b0691b57262a110e6078c3488349f5a)
---
.../flink/runtime/metrics/groups/InternalOperatorMetricGroup.java | 4 ++--
.../flink/streaming/api/operators/AbstractStreamOperator.java | 6 +++---
.../flink/streaming/api/operators/AbstractStreamOperatorV2.java | 6 +++---
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/metrics/groups/InternalOperatorMetricGroup.java b/flink-runtime/src/main/java/org/apache/flink/runtime/metrics/groups/InternalOperatorMetricGroup.java
index d075675b80c..22bfecf1deb 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/metrics/groups/InternalOperatorMetricGroup.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/metrics/groups/InternalOperatorMetricGroup.java
@@ -64,8 +64,8 @@ public class InternalOperatorMetricGroup extends ComponentMetricGroup<TaskMetric
return parent.getIOMetricGroup();
}
- public final MetricGroup getJobMetricGroup() {
- return parent.parent;
+ public final MetricGroup getTaskMetricGroup() {
+ return parent;
}
@Override
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/AbstractStreamOperator.java b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/AbstractStreamOperator.java
index 632b89b16ae..d3e15b3ae6f 100644
--- a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/AbstractStreamOperator.java
+++ b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/AbstractStreamOperator.java
@@ -201,10 +201,10 @@ public abstract class AbstractStreamOperator<OUT>
MetricOptions.LATENCY_SOURCE_GRANULARITY.key(),
granularity);
}
- MetricGroup jobMetricGroup = this.metrics.getJobMetricGroup();
+ MetricGroup taskMetricGroup = this.metrics.getTaskMetricGroup();
this.latencyStats =
new LatencyStats(
- jobMetricGroup.addGroup("latency"),
+ taskMetricGroup.addGroup("latency"),
historySize,
container.getIndexInSubtaskGroup(),
getOperatorID(),
@@ -213,7 +213,7 @@ public abstract class AbstractStreamOperator<OUT>
LOG.warn("An error occurred while instantiating latency metrics.", e);
this.latencyStats =
new LatencyStats(
- UnregisteredMetricGroups.createUnregisteredTaskManagerJobMetricGroup()
+ UnregisteredMetricGroups.createUnregisteredTaskMetricGroup()
.addGroup("latency"),
1,
0,
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/AbstractStreamOperatorV2.java b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/AbstractStreamOperatorV2.java
index c16e5f85d4e..0e31ea827e2 100644
--- a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/AbstractStreamOperatorV2.java
+++ b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/AbstractStreamOperatorV2.java
@@ -165,9 +165,9 @@ public abstract class AbstractStreamOperatorV2<OUT>
MetricOptions.LATENCY_SOURCE_GRANULARITY.key(),
granularity);
}
- MetricGroup jobMetricGroup = this.metrics.getJobMetricGroup();
+ MetricGroup taskMetricGroup = this.metrics.getTaskMetricGroup();
return new LatencyStats(
- jobMetricGroup.addGroup("latency"),
+ taskMetricGroup.addGroup("latency"),
historySize,
indexInSubtaskGroup,
getOperatorID(),
@@ -175,7 +175,7 @@ public abstract class AbstractStreamOperatorV2<OUT>
} catch (Exception e) {
LOG.warn("An error occurred while instantiating latency metrics.", e);
return new LatencyStats(
- UnregisteredMetricGroups.createUnregisteredTaskManagerJobMetricGroup()
+ UnregisteredMetricGroups.createUnregisteredTaskMetricGroup()
.addGroup("latency"),
1,
0,