You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by ch...@apache.org on 2021/11/22 21:37:55 UTC
[flink] 02/03: [hotfix] Remove MetricGroup parameter from EG builder
This is an automated email from the ASF dual-hosted git repository.
chesnay pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git
commit fc37f0f2d9108d618be5beed57a073d6205104a3
Author: Chesnay Schepler <ch...@apache.org>
AuthorDate: Mon Nov 8 15:14:59 2021 +0100
[hotfix] Remove MetricGroup parameter from EG builder
---
.../runtime/executiongraph/DefaultExecutionGraphBuilder.java | 2 --
.../flink/runtime/scheduler/DefaultExecutionGraphFactory.java | 1 -
.../executiongraph/TestingDefaultExecutionGraphBuilder.java | 8 --------
3 files changed, 11 deletions(-)
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/executiongraph/DefaultExecutionGraphBuilder.java b/flink-runtime/src/main/java/org/apache/flink/runtime/executiongraph/DefaultExecutionGraphBuilder.java
index ff1af8f..35c5837 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/executiongraph/DefaultExecutionGraphBuilder.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/executiongraph/DefaultExecutionGraphBuilder.java
@@ -23,7 +23,6 @@ import org.apache.flink.api.common.time.Time;
import org.apache.flink.configuration.Configuration;
import org.apache.flink.configuration.IllegalConfigurationException;
import org.apache.flink.configuration.JobManagerOptions;
-import org.apache.flink.metrics.MetricGroup;
import org.apache.flink.runtime.JobException;
import org.apache.flink.runtime.blob.BlobWriter;
import org.apache.flink.runtime.checkpoint.CheckpointIDCounter;
@@ -80,7 +79,6 @@ public class DefaultExecutionGraphBuilder {
CheckpointsCleaner checkpointsCleaner,
CheckpointIDCounter checkpointIdCounter,
Time rpcTimeout,
- MetricGroup metrics,
BlobWriter blobWriter,
Logger log,
ShuffleMaster<?> shuffleMaster,
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/scheduler/DefaultExecutionGraphFactory.java b/flink-runtime/src/main/java/org/apache/flink/runtime/scheduler/DefaultExecutionGraphFactory.java
index 0f49909..8284572 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/scheduler/DefaultExecutionGraphFactory.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/scheduler/DefaultExecutionGraphFactory.java
@@ -126,7 +126,6 @@ public class DefaultExecutionGraphFactory implements ExecutionGraphFactory {
checkpointsCleaner,
checkpointIdCounter,
rpcTimeout,
- jobManagerJobMetricGroup,
blobWriter,
log,
shuffleMaster,
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/executiongraph/TestingDefaultExecutionGraphBuilder.java b/flink-runtime/src/test/java/org/apache/flink/runtime/executiongraph/TestingDefaultExecutionGraphBuilder.java
index edf85c4..5842208 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/executiongraph/TestingDefaultExecutionGraphBuilder.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/executiongraph/TestingDefaultExecutionGraphBuilder.java
@@ -21,7 +21,6 @@ package org.apache.flink.runtime.executiongraph;
import org.apache.flink.api.common.time.Time;
import org.apache.flink.configuration.AkkaOptions;
import org.apache.flink.configuration.Configuration;
-import org.apache.flink.metrics.MetricGroup;
import org.apache.flink.metrics.groups.UnregisteredMetricsGroup;
import org.apache.flink.runtime.JobException;
import org.apache.flink.runtime.blob.BlobWriter;
@@ -70,7 +69,6 @@ public class TestingDefaultExecutionGraphBuilder {
private JobMasterPartitionTracker partitionTracker = NoOpJobMasterPartitionTracker.INSTANCE;
private Configuration jobMasterConfig = new Configuration();
private JobGraph jobGraph = JobGraphTestUtils.emptyJobGraph();
- private MetricGroup metricGroup = new UnregisteredMetricsGroup();
private CompletedCheckpointStore completedCheckpointStore =
new StandaloneCompletedCheckpointStore(1);
private CheckpointIDCounter checkpointIdCounter = new StandaloneCheckpointIDCounter();
@@ -128,11 +126,6 @@ public class TestingDefaultExecutionGraphBuilder {
return this;
}
- public TestingDefaultExecutionGraphBuilder setMetricGroup(MetricGroup metricGroup) {
- this.metricGroup = metricGroup;
- return this;
- }
-
public TestingDefaultExecutionGraphBuilder setCompletedCheckpointStore(
CompletedCheckpointStore completedCheckpointStore) {
this.completedCheckpointStore = completedCheckpointStore;
@@ -174,7 +167,6 @@ public class TestingDefaultExecutionGraphBuilder {
new CheckpointsCleaner(),
checkpointIdCounter,
rpcTimeout,
- metricGroup,
blobWriter,
LOG,
shuffleMaster,