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/07/16 19:01:29 UTC
[flink] branch master updated: [FLINK-21776][metrics] Migrate
JobManagerJobMG instantiations to factory method
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
The following commit(s) were added to refs/heads/master by this push:
new c99895a [FLINK-21776][metrics] Migrate JobManagerJobMG instantiations to factory method
c99895a is described below
commit c99895a48cc70fba6a96983435f47dd76e7fbcf5
Author: Chesnay Schepler <ch...@apache.org>
AuthorDate: Fri Jul 16 21:01:14 2021 +0200
[FLINK-21776][metrics] Migrate JobManagerJobMG instantiations to factory method
---
.../runtime/metrics/groups/JobManagerJobMetricGroup.java | 2 +-
.../runtime/scheduler/adaptive/AdaptiveSchedulerTest.java | 11 ++++-------
2 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/metrics/groups/JobManagerJobMetricGroup.java b/flink-runtime/src/main/java/org/apache/flink/runtime/metrics/groups/JobManagerJobMetricGroup.java
index f0c61c6..aba4d8e 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/metrics/groups/JobManagerJobMetricGroup.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/metrics/groups/JobManagerJobMetricGroup.java
@@ -34,7 +34,7 @@ import static org.apache.flink.util.Preconditions.checkNotNull;
*/
@Internal
public class JobManagerJobMetricGroup extends JobMetricGroup<JobManagerMetricGroup> {
- public JobManagerJobMetricGroup(
+ JobManagerJobMetricGroup(
MetricRegistry registry,
JobManagerMetricGroup parent,
JobID jobId,
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/scheduler/adaptive/AdaptiveSchedulerTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/scheduler/adaptive/AdaptiveSchedulerTest.java
index ff2fba0..147b041 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/scheduler/adaptive/AdaptiveSchedulerTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/scheduler/adaptive/AdaptiveSchedulerTest.java
@@ -57,7 +57,7 @@ import org.apache.flink.runtime.jobmaster.slotpool.DefaultAllocatedSlotPool;
import org.apache.flink.runtime.jobmaster.slotpool.DefaultDeclarativeSlotPool;
import org.apache.flink.runtime.metrics.MetricNames;
import org.apache.flink.runtime.metrics.MetricRegistry;
-import org.apache.flink.runtime.metrics.groups.JobManagerJobMetricGroup;
+import org.apache.flink.runtime.metrics.groups.JobManagerMetricGroup;
import org.apache.flink.runtime.metrics.util.TestingMetricRegistry;
import org.apache.flink.runtime.operators.coordination.CoordinationRequest;
import org.apache.flink.runtime.operators.coordination.TaskNotRunningException;
@@ -106,7 +106,6 @@ import static org.apache.flink.runtime.executiongraph.ExecutionGraphTestUtils.cr
import static org.apache.flink.runtime.jobgraph.JobGraphTestUtils.streamingJobGraph;
import static org.apache.flink.runtime.jobmaster.slotpool.DefaultDeclarativeSlotPoolTest.createSlotOffersForResourceRequirements;
import static org.apache.flink.runtime.jobmaster.slotpool.SlotPoolTestUtils.offerSlots;
-import static org.apache.flink.runtime.metrics.groups.UnregisteredMetricGroups.createUnregisteredJobManagerMetricGroup;
import static org.hamcrest.Matchers.contains;
import static org.hamcrest.Matchers.instanceOf;
import static org.hamcrest.core.Is.is;
@@ -440,11 +439,9 @@ public class AdaptiveSchedulerTest extends TestLogger {
new AdaptiveSchedulerBuilder(jobGraph, singleThreadMainThreadExecutor)
.setJobMasterConfiguration(configuration)
.setJobManagerJobMetricGroup(
- new JobManagerJobMetricGroup(
- metricRegistry,
- createUnregisteredJobManagerMetricGroup(),
- new JobID(),
- "jobName"))
+ JobManagerMetricGroup.createJobManagerMetricGroup(
+ metricRegistry, "localhost")
+ .addJob(new JobID(), "jobName"))
.setDeclarativeSlotPool(declarativeSlotPool)
.build();