You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by tr...@apache.org on 2017/11/01 22:27:41 UTC
[1/7] flink git commit: [FLINK-7876] Register TaskManagerMetricGroup
under ResourceID
Repository: flink
Updated Branches:
refs/heads/master a7e0a277f -> 7fb7e0b97
http://git-wip-us.apache.org/repos/asf/flink/blob/d45b9412/flink-runtime/src/test/java/org/apache/flink/runtime/metrics/groups/TaskManagerJobGroupTest.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/metrics/groups/TaskManagerJobGroupTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/metrics/groups/TaskManagerJobGroupTest.java
index fc0ce5c..b6be31c 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/metrics/groups/TaskManagerJobGroupTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/metrics/groups/TaskManagerJobGroupTest.java
@@ -21,8 +21,8 @@ package org.apache.flink.runtime.metrics.groups;
import org.apache.flink.api.common.JobID;
import org.apache.flink.configuration.Configuration;
import org.apache.flink.configuration.MetricOptions;
-import org.apache.flink.runtime.metrics.MetricRegistry;
import org.apache.flink.runtime.metrics.MetricRegistryConfiguration;
+import org.apache.flink.runtime.metrics.MetricRegistryImpl;
import org.apache.flink.runtime.metrics.dump.QueryScopeInfo;
import org.apache.flink.runtime.metrics.util.DummyCharacterFilter;
import org.apache.flink.util.TestLogger;
@@ -39,7 +39,7 @@ public class TaskManagerJobGroupTest extends TestLogger {
@Test
public void testGenerateScopeDefault() {
- MetricRegistry registry = new MetricRegistry(MetricRegistryConfiguration.defaultMetricRegistryConfiguration());
+ MetricRegistryImpl registry = new MetricRegistryImpl(MetricRegistryConfiguration.defaultMetricRegistryConfiguration());
TaskManagerMetricGroup tmGroup = new TaskManagerMetricGroup(registry, "theHostName", "test-tm-id");
JobMetricGroup jmGroup = new TaskManagerJobMetricGroup(registry, tmGroup, new JobID(), "myJobName");
@@ -59,7 +59,7 @@ public class TaskManagerJobGroupTest extends TestLogger {
Configuration cfg = new Configuration();
cfg.setString(MetricOptions.SCOPE_NAMING_TM, "abc");
cfg.setString(MetricOptions.SCOPE_NAMING_TM_JOB, "some-constant.<job_name>");
- MetricRegistry registry = new MetricRegistry(MetricRegistryConfiguration.fromConfiguration(cfg));
+ MetricRegistryImpl registry = new MetricRegistryImpl(MetricRegistryConfiguration.fromConfiguration(cfg));
JobID jid = new JobID();
@@ -81,7 +81,7 @@ public class TaskManagerJobGroupTest extends TestLogger {
Configuration cfg = new Configuration();
cfg.setString(MetricOptions.SCOPE_NAMING_TM, "peter.<tm_id>");
cfg.setString(MetricOptions.SCOPE_NAMING_TM_JOB, "*.some-constant.<job_id>");
- MetricRegistry registry = new MetricRegistry(MetricRegistryConfiguration.fromConfiguration(cfg));
+ MetricRegistryImpl registry = new MetricRegistryImpl(MetricRegistryConfiguration.fromConfiguration(cfg));
JobID jid = new JobID();
@@ -101,7 +101,7 @@ public class TaskManagerJobGroupTest extends TestLogger {
@Test
public void testCreateQueryServiceMetricInfo() {
JobID jid = new JobID();
- MetricRegistry registry = new MetricRegistry(MetricRegistryConfiguration.defaultMetricRegistryConfiguration());
+ MetricRegistryImpl registry = new MetricRegistryImpl(MetricRegistryConfiguration.defaultMetricRegistryConfiguration());
TaskManagerMetricGroup tm = new TaskManagerMetricGroup(registry, "host", "id");
TaskManagerJobMetricGroup job = new TaskManagerJobMetricGroup(registry, tm, jid, "jobname");
http://git-wip-us.apache.org/repos/asf/flink/blob/d45b9412/flink-runtime/src/test/java/org/apache/flink/runtime/metrics/groups/TaskMetricGroupTest.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/metrics/groups/TaskMetricGroupTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/metrics/groups/TaskMetricGroupTest.java
index 43cbbf1..be7407e 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/metrics/groups/TaskMetricGroupTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/metrics/groups/TaskMetricGroupTest.java
@@ -23,8 +23,8 @@ import org.apache.flink.configuration.Configuration;
import org.apache.flink.configuration.MetricOptions;
import org.apache.flink.metrics.Metric;
import org.apache.flink.runtime.jobgraph.JobVertexID;
-import org.apache.flink.runtime.metrics.MetricRegistry;
import org.apache.flink.runtime.metrics.MetricRegistryConfiguration;
+import org.apache.flink.runtime.metrics.MetricRegistryImpl;
import org.apache.flink.runtime.metrics.dump.QueryScopeInfo;
import org.apache.flink.runtime.metrics.scope.ScopeFormat;
import org.apache.flink.runtime.metrics.util.DummyCharacterFilter;
@@ -49,7 +49,7 @@ public class TaskMetricGroupTest extends TestLogger {
@Test
public void testGenerateScopeDefault() {
- MetricRegistry registry = new MetricRegistry(MetricRegistryConfiguration.defaultMetricRegistryConfiguration());
+ MetricRegistryImpl registry = new MetricRegistryImpl(MetricRegistryConfiguration.defaultMetricRegistryConfiguration());
JobVertexID vertexId = new JobVertexID();
AbstractID executionId = new AbstractID();
@@ -73,7 +73,7 @@ public class TaskMetricGroupTest extends TestLogger {
cfg.setString(MetricOptions.SCOPE_NAMING_TM, "abc");
cfg.setString(MetricOptions.SCOPE_NAMING_TM_JOB, "def");
cfg.setString(MetricOptions.SCOPE_NAMING_TASK, "<tm_id>.<job_id>.<task_id>.<task_attempt_id>");
- MetricRegistry registry = new MetricRegistry(MetricRegistryConfiguration.fromConfiguration(cfg));
+ MetricRegistryImpl registry = new MetricRegistryImpl(MetricRegistryConfiguration.fromConfiguration(cfg));
JobID jid = new JobID();
JobVertexID vertexId = new JobVertexID();
@@ -98,7 +98,7 @@ public class TaskMetricGroupTest extends TestLogger {
public void testGenerateScopeWilcard() {
Configuration cfg = new Configuration();
cfg.setString(MetricOptions.SCOPE_NAMING_TASK, "*.<task_attempt_id>.<subtask_index>");
- MetricRegistry registry = new MetricRegistry(MetricRegistryConfiguration.fromConfiguration(cfg));
+ MetricRegistryImpl registry = new MetricRegistryImpl(MetricRegistryConfiguration.fromConfiguration(cfg));
AbstractID executionId = new AbstractID();
@@ -123,7 +123,7 @@ public class TaskMetricGroupTest extends TestLogger {
JobID jid = new JobID();
JobVertexID vid = new JobVertexID();
AbstractID eid = new AbstractID();
- MetricRegistry registry = new MetricRegistry(MetricRegistryConfiguration.defaultMetricRegistryConfiguration());
+ MetricRegistryImpl registry = new MetricRegistryImpl(MetricRegistryConfiguration.defaultMetricRegistryConfiguration());
TaskManagerMetricGroup tm = new TaskManagerMetricGroup(registry, "host", "id");
TaskManagerJobMetricGroup job = new TaskManagerJobMetricGroup(registry, tm, jid, "jobname");
TaskMetricGroup task = new TaskMetricGroup(registry, job, vid, eid, "taskName", 4, 5);
@@ -157,7 +157,7 @@ public class TaskMetricGroupTest extends TestLogger {
public void testOperatorNameTruncation() {
Configuration cfg = new Configuration();
cfg.setString(MetricOptions.SCOPE_NAMING_OPERATOR, ScopeFormat.SCOPE_OPERATOR_NAME);
- MetricRegistry registry = new MetricRegistry(MetricRegistryConfiguration.fromConfiguration(cfg));
+ MetricRegistryImpl registry = new MetricRegistryImpl(MetricRegistryConfiguration.fromConfiguration(cfg));
TaskManagerMetricGroup tm = new TaskManagerMetricGroup(registry, "host", "id");
TaskManagerJobMetricGroup job = new TaskManagerJobMetricGroup(registry, tm, new JobID(), "jobname");
TaskMetricGroup taskMetricGroup = new TaskMetricGroup(registry, job, new JobVertexID(), new AbstractID(), "task", 0, 0);
@@ -170,7 +170,7 @@ public class TaskMetricGroupTest extends TestLogger {
Assert.assertEquals(originalName.substring(0, TaskMetricGroup.METRICS_OPERATOR_NAME_MAX_LENGTH), storedName);
}
- private static class CountingMetricRegistry extends MetricRegistry {
+ private static class CountingMetricRegistry extends MetricRegistryImpl {
private int counter = 0;
http://git-wip-us.apache.org/repos/asf/flink/blob/d45b9412/flink-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/UnregisteredTaskMetricsGroup.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/UnregisteredTaskMetricsGroup.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/UnregisteredTaskMetricsGroup.java
index 2ca19c1..3d29815 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/UnregisteredTaskMetricsGroup.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/UnregisteredTaskMetricsGroup.java
@@ -29,7 +29,7 @@ import org.apache.flink.runtime.metrics.groups.TaskIOMetricGroup;
import org.apache.flink.runtime.metrics.groups.TaskManagerJobMetricGroup;
import org.apache.flink.runtime.metrics.groups.TaskManagerMetricGroup;
import org.apache.flink.runtime.metrics.groups.TaskMetricGroup;
-import org.apache.flink.runtime.metrics.MetricRegistry;
+import org.apache.flink.runtime.metrics.MetricRegistryImpl;
import org.apache.flink.runtime.executiongraph.ExecutionAttemptID;
import org.apache.flink.runtime.jobgraph.JobVertexID;
@@ -37,7 +37,7 @@ import java.util.UUID;
public class UnregisteredTaskMetricsGroup extends TaskMetricGroup {
- private static final MetricRegistry EMPTY_REGISTRY = new MetricRegistry(MetricRegistryConfiguration.defaultMetricRegistryConfiguration());
+ private static final MetricRegistryImpl EMPTY_REGISTRY = new MetricRegistryImpl(MetricRegistryConfiguration.defaultMetricRegistryConfiguration());
public UnregisteredTaskMetricsGroup() {
http://git-wip-us.apache.org/repos/asf/flink/blob/d45b9412/flink-runtime/src/test/java/org/apache/flink/runtime/resourcemanager/ResourceManagerHATest.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/resourcemanager/ResourceManagerHATest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/resourcemanager/ResourceManagerHATest.java
index d0dd973..306d4d4 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/resourcemanager/ResourceManagerHATest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/resourcemanager/ResourceManagerHATest.java
@@ -24,7 +24,7 @@ import org.apache.flink.runtime.clusterframework.types.ResourceID;
import org.apache.flink.runtime.heartbeat.HeartbeatServices;
import org.apache.flink.runtime.highavailability.TestingHighAvailabilityServices;
import org.apache.flink.runtime.leaderelection.TestingLeaderElectionService;
-import org.apache.flink.runtime.metrics.MetricRegistry;
+import org.apache.flink.runtime.metrics.MetricRegistryImpl;
import org.apache.flink.runtime.resourcemanager.slotmanager.SlotManagerConfiguration;
import org.apache.flink.runtime.rpc.RpcService;
import org.apache.flink.runtime.rpc.TestingRpcService;
@@ -78,7 +78,7 @@ public class ResourceManagerHATest extends TestLogger {
highAvailabilityServices,
rpcService.getScheduledExecutor());
- MetricRegistry metricRegistry = mock(MetricRegistry.class);
+ MetricRegistryImpl metricRegistry = mock(MetricRegistryImpl.class);
TestingFatalErrorHandler testingFatalErrorHandler = new TestingFatalErrorHandler();
http://git-wip-us.apache.org/repos/asf/flink/blob/d45b9412/flink-runtime/src/test/java/org/apache/flink/runtime/resourcemanager/ResourceManagerJobMasterTest.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/resourcemanager/ResourceManagerJobMasterTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/resourcemanager/ResourceManagerJobMasterTest.java
index 73c5b5c..1b6324c 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/resourcemanager/ResourceManagerJobMasterTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/resourcemanager/ResourceManagerJobMasterTest.java
@@ -32,7 +32,7 @@ import org.apache.flink.runtime.leaderelection.LeaderElectionService;
import org.apache.flink.runtime.leaderelection.TestingLeaderElectionService;
import org.apache.flink.runtime.leaderelection.TestingLeaderRetrievalService;
import org.apache.flink.runtime.leaderretrieval.LeaderRetrievalService;
-import org.apache.flink.runtime.metrics.MetricRegistry;
+import org.apache.flink.runtime.metrics.MetricRegistryImpl;
import org.apache.flink.runtime.resourcemanager.exceptions.ResourceManagerException;
import org.apache.flink.runtime.resourcemanager.slotmanager.SlotManager;
import org.apache.flink.runtime.rpc.FatalErrorHandler;
@@ -270,7 +270,7 @@ public class ResourceManagerJobMasterTest extends TestLogger {
ResourceManagerConfiguration resourceManagerConfiguration = new ResourceManagerConfiguration(
Time.seconds(5L),
Time.seconds(5L));
- MetricRegistry metricRegistry = mock(MetricRegistry.class);
+ MetricRegistryImpl metricRegistry = mock(MetricRegistryImpl.class);
JobLeaderIdService jobLeaderIdService = new JobLeaderIdService(
highAvailabilityServices,
rpcService.getScheduledExecutor(),
http://git-wip-us.apache.org/repos/asf/flink/blob/d45b9412/flink-runtime/src/test/java/org/apache/flink/runtime/resourcemanager/ResourceManagerTaskExecutorTest.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/resourcemanager/ResourceManagerTaskExecutorTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/resourcemanager/ResourceManagerTaskExecutorTest.java
index 0206ade..147d180 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/resourcemanager/ResourceManagerTaskExecutorTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/resourcemanager/ResourceManagerTaskExecutorTest.java
@@ -25,7 +25,7 @@ import org.apache.flink.runtime.heartbeat.HeartbeatServices;
import org.apache.flink.runtime.highavailability.TestingHighAvailabilityServices;
import org.apache.flink.runtime.leaderelection.LeaderElectionService;
import org.apache.flink.runtime.leaderelection.TestingLeaderElectionService;
-import org.apache.flink.runtime.metrics.MetricRegistry;
+import org.apache.flink.runtime.metrics.MetricRegistryImpl;
import org.apache.flink.runtime.resourcemanager.slotmanager.SlotManager;
import org.apache.flink.runtime.rpc.FatalErrorHandler;
import org.apache.flink.runtime.rpc.TestingRpcService;
@@ -182,7 +182,7 @@ public class ResourceManagerTaskExecutorTest extends TestLogger {
TestingUtils.infiniteTime(),
TestingUtils.infiniteTime());
- MetricRegistry metricRegistry = mock(MetricRegistry.class);
+ MetricRegistryImpl metricRegistry = mock(MetricRegistryImpl.class);
JobLeaderIdService jobLeaderIdService = new JobLeaderIdService(
highAvailabilityServices,
rpcService.getScheduledExecutor(),
http://git-wip-us.apache.org/repos/asf/flink/blob/d45b9412/flink-runtime/src/test/java/org/apache/flink/runtime/rest/handler/legacy/TaskManagerLogHandlerTest.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/rest/handler/legacy/TaskManagerLogHandlerTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/rest/handler/legacy/TaskManagerLogHandlerTest.java
index 8e76674..b600cbe 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/rest/handler/legacy/TaskManagerLogHandlerTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/rest/handler/legacy/TaskManagerLogHandlerTest.java
@@ -105,7 +105,7 @@ public class TaskManagerLogHandlerTest {
JobManagerGateway jobManagerGateway = mock(JobManagerGateway.class);
when(jobManagerGateway.requestBlobServerPort(any(Time.class))).thenReturn(CompletableFuture.completedFuture(1337));
when(jobManagerGateway.getHostname()).thenReturn("localhost");
- when(jobManagerGateway.requestTaskManagerInstance(any(InstanceID.class), any(Time.class))).thenReturn(
+ when(jobManagerGateway.requestTaskManagerInstance(any(ResourceID.class), any(Time.class))).thenReturn(
CompletableFuture.completedFuture(Optional.of(taskManager)));
GatewayRetriever<JobManagerGateway> retriever = mock(GatewayRetriever.class);
http://git-wip-us.apache.org/repos/asf/flink/blob/d45b9412/flink-runtime/src/test/java/org/apache/flink/runtime/rest/handler/legacy/metrics/MetricFetcherTest.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/rest/handler/legacy/metrics/MetricFetcherTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/rest/handler/legacy/metrics/MetricFetcherTest.java
index ce98f31..7b10db6 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/rest/handler/legacy/metrics/MetricFetcherTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/rest/handler/legacy/metrics/MetricFetcherTest.java
@@ -89,7 +89,7 @@ public class MetricFetcherTest extends TestLogger {
when(jobManagerGateway.requestMetricQueryServicePaths(any(Time.class))).thenReturn(
CompletableFuture.completedFuture(Collections.singleton(jmMetricQueryServicePath)));
when(jobManagerGateway.requestTaskManagerMetricQueryServicePaths(any(Time.class))).thenReturn(
- CompletableFuture.completedFuture(Collections.singleton(Tuple2.of(tmID, tmMetricQueryServicePath))));
+ CompletableFuture.completedFuture(Collections.singleton(Tuple2.of(tmRID, tmMetricQueryServicePath))));
GatewayRetriever<JobManagerGateway> retriever = mock(AkkaJobManagerRetriever.class);
when(retriever.getNow())
@@ -99,7 +99,7 @@ public class MetricFetcherTest extends TestLogger {
MetricQueryServiceGateway jmQueryService = mock(MetricQueryServiceGateway.class);
MetricQueryServiceGateway tmQueryService = mock(MetricQueryServiceGateway.class);
- MetricDumpSerialization.MetricSerializationResult requestMetricsAnswer = createRequestDumpAnswer(tmID, jobID);
+ MetricDumpSerialization.MetricSerializationResult requestMetricsAnswer = createRequestDumpAnswer(tmRID, jobID);
when(jmQueryService.queryMetrics(any(Time.class)))
.thenReturn(CompletableFuture.completedFuture(new MetricDumpSerialization.MetricSerializationResult(new byte[0], 0, 0, 0, 0)));
@@ -133,14 +133,14 @@ public class MetricFetcherTest extends TestLogger {
assertEquals("0.99", store.getJobManagerMetricStore().getMetric("abc.hist_p99"));
assertEquals("0.999", store.getJobManagerMetricStore().getMetric("abc.hist_p999"));
- assertEquals("x", store.getTaskManagerMetricStore(tmID.toString()).metrics.get("abc.gauge"));
+ assertEquals("x", store.getTaskManagerMetricStore(tmRID.toString()).metrics.get("abc.gauge"));
assertEquals("5.0", store.getJobMetricStore(jobID.toString()).metrics.get("abc.jc"));
assertEquals("2", store.getTaskMetricStore(jobID.toString(), "taskid").metrics.get("2.abc.tc"));
assertEquals("1", store.getTaskMetricStore(jobID.toString(), "taskid").metrics.get("2.opname.abc.oc"));
}
}
- private static MetricDumpSerialization.MetricSerializationResult createRequestDumpAnswer(InstanceID tmID, JobID jobID) {
+ private static MetricDumpSerialization.MetricSerializationResult createRequestDumpAnswer(ResourceID tmRID, JobID jobID) {
Map<Counter, Tuple2<QueryScopeInfo, String>> counters = new HashMap<>();
Map<Gauge<?>, Tuple2<QueryScopeInfo, String>> gauges = new HashMap<>();
Map<Histogram, Tuple2<QueryScopeInfo, String>> histograms = new HashMap<>();
@@ -178,7 +178,7 @@ public class MetricFetcherTest extends TestLogger {
public String getValue() {
return "x";
}
- }, new Tuple2<>(new QueryScopeInfo.TaskManagerQueryScopeInfo(tmID.toString(), "abc"), "gauge"));
+ }, new Tuple2<>(new QueryScopeInfo.TaskManagerQueryScopeInfo(tmRID.toString(), "abc"), "gauge"));
histograms.put(new TestingHistogram(), new Tuple2<>(new QueryScopeInfo.JobManagerQueryScopeInfo("abc"), "hist"));
MetricDumpSerialization.MetricDumpSerializer serializer = new MetricDumpSerialization.MetricDumpSerializer();
http://git-wip-us.apache.org/repos/asf/flink/blob/d45b9412/flink-runtime/src/test/java/org/apache/flink/runtime/taskexecutor/TaskExecutorITCase.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/taskexecutor/TaskExecutorITCase.java b/flink-runtime/src/test/java/org/apache/flink/runtime/taskexecutor/TaskExecutorITCase.java
index e448ccc..7c6b7dd 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/taskexecutor/TaskExecutorITCase.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/taskexecutor/TaskExecutorITCase.java
@@ -39,7 +39,7 @@ import org.apache.flink.runtime.leaderelection.TestingLeaderElectionService;
import org.apache.flink.runtime.leaderelection.TestingLeaderRetrievalService;
import org.apache.flink.runtime.memory.MemoryManager;
import org.apache.flink.runtime.messages.Acknowledge;
-import org.apache.flink.runtime.metrics.MetricRegistry;
+import org.apache.flink.runtime.metrics.MetricRegistryImpl;
import org.apache.flink.runtime.metrics.groups.TaskManagerMetricGroup;
import org.apache.flink.runtime.registration.RegistrationResponse;
import org.apache.flink.runtime.resourcemanager.JobLeaderIdService;
@@ -112,7 +112,7 @@ public class TaskExecutorITCase extends TestLogger {
testingHAServices,
rpcService.getScheduledExecutor(),
Time.minutes(5L));
- MetricRegistry metricRegistry = mock(MetricRegistry.class);
+ MetricRegistryImpl metricRegistry = mock(MetricRegistryImpl.class);
HeartbeatServices heartbeatServices = mock(HeartbeatServices.class, RETURNS_MOCKS);
final TaskManagerConfiguration taskManagerConfiguration = TaskManagerConfiguration.fromConfiguration(configuration);
http://git-wip-us.apache.org/repos/asf/flink/blob/d45b9412/flink-runtime/src/test/java/org/apache/flink/runtime/taskexecutor/TaskExecutorTest.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/taskexecutor/TaskExecutorTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/taskexecutor/TaskExecutorTest.java
index e106238..fcd6e4e 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/taskexecutor/TaskExecutorTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/taskexecutor/TaskExecutorTest.java
@@ -61,7 +61,7 @@ import org.apache.flink.runtime.leaderelection.TestingLeaderRetrievalService;
import org.apache.flink.runtime.leaderretrieval.LeaderRetrievalService;
import org.apache.flink.runtime.memory.MemoryManager;
import org.apache.flink.runtime.messages.Acknowledge;
-import org.apache.flink.runtime.metrics.MetricRegistry;
+import org.apache.flink.runtime.metrics.MetricRegistryImpl;
import org.apache.flink.runtime.metrics.groups.TaskIOMetricGroup;
import org.apache.flink.runtime.metrics.groups.TaskManagerMetricGroup;
import org.apache.flink.runtime.metrics.groups.TaskMetricGroup;
@@ -205,7 +205,7 @@ public class TaskExecutorTest extends TestLogger {
mock(NetworkEnvironment.class),
haServices,
heartbeatServices,
- mock(MetricRegistry.class),
+ mock(MetricRegistryImpl.class),
mock(TaskManagerMetricGroup.class),
mock(BroadcastVariableManager.class),
mock(FileCache.class),
@@ -311,7 +311,7 @@ public class TaskExecutorTest extends TestLogger {
mock(NetworkEnvironment.class),
haServices,
heartbeatServices,
- mock(MetricRegistry.class),
+ mock(MetricRegistryImpl.class),
mock(TaskManagerMetricGroup.class),
mock(BroadcastVariableManager.class),
mock(FileCache.class),
@@ -429,7 +429,7 @@ public class TaskExecutorTest extends TestLogger {
mock(NetworkEnvironment.class),
haServices,
heartbeatServices,
- mock(MetricRegistry.class),
+ mock(MetricRegistryImpl.class),
mock(TaskManagerMetricGroup.class),
mock(BroadcastVariableManager.class),
mock(FileCache.class),
@@ -522,7 +522,7 @@ public class TaskExecutorTest extends TestLogger {
mock(NetworkEnvironment.class),
haServices,
mock(HeartbeatServices.class, RETURNS_MOCKS),
- mock(MetricRegistry.class),
+ mock(MetricRegistryImpl.class),
mock(TaskManagerMetricGroup.class),
mock(BroadcastVariableManager.class),
mock(FileCache.class),
@@ -605,7 +605,7 @@ public class TaskExecutorTest extends TestLogger {
mock(NetworkEnvironment.class),
haServices,
mock(HeartbeatServices.class, RETURNS_MOCKS),
- mock(MetricRegistry.class),
+ mock(MetricRegistryImpl.class),
mock(TaskManagerMetricGroup.class),
mock(BroadcastVariableManager.class),
mock(FileCache.class),
@@ -747,7 +747,7 @@ public class TaskExecutorTest extends TestLogger {
networkEnvironment,
haServices,
mock(HeartbeatServices.class, RETURNS_MOCKS),
- mock(MetricRegistry.class),
+ mock(MetricRegistryImpl.class),
taskManagerMetricGroup,
mock(BroadcastVariableManager.class),
mock(FileCache.class),
@@ -863,7 +863,7 @@ public class TaskExecutorTest extends TestLogger {
mock(NetworkEnvironment.class),
haServices,
mock(HeartbeatServices.class, RETURNS_MOCKS),
- mock(MetricRegistry.class),
+ mock(MetricRegistryImpl.class),
mock(TaskManagerMetricGroup.class),
mock(BroadcastVariableManager.class),
mock(FileCache.class),
@@ -981,7 +981,7 @@ public class TaskExecutorTest extends TestLogger {
mock(NetworkEnvironment.class),
haServices,
mock(HeartbeatServices.class, RETURNS_MOCKS),
- mock(MetricRegistry.class),
+ mock(MetricRegistryImpl.class),
mock(TaskManagerMetricGroup.class),
mock(BroadcastVariableManager.class),
mock(FileCache.class),
@@ -1074,7 +1074,7 @@ public class TaskExecutorTest extends TestLogger {
mock(NetworkEnvironment.class),
haServices,
mock(HeartbeatServices.class, RETURNS_MOCKS),
- mock(MetricRegistry.class),
+ mock(MetricRegistryImpl.class),
mock(TaskManagerMetricGroup.class),
mock(BroadcastVariableManager.class),
mock(FileCache.class),
@@ -1248,7 +1248,7 @@ public class TaskExecutorTest extends TestLogger {
networkMock,
haServices,
mock(HeartbeatServices.class, RETURNS_MOCKS),
- mock(MetricRegistry.class),
+ mock(MetricRegistryImpl.class),
taskManagerMetricGroup,
mock(BroadcastVariableManager.class),
mock(FileCache.class),
@@ -1371,7 +1371,7 @@ public class TaskExecutorTest extends TestLogger {
mock(NetworkEnvironment.class),
haServicesMock,
heartbeatServicesMock,
- mock(MetricRegistry.class),
+ mock(MetricRegistryImpl.class),
mock(TaskManagerMetricGroup.class),
mock(BroadcastVariableManager.class),
mock(FileCache.class),
http://git-wip-us.apache.org/repos/asf/flink/blob/d45b9412/flink-runtime/src/test/java/org/apache/flink/runtime/taskexecutor/TaskManagerServicesTest.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/taskexecutor/TaskManagerServicesTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/taskexecutor/TaskManagerServicesTest.java
index bf90634..a8358a1 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/taskexecutor/TaskManagerServicesTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/taskexecutor/TaskManagerServicesTest.java
@@ -21,9 +21,9 @@ package org.apache.flink.runtime.taskexecutor;
import org.apache.flink.configuration.Configuration;
import org.apache.flink.configuration.TaskManagerOptions;
import org.apache.flink.core.memory.MemoryType;
-import org.apache.flink.runtime.metrics.MetricRegistryConfiguration;
import org.apache.flink.runtime.taskmanager.NetworkEnvironmentConfiguration;
import org.apache.flink.runtime.util.EnvironmentInformation;
+
import org.junit.Test;
import org.junit.runner.RunWith;
import org.powermock.api.mockito.PowerMockito;
@@ -259,7 +259,6 @@ public class TaskManagerServicesTest {
managedMemory,
false,
managedMemoryFraction,
- mock(MetricRegistryConfiguration.class),
0);
}
http://git-wip-us.apache.org/repos/asf/flink/blob/d45b9412/flink-runtime/src/test/java/org/apache/flink/runtime/taskmanager/TaskManagerComponentsStartupShutdownTest.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/taskmanager/TaskManagerComponentsStartupShutdownTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/taskmanager/TaskManagerComponentsStartupShutdownTest.java
index 10b74c3..8249fca 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/taskmanager/TaskManagerComponentsStartupShutdownTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/taskmanager/TaskManagerComponentsStartupShutdownTest.java
@@ -49,8 +49,9 @@ import org.apache.flink.runtime.jobmanager.JobManager;
import org.apache.flink.runtime.jobmanager.MemoryArchivist;
import org.apache.flink.runtime.memory.MemoryManager;
import org.apache.flink.runtime.messages.TaskManagerMessages;
-import org.apache.flink.runtime.metrics.MetricRegistry;
+import org.apache.flink.runtime.metrics.MetricRegistryImpl;
import org.apache.flink.runtime.metrics.MetricRegistryConfiguration;
+import org.apache.flink.runtime.metrics.NoOpMetricRegistry;
import org.apache.flink.runtime.query.KvStateRegistry;
import org.apache.flink.runtime.taskexecutor.TaskManagerConfiguration;
import org.apache.flink.runtime.testingUtils.TestingUtils;
@@ -62,7 +63,6 @@ import scala.Option;
import scala.concurrent.duration.FiniteDuration;
import java.net.InetAddress;
-import java.util.Arrays;
import java.util.concurrent.TimeUnit;
public class TaskManagerComponentsStartupShutdownTest extends TestLogger {
@@ -99,6 +99,7 @@ public class TaskManagerComponentsStartupShutdownTest extends TestLogger {
TestingUtils.defaultExecutor(),
TestingUtils.defaultExecutor(),
highAvailabilityServices,
+ new NoOpMetricRegistry(),
Option.empty(),
JobManager.class,
MemoryArchivist.class)._1();
@@ -168,7 +169,7 @@ public class TaskManagerComponentsStartupShutdownTest extends TestLogger {
network,
numberOfSlots,
highAvailabilityServices,
- new MetricRegistry(metricRegistryConfiguration));
+ new MetricRegistryImpl(metricRegistryConfiguration));
taskManager = actorSystem.actorOf(tmProps);
http://git-wip-us.apache.org/repos/asf/flink/blob/d45b9412/flink-runtime/src/test/java/org/apache/flink/runtime/taskmanager/TaskManagerProcessReapingTestBase.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/taskmanager/TaskManagerProcessReapingTestBase.java b/flink-runtime/src/test/java/org/apache/flink/runtime/taskmanager/TaskManagerProcessReapingTestBase.java
index 22d49d2..7429ec5 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/taskmanager/TaskManagerProcessReapingTestBase.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/taskmanager/TaskManagerProcessReapingTestBase.java
@@ -18,12 +18,9 @@
package org.apache.flink.runtime.taskmanager;
-import akka.actor.ActorRef;
-import akka.actor.ActorSystem;
-import org.apache.flink.configuration.ConfigConstants;
import org.apache.flink.configuration.Configuration;
-import org.apache.flink.configuration.TaskManagerOptions;
import org.apache.flink.configuration.JobManagerOptions;
+import org.apache.flink.configuration.TaskManagerOptions;
import org.apache.flink.runtime.akka.AkkaUtils;
import org.apache.flink.runtime.clusterframework.FlinkResourceManager;
import org.apache.flink.runtime.clusterframework.standalone.StandaloneResourceManager;
@@ -32,17 +29,16 @@ import org.apache.flink.runtime.highavailability.HighAvailabilityServices;
import org.apache.flink.runtime.highavailability.HighAvailabilityServicesUtils;
import org.apache.flink.runtime.jobmanager.JobManager;
import org.apache.flink.runtime.jobmanager.MemoryArchivist;
+import org.apache.flink.runtime.metrics.NoOpMetricRegistry;
import org.apache.flink.runtime.taskexecutor.TaskExecutor;
import org.apache.flink.runtime.testingUtils.TestingUtils;
import org.apache.flink.runtime.testutils.CommonTestUtils;
import org.apache.flink.util.NetUtils;
import org.apache.flink.util.TestLogger;
-import org.junit.Test;
-import scala.Option;
-import scala.Some;
-import scala.Tuple2;
-import scala.concurrent.duration.FiniteDuration;
+import akka.actor.ActorRef;
+import akka.actor.ActorSystem;
+import org.junit.Test;
import java.io.File;
import java.io.IOException;
@@ -50,6 +46,11 @@ import java.io.InputStream;
import java.io.StringWriter;
import java.util.concurrent.TimeUnit;
+import scala.Option;
+import scala.Some;
+import scala.Tuple2;
+import scala.concurrent.duration.FiniteDuration;
+
import static org.apache.flink.runtime.testutils.CommonTestUtils.getCurrentClasspath;
import static org.apache.flink.runtime.testutils.CommonTestUtils.getJavaCommandPath;
import static org.apache.flink.runtime.testutils.CommonTestUtils.isProcessAlive;
@@ -121,6 +122,7 @@ public abstract class TaskManagerProcessReapingTestBase extends TestLogger {
TestingUtils.defaultExecutor(),
TestingUtils.defaultExecutor(),
highAvailabilityServices,
+ new NoOpMetricRegistry(),
Option.empty(),
JobManager.class,
MemoryArchivist.class)._1;
http://git-wip-us.apache.org/repos/asf/flink/blob/d45b9412/flink-runtime/src/test/java/org/apache/flink/runtime/taskmanager/TaskManagerStartupTest.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/taskmanager/TaskManagerStartupTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/taskmanager/TaskManagerStartupTest.java
index 67accdb..2e6c580 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/taskmanager/TaskManagerStartupTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/taskmanager/TaskManagerStartupTest.java
@@ -29,6 +29,7 @@ import org.apache.flink.configuration.TaskManagerOptions;
import org.apache.flink.runtime.clusterframework.types.ResourceID;
import org.apache.flink.runtime.highavailability.HighAvailabilityServices;
import org.apache.flink.runtime.highavailability.nonha.embedded.EmbeddedHaServices;
+import org.apache.flink.runtime.metrics.NoOpMetricRegistry;
import org.apache.flink.runtime.testingUtils.TestingUtils;
import org.apache.flink.runtime.util.StartupUtils;
import org.apache.flink.util.NetUtils;
@@ -249,6 +250,7 @@ public class TaskManagerStartupTest extends TestLogger {
ResourceID.generate(),
null,
highAvailabilityServices,
+ new NoOpMetricRegistry(),
"localhost",
Option.<String>empty(),
false,
http://git-wip-us.apache.org/repos/asf/flink/blob/d45b9412/flink-runtime/src/test/scala/org/apache/flink/runtime/jobmanager/JobManagerRegistrationTest.scala
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/scala/org/apache/flink/runtime/jobmanager/JobManagerRegistrationTest.scala b/flink-runtime/src/test/scala/org/apache/flink/runtime/jobmanager/JobManagerRegistrationTest.scala
index f575867..887c4f5 100644
--- a/flink-runtime/src/test/scala/org/apache/flink/runtime/jobmanager/JobManagerRegistrationTest.scala
+++ b/flink-runtime/src/test/scala/org/apache/flink/runtime/jobmanager/JobManagerRegistrationTest.scala
@@ -33,6 +33,7 @@ import org.apache.flink.runtime.instance._
import org.apache.flink.runtime.jobmanager.JobManagerRegistrationTest.PlainForwardingActor
import org.apache.flink.runtime.messages.JobManagerMessages.LeaderSessionMessage
import org.apache.flink.runtime.messages.RegistrationMessages.{AcknowledgeRegistration, AlreadyRegistered, RegisterTaskManager}
+import org.apache.flink.runtime.metrics.{MetricRegistryImpl, MetricRegistryConfiguration}
import org.apache.flink.runtime.taskmanager.TaskManagerLocation
import org.apache.flink.runtime.testingUtils.TestingJobManagerMessages.NotifyWhenLeader
import org.apache.flink.runtime.testingUtils.{TestingJobManager, TestingUtils}
@@ -60,6 +61,10 @@ ImplicitSender with WordSpecLike with Matchers with BeforeAndAfterAll with Befor
var highAvailabilityServices: HighAvailabilityServices = _
+ val metricRegistry: MetricRegistryImpl = new MetricRegistryImpl(
+ MetricRegistryConfiguration.fromConfiguration(new Configuration())
+ )
+
val timeout = FiniteDuration(30, TimeUnit.SECONDS)
override def afterAll(): Unit = {
@@ -87,7 +92,7 @@ ImplicitSender with WordSpecLike with Matchers with BeforeAndAfterAll with Befor
var tm2Option: Option[ActorRef] = None
try {
- val jm = startTestingJobManager(_system, highAvailabilityServices)
+ val jm = startTestingJobManager(_system, highAvailabilityServices, metricRegistry)
jmOption = Some(jm)
val rm = startTestingResourceManager(_system, highAvailabilityServices)
@@ -169,7 +174,7 @@ ImplicitSender with WordSpecLike with Matchers with BeforeAndAfterAll with Befor
try {
val probe = TestProbe()
- val jm = startTestingJobManager(_system, highAvailabilityServices)
+ val jm = startTestingJobManager(_system, highAvailabilityServices, metricRegistry)
jmOption = Some(jm)
val rm = startTestingResourceManager(_system, highAvailabilityServices)
rmOption = Some(rm)
@@ -242,7 +247,8 @@ ImplicitSender with WordSpecLike with Matchers with BeforeAndAfterAll with Befor
private def startTestingJobManager(
system: ActorSystem,
- highAvailabilityServices: HighAvailabilityServices): ActorGateway = {
+ highAvailabilityServices: HighAvailabilityServices,
+ metricRegistry: MetricRegistryImpl): ActorGateway = {
val config = new Configuration()
@@ -250,7 +256,8 @@ ImplicitSender with WordSpecLike with Matchers with BeforeAndAfterAll with Befor
config,
executor,
executor,
- highAvailabilityServices.createBlobStore())
+ highAvailabilityServices.createBlobStore(),
+ metricRegistry)
// Start the JobManager without a MetricRegistry so that we don't start the MetricQueryService.
// The problem of the MetricQueryService is that it starts an actor with a fixed name. Thus,
@@ -273,7 +280,7 @@ ImplicitSender with WordSpecLike with Matchers with BeforeAndAfterAll with Befor
highAvailabilityServices.getSubmittedJobGraphStore(),
highAvailabilityServices.getCheckpointRecoveryFactory(),
components._9,
- None,
+ components._10,
None)
_system.actorOf(props)
http://git-wip-us.apache.org/repos/asf/flink/blob/d45b9412/flink-runtime/src/test/scala/org/apache/flink/runtime/testingUtils/TestingCluster.scala
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/scala/org/apache/flink/runtime/testingUtils/TestingCluster.scala b/flink-runtime/src/test/scala/org/apache/flink/runtime/testingUtils/TestingCluster.scala
index 2e884a0..2b91cd4 100644
--- a/flink-runtime/src/test/scala/org/apache/flink/runtime/testingUtils/TestingCluster.scala
+++ b/flink-runtime/src/test/scala/org/apache/flink/runtime/testingUtils/TestingCluster.scala
@@ -42,7 +42,8 @@ import org.apache.flink.runtime.jobmanager.{JobManager, MemoryArchivist, Submitt
import org.apache.flink.runtime.leaderelection.LeaderElectionService
import org.apache.flink.runtime.messages.JobManagerMessages
import org.apache.flink.runtime.messages.JobManagerMessages._
-import org.apache.flink.runtime.metrics.MetricRegistry
+import org.apache.flink.runtime.metrics.MetricRegistryImpl
+import org.apache.flink.runtime.metrics.groups.JobManagerMetricGroup
import org.apache.flink.runtime.minicluster.LocalFlinkMiniCluster
import org.apache.flink.runtime.taskmanager.TaskManager
import org.apache.flink.runtime.testingUtils.TestingJobManagerMessages._
@@ -120,7 +121,7 @@ class TestingCluster(
submittedJobGraphStore: SubmittedJobGraphStore,
checkpointRecoveryFactory: CheckpointRecoveryFactory,
jobRecoveryTimeout: FiniteDuration,
- metricsRegistry: Option[MetricRegistry],
+ jobManagerMetricGroup: JobManagerMetricGroup,
optRestAddress: Option[String]): Props = {
val props = super.getJobManagerProps(
@@ -139,7 +140,7 @@ class TestingCluster(
submittedJobGraphStore,
checkpointRecoveryFactory,
jobRecoveryTimeout,
- metricsRegistry,
+ jobManagerMetricGroup,
optRestAddress)
if (synchronousDispatcher) {
http://git-wip-us.apache.org/repos/asf/flink/blob/d45b9412/flink-runtime/src/test/scala/org/apache/flink/runtime/testingUtils/TestingJobManager.scala
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/scala/org/apache/flink/runtime/testingUtils/TestingJobManager.scala b/flink-runtime/src/test/scala/org/apache/flink/runtime/testingUtils/TestingJobManager.scala
index 2170a8c..13e2b75 100644
--- a/flink-runtime/src/test/scala/org/apache/flink/runtime/testingUtils/TestingJobManager.scala
+++ b/flink-runtime/src/test/scala/org/apache/flink/runtime/testingUtils/TestingJobManager.scala
@@ -30,7 +30,7 @@ import org.apache.flink.runtime.instance.InstanceManager
import org.apache.flink.runtime.jobmanager.scheduler.Scheduler
import org.apache.flink.runtime.jobmanager.{JobManager, SubmittedJobGraphStore}
import org.apache.flink.runtime.leaderelection.LeaderElectionService
-import org.apache.flink.runtime.metrics.MetricRegistry
+import org.apache.flink.runtime.metrics.groups.JobManagerMetricGroup
import scala.concurrent.duration._
import scala.language.postfixOps
@@ -53,7 +53,7 @@ class TestingJobManager(
submittedJobGraphs : SubmittedJobGraphStore,
checkpointRecoveryFactory : CheckpointRecoveryFactory,
jobRecoveryTimeout : FiniteDuration,
- metricRegistry : Option[MetricRegistry],
+ jobManagerMetricGroup : JobManagerMetricGroup,
optRestAddress: Option[String])
extends JobManager(
flinkConfiguration,
@@ -70,6 +70,6 @@ class TestingJobManager(
submittedJobGraphs,
checkpointRecoveryFactory,
jobRecoveryTimeout,
- metricRegistry,
+ jobManagerMetricGroup,
optRestAddress)
with TestingJobManagerLike {}
http://git-wip-us.apache.org/repos/asf/flink/blob/d45b9412/flink-runtime/src/test/scala/org/apache/flink/runtime/testingUtils/TestingTaskManager.scala
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/scala/org/apache/flink/runtime/testingUtils/TestingTaskManager.scala b/flink-runtime/src/test/scala/org/apache/flink/runtime/testingUtils/TestingTaskManager.scala
index 1db0a85..da753ae 100644
--- a/flink-runtime/src/test/scala/org/apache/flink/runtime/testingUtils/TestingTaskManager.scala
+++ b/flink-runtime/src/test/scala/org/apache/flink/runtime/testingUtils/TestingTaskManager.scala
@@ -23,7 +23,7 @@ import org.apache.flink.runtime.highavailability.HighAvailabilityServices
import org.apache.flink.runtime.io.disk.iomanager.IOManager
import org.apache.flink.runtime.io.network.NetworkEnvironment
import org.apache.flink.runtime.memory.MemoryManager
-import org.apache.flink.runtime.metrics.MetricRegistry
+import org.apache.flink.runtime.metrics.groups.TaskManagerMetricGroup
import org.apache.flink.runtime.taskexecutor.TaskManagerConfiguration
import org.apache.flink.runtime.taskmanager.{TaskManager, TaskManagerLocation}
@@ -40,7 +40,7 @@ class TestingTaskManager(
network: NetworkEnvironment,
numberOfSlots: Int,
highAvailabilityServices: HighAvailabilityServices,
- metricRegistry : MetricRegistry)
+ taskManagerMetricGroup : TaskManagerMetricGroup)
extends TaskManager(
config,
resourceID,
@@ -50,7 +50,7 @@ class TestingTaskManager(
network,
numberOfSlots,
highAvailabilityServices,
- metricRegistry)
+ taskManagerMetricGroup)
with TestingTaskManagerLike {
def this(
@@ -61,7 +61,7 @@ class TestingTaskManager(
network: NetworkEnvironment,
numberOfSlots: Int,
highAvailabilityServices: HighAvailabilityServices,
- metricRegistry : MetricRegistry) {
+ taskManagerMetricGroup : TaskManagerMetricGroup) {
this(
config,
ResourceID.generate(),
@@ -71,6 +71,6 @@ class TestingTaskManager(
network,
numberOfSlots,
highAvailabilityServices,
- metricRegistry)
+ taskManagerMetricGroup)
}
}
http://git-wip-us.apache.org/repos/asf/flink/blob/d45b9412/flink-runtime/src/test/scala/org/apache/flink/runtime/testingUtils/TestingUtils.scala
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/scala/org/apache/flink/runtime/testingUtils/TestingUtils.scala b/flink-runtime/src/test/scala/org/apache/flink/runtime/testingUtils/TestingUtils.scala
index f78af9f..2de6f9e 100644
--- a/flink-runtime/src/test/scala/org/apache/flink/runtime/testingUtils/TestingUtils.scala
+++ b/flink-runtime/src/test/scala/org/apache/flink/runtime/testingUtils/TestingUtils.scala
@@ -18,9 +18,10 @@
package org.apache.flink.runtime.testingUtils
+import java.net.InetAddress
import java.util
-import java.util.{Collections, UUID}
import java.util.concurrent._
+import java.util.{Collections, UUID}
import akka.actor.{ActorRef, ActorSystem, Kill, Props}
import akka.pattern.{Patterns, ask}
@@ -38,13 +39,15 @@ import org.apache.flink.runtime.jobmanager.{JobManager, MemoryArchivist}
import org.apache.flink.runtime.jobmaster.JobMaster
import org.apache.flink.runtime.leaderretrieval.StandaloneLeaderRetrievalService
import org.apache.flink.runtime.messages.TaskManagerMessages.{NotifyWhenRegisteredAtJobManager, RegisteredAtJobManager}
+import org.apache.flink.runtime.metrics.{MetricRegistryImpl, MetricRegistryConfiguration}
+import org.apache.flink.runtime.metrics.groups.JobManagerMetricGroup
+import org.apache.flink.runtime.taskexecutor.{TaskManagerServices, TaskManagerServicesConfiguration}
import org.apache.flink.runtime.taskmanager.TaskManager
import org.apache.flink.runtime.testutils.TestingResourceManager
import org.apache.flink.runtime.util.LeaderRetrievalUtils
import org.apache.flink.runtime.{FlinkActor, LeaderSessionMessageFilter, LogMessages}
-import scala.concurrent.duration.TimeUnit
-import scala.concurrent.duration._
+import scala.concurrent.duration.{TimeUnit, _}
import scala.concurrent.{Await, ExecutionContext, ExecutionContextExecutor}
import scala.language.postfixOps
@@ -266,11 +269,17 @@ object TestingUtils {
resultingConfiguration.addAll(configuration)
+ val metricRegistry = new MetricRegistryImpl(
+ MetricRegistryConfiguration.fromConfiguration(configuration))
+
+ val taskManagerResourceId = ResourceID.generate()
+
val taskManager = TaskManager.startTaskManagerComponentsAndActor(
resultingConfiguration,
- ResourceID.generate(),
+ taskManagerResourceId,
actorSystem,
highAvailabilityServices,
+ metricRegistry,
"localhost",
None,
useLocalCommunication,
@@ -471,12 +480,16 @@ object TestingUtils {
HighAvailabilityOptions.HA_MODE,
ConfigConstants.DEFAULT_HA_MODE)
+ val metricRegistry = new MetricRegistryImpl(
+ MetricRegistryConfiguration.fromConfiguration(configuration))
+
val (actor, _) = JobManager.startJobManagerActors(
configuration,
actorSystem,
futureExecutor,
ioExecutor,
highAvailabilityServices,
+ metricRegistry,
None,
Some(prefix + JobMaster.JOB_MANAGER_NAME),
Some(prefix + JobMaster.ARCHIVE_NAME),
http://git-wip-us.apache.org/repos/asf/flink/blob/d45b9412/flink-tests/src/test/java/org/apache/flink/test/recovery/AbstractTaskManagerProcessFailureRecoveryTest.java
----------------------------------------------------------------------
diff --git a/flink-tests/src/test/java/org/apache/flink/test/recovery/AbstractTaskManagerProcessFailureRecoveryTest.java b/flink-tests/src/test/java/org/apache/flink/test/recovery/AbstractTaskManagerProcessFailureRecoveryTest.java
index a78c528..94aed2a 100644
--- a/flink-tests/src/test/java/org/apache/flink/test/recovery/AbstractTaskManagerProcessFailureRecoveryTest.java
+++ b/flink-tests/src/test/java/org/apache/flink/test/recovery/AbstractTaskManagerProcessFailureRecoveryTest.java
@@ -30,6 +30,7 @@ import org.apache.flink.runtime.highavailability.HighAvailabilityServicesUtils;
import org.apache.flink.runtime.jobmanager.JobManager;
import org.apache.flink.runtime.jobmanager.MemoryArchivist;
import org.apache.flink.runtime.messages.JobManagerMessages;
+import org.apache.flink.runtime.metrics.NoOpMetricRegistry;
import org.apache.flink.runtime.taskmanager.TaskManager;
import org.apache.flink.runtime.testingUtils.TestingUtils;
import org.apache.flink.runtime.testutils.CommonTestUtils;
@@ -145,6 +146,7 @@ public abstract class AbstractTaskManagerProcessFailureRecoveryTest extends Test
TestingUtils.defaultExecutor(),
TestingUtils.defaultExecutor(),
highAvailabilityServices,
+ new NoOpMetricRegistry(),
Option.empty(),
JobManager.class,
MemoryArchivist.class)._1();
http://git-wip-us.apache.org/repos/asf/flink/blob/d45b9412/flink-tests/src/test/java/org/apache/flink/test/recovery/JobManagerHACheckpointRecoveryITCase.java
----------------------------------------------------------------------
diff --git a/flink-tests/src/test/java/org/apache/flink/test/recovery/JobManagerHACheckpointRecoveryITCase.java b/flink-tests/src/test/java/org/apache/flink/test/recovery/JobManagerHACheckpointRecoveryITCase.java
index 51868af..7c53d52 100644
--- a/flink-tests/src/test/java/org/apache/flink/test/recovery/JobManagerHACheckpointRecoveryITCase.java
+++ b/flink-tests/src/test/java/org/apache/flink/test/recovery/JobManagerHACheckpointRecoveryITCase.java
@@ -41,6 +41,7 @@ import org.apache.flink.runtime.jobgraph.JobStatus;
import org.apache.flink.runtime.jobgraph.JobVertex;
import org.apache.flink.runtime.leaderelection.TestingListener;
import org.apache.flink.runtime.leaderretrieval.LeaderRetrievalService;
+import org.apache.flink.runtime.metrics.NoOpMetricRegistry;
import org.apache.flink.runtime.minicluster.LocalFlinkMiniCluster;
import org.apache.flink.runtime.state.AbstractStateBackend;
import org.apache.flink.runtime.state.CheckpointListener;
@@ -217,6 +218,7 @@ public class JobManagerHACheckpointRecoveryITCase extends TestLogger {
ResourceID.generate(),
taskManagerSystem,
highAvailabilityServices,
+ new NoOpMetricRegistry(),
"localhost",
Option.<String>empty(),
false,
http://git-wip-us.apache.org/repos/asf/flink/blob/d45b9412/flink-tests/src/test/java/org/apache/flink/test/recovery/JobManagerHAJobGraphRecoveryITCase.java
----------------------------------------------------------------------
diff --git a/flink-tests/src/test/java/org/apache/flink/test/recovery/JobManagerHAJobGraphRecoveryITCase.java b/flink-tests/src/test/java/org/apache/flink/test/recovery/JobManagerHAJobGraphRecoveryITCase.java
index b575dca..ee37d6d 100644
--- a/flink-tests/src/test/java/org/apache/flink/test/recovery/JobManagerHAJobGraphRecoveryITCase.java
+++ b/flink-tests/src/test/java/org/apache/flink/test/recovery/JobManagerHAJobGraphRecoveryITCase.java
@@ -39,6 +39,7 @@ import org.apache.flink.runtime.leaderretrieval.LeaderRetrievalService;
import org.apache.flink.runtime.messages.JobManagerMessages;
import org.apache.flink.runtime.messages.JobManagerMessages.LeaderSessionMessage;
import org.apache.flink.runtime.messages.JobManagerMessages.SubmitJob;
+import org.apache.flink.runtime.metrics.NoOpMetricRegistry;
import org.apache.flink.runtime.taskmanager.TaskManager;
import org.apache.flink.runtime.testingUtils.TestingCluster;
import org.apache.flink.runtime.testingUtils.TestingUtils;
@@ -203,6 +204,7 @@ public class JobManagerHAJobGraphRecoveryITCase extends TestLogger {
ResourceID.generate(),
taskManagerSystem,
highAvailabilityServices,
+ new NoOpMetricRegistry(),
"localhost",
Option.<String>empty(),
false,
http://git-wip-us.apache.org/repos/asf/flink/blob/d45b9412/flink-tests/src/test/java/org/apache/flink/test/recovery/JobManagerHAProcessFailureBatchRecoveryITCase.java
----------------------------------------------------------------------
diff --git a/flink-tests/src/test/java/org/apache/flink/test/recovery/JobManagerHAProcessFailureBatchRecoveryITCase.java b/flink-tests/src/test/java/org/apache/flink/test/recovery/JobManagerHAProcessFailureBatchRecoveryITCase.java
index 2820dd2..8e97e9d 100644
--- a/flink-tests/src/test/java/org/apache/flink/test/recovery/JobManagerHAProcessFailureBatchRecoveryITCase.java
+++ b/flink-tests/src/test/java/org/apache/flink/test/recovery/JobManagerHAProcessFailureBatchRecoveryITCase.java
@@ -37,6 +37,7 @@ import org.apache.flink.runtime.instance.ActorGateway;
import org.apache.flink.runtime.instance.AkkaActorGateway;
import org.apache.flink.runtime.leaderelection.TestingListener;
import org.apache.flink.runtime.leaderretrieval.LeaderRetrievalService;
+import org.apache.flink.runtime.metrics.NoOpMetricRegistry;
import org.apache.flink.runtime.taskmanager.TaskManager;
import org.apache.flink.runtime.testingUtils.TestingUtils;
import org.apache.flink.runtime.testutils.CommonTestUtils;
@@ -281,6 +282,7 @@ public class JobManagerHAProcessFailureBatchRecoveryITCase extends TestLogger {
ResourceID.generate(),
tmActorSystem[i],
highAvailabilityServices,
+ new NoOpMetricRegistry(),
"localhost",
Option.<String>empty(),
false,
http://git-wip-us.apache.org/repos/asf/flink/blob/d45b9412/flink-tests/src/test/java/org/apache/flink/test/recovery/ProcessFailureCancelingITCase.java
----------------------------------------------------------------------
diff --git a/flink-tests/src/test/java/org/apache/flink/test/recovery/ProcessFailureCancelingITCase.java b/flink-tests/src/test/java/org/apache/flink/test/recovery/ProcessFailureCancelingITCase.java
index c70c2d5..ecd0bea 100644
--- a/flink-tests/src/test/java/org/apache/flink/test/recovery/ProcessFailureCancelingITCase.java
+++ b/flink-tests/src/test/java/org/apache/flink/test/recovery/ProcessFailureCancelingITCase.java
@@ -34,6 +34,7 @@ import org.apache.flink.runtime.highavailability.HighAvailabilityServicesUtils;
import org.apache.flink.runtime.jobmanager.JobManager;
import org.apache.flink.runtime.jobmanager.MemoryArchivist;
import org.apache.flink.runtime.messages.JobManagerMessages;
+import org.apache.flink.runtime.metrics.NoOpMetricRegistry;
import org.apache.flink.runtime.testingUtils.TestingUtils;
import org.apache.flink.runtime.testutils.CommonTestUtils;
import org.apache.flink.util.NetUtils;
@@ -120,6 +121,7 @@ public class ProcessFailureCancelingITCase extends TestLogger {
TestingUtils.defaultExecutor(),
TestingUtils.defaultExecutor(),
highAvailabilityServices,
+ new NoOpMetricRegistry(),
Option.empty(),
JobManager.class,
MemoryArchivist.class)._1();
http://git-wip-us.apache.org/repos/asf/flink/blob/d45b9412/flink-tests/src/test/java/org/apache/flink/test/state/operator/restore/AbstractOperatorRestoreTestBase.java
----------------------------------------------------------------------
diff --git a/flink-tests/src/test/java/org/apache/flink/test/state/operator/restore/AbstractOperatorRestoreTestBase.java b/flink-tests/src/test/java/org/apache/flink/test/state/operator/restore/AbstractOperatorRestoreTestBase.java
index e5131af..7488b62 100644
--- a/flink-tests/src/test/java/org/apache/flink/test/state/operator/restore/AbstractOperatorRestoreTestBase.java
+++ b/flink-tests/src/test/java/org/apache/flink/test/state/operator/restore/AbstractOperatorRestoreTestBase.java
@@ -34,6 +34,7 @@ import org.apache.flink.runtime.jobgraph.JobStatus;
import org.apache.flink.runtime.jobgraph.SavepointRestoreSettings;
import org.apache.flink.runtime.jobmanager.JobManager;
import org.apache.flink.runtime.messages.JobManagerMessages;
+import org.apache.flink.runtime.metrics.NoOpMetricRegistry;
import org.apache.flink.runtime.state.memory.MemoryStateBackend;
import org.apache.flink.runtime.taskmanager.TaskManager;
import org.apache.flink.runtime.testingUtils.TestingJobManager;
@@ -112,6 +113,7 @@ public abstract class AbstractOperatorRestoreTestBase extends TestLogger {
TestingUtils.defaultExecutor(),
TestingUtils.defaultExecutor(),
highAvailabilityServices,
+ new NoOpMetricRegistry(),
Option.empty(),
Option.apply("jm"),
Option.apply("arch"),
@@ -133,6 +135,7 @@ public abstract class AbstractOperatorRestoreTestBase extends TestLogger {
ResourceID.generate(),
actorSystem,
highAvailabilityServices,
+ new NoOpMetricRegistry(),
"localhost",
Option.apply("tm"),
true,
http://git-wip-us.apache.org/repos/asf/flink/blob/d45b9412/flink-yarn-tests/src/test/scala/org/apache/flink/yarn/TestingYarnJobManager.scala
----------------------------------------------------------------------
diff --git a/flink-yarn-tests/src/test/scala/org/apache/flink/yarn/TestingYarnJobManager.scala b/flink-yarn-tests/src/test/scala/org/apache/flink/yarn/TestingYarnJobManager.scala
index 298cd52..d0084b6 100644
--- a/flink-yarn-tests/src/test/scala/org/apache/flink/yarn/TestingYarnJobManager.scala
+++ b/flink-yarn-tests/src/test/scala/org/apache/flink/yarn/TestingYarnJobManager.scala
@@ -30,7 +30,7 @@ import org.apache.flink.runtime.instance.InstanceManager
import org.apache.flink.runtime.jobmanager.SubmittedJobGraphStore
import org.apache.flink.runtime.jobmanager.scheduler.Scheduler
import org.apache.flink.runtime.leaderelection.LeaderElectionService
-import org.apache.flink.runtime.metrics.MetricRegistry
+import org.apache.flink.runtime.metrics.groups.JobManagerMetricGroup
import org.apache.flink.runtime.testingUtils.TestingJobManagerLike
import scala.concurrent.duration.FiniteDuration
@@ -68,7 +68,7 @@ class TestingYarnJobManager(
submittedJobGraphs : SubmittedJobGraphStore,
checkpointRecoveryFactory : CheckpointRecoveryFactory,
jobRecoveryTimeout: FiniteDuration,
- metricRegistry : Option[MetricRegistry],
+ jobManagerMetricGroup : JobManagerMetricGroup,
optRestAddress: Option[String])
extends YarnJobManager(
flinkConfiguration,
@@ -85,6 +85,6 @@ class TestingYarnJobManager(
submittedJobGraphs,
checkpointRecoveryFactory,
jobRecoveryTimeout,
- metricRegistry,
+ jobManagerMetricGroup,
optRestAddress)
with TestingJobManagerLike {}
http://git-wip-us.apache.org/repos/asf/flink/blob/d45b9412/flink-yarn-tests/src/test/scala/org/apache/flink/yarn/TestingYarnTaskManager.scala
----------------------------------------------------------------------
diff --git a/flink-yarn-tests/src/test/scala/org/apache/flink/yarn/TestingYarnTaskManager.scala b/flink-yarn-tests/src/test/scala/org/apache/flink/yarn/TestingYarnTaskManager.scala
index a03f365..228eaaa 100644
--- a/flink-yarn-tests/src/test/scala/org/apache/flink/yarn/TestingYarnTaskManager.scala
+++ b/flink-yarn-tests/src/test/scala/org/apache/flink/yarn/TestingYarnTaskManager.scala
@@ -23,7 +23,7 @@ import org.apache.flink.runtime.highavailability.HighAvailabilityServices
import org.apache.flink.runtime.io.disk.iomanager.IOManager
import org.apache.flink.runtime.io.network.NetworkEnvironment
import org.apache.flink.runtime.memory.MemoryManager
-import org.apache.flink.runtime.metrics.MetricRegistry
+import org.apache.flink.runtime.metrics.groups.TaskManagerMetricGroup
import org.apache.flink.runtime.taskexecutor.TaskManagerConfiguration
import org.apache.flink.runtime.taskmanager.TaskManagerLocation
import org.apache.flink.runtime.testingUtils.TestingTaskManagerLike
@@ -52,7 +52,7 @@ class TestingYarnTaskManager(
network: NetworkEnvironment,
numberOfSlots: Int,
highAvailabilityServices: HighAvailabilityServices,
- metricRegistry : MetricRegistry)
+ taskManagerMetricGroup : TaskManagerMetricGroup)
extends YarnTaskManager(
config,
resourceID,
@@ -62,7 +62,7 @@ class TestingYarnTaskManager(
network,
numberOfSlots,
highAvailabilityServices,
- metricRegistry)
+ taskManagerMetricGroup)
with TestingTaskManagerLike {
object YarnTaskManager {
http://git-wip-us.apache.org/repos/asf/flink/blob/d45b9412/flink-yarn/src/main/java/org/apache/flink/yarn/YarnApplicationMasterRunner.java
----------------------------------------------------------------------
diff --git a/flink-yarn/src/main/java/org/apache/flink/yarn/YarnApplicationMasterRunner.java b/flink-yarn/src/main/java/org/apache/flink/yarn/YarnApplicationMasterRunner.java
index c101b75..95ba154 100644
--- a/flink-yarn/src/main/java/org/apache/flink/yarn/YarnApplicationMasterRunner.java
+++ b/flink-yarn/src/main/java/org/apache/flink/yarn/YarnApplicationMasterRunner.java
@@ -36,6 +36,8 @@ import org.apache.flink.runtime.highavailability.HighAvailabilityServicesUtils;
import org.apache.flink.runtime.jobmanager.JobManager;
import org.apache.flink.runtime.jobmanager.MemoryArchivist;
import org.apache.flink.runtime.jobmaster.JobMaster;
+import org.apache.flink.runtime.metrics.MetricRegistryConfiguration;
+import org.apache.flink.runtime.metrics.MetricRegistryImpl;
import org.apache.flink.runtime.process.ProcessReaper;
import org.apache.flink.runtime.security.SecurityConfiguration;
import org.apache.flink.runtime.security.SecurityUtils;
@@ -219,6 +221,7 @@ public class YarnApplicationMasterRunner {
ActorSystem actorSystem = null;
WebMonitor webMonitor = null;
HighAvailabilityServices highAvailabilityServices = null;
+ MetricRegistryImpl metricRegistry = null;
int numberProcessors = Hardware.getNumberCPUCores();
@@ -357,6 +360,11 @@ public class YarnApplicationMasterRunner {
new ScheduledExecutorServiceAdapter(futureExecutor),
LOG);
+ metricRegistry = new MetricRegistryImpl(
+ MetricRegistryConfiguration.fromConfiguration(config));
+
+ metricRegistry.startQueryService(actorSystem, null);
+
// 2: the JobManager
LOG.debug("Starting JobManager actor");
@@ -367,6 +375,7 @@ public class YarnApplicationMasterRunner {
futureExecutor,
ioExecutor,
highAvailabilityServices,
+ metricRegistry,
webMonitor == null ? Option.empty() : Option.apply(webMonitor.getRestAddress()),
new Some<>(JobMaster.JOB_MANAGER_NAME),
Option.<String>empty(),
@@ -455,6 +464,10 @@ public class YarnApplicationMasterRunner {
}
}
+ if (metricRegistry != null) {
+ metricRegistry.shutdown();
+ }
+
org.apache.flink.runtime.concurrent.Executors.gracefulShutdown(
AkkaUtils.getTimeout(config).toMillis(),
TimeUnit.MILLISECONDS,
http://git-wip-us.apache.org/repos/asf/flink/blob/d45b9412/flink-yarn/src/main/java/org/apache/flink/yarn/YarnResourceManager.java
----------------------------------------------------------------------
diff --git a/flink-yarn/src/main/java/org/apache/flink/yarn/YarnResourceManager.java b/flink-yarn/src/main/java/org/apache/flink/yarn/YarnResourceManager.java
index b32d25c..6feb287 100644
--- a/flink-yarn/src/main/java/org/apache/flink/yarn/YarnResourceManager.java
+++ b/flink-yarn/src/main/java/org/apache/flink/yarn/YarnResourceManager.java
@@ -28,7 +28,7 @@ import org.apache.flink.runtime.clusterframework.types.ResourceID;
import org.apache.flink.runtime.clusterframework.types.ResourceProfile;
import org.apache.flink.runtime.heartbeat.HeartbeatServices;
import org.apache.flink.runtime.highavailability.HighAvailabilityServices;
-import org.apache.flink.runtime.metrics.MetricRegistry;
+import org.apache.flink.runtime.metrics.MetricRegistryImpl;
import org.apache.flink.runtime.resourcemanager.JobLeaderIdService;
import org.apache.flink.runtime.resourcemanager.ResourceManager;
import org.apache.flink.runtime.resourcemanager.ResourceManagerConfiguration;
@@ -116,7 +116,7 @@ public class YarnResourceManager extends ResourceManager<ResourceID> implements
HighAvailabilityServices highAvailabilityServices,
HeartbeatServices heartbeatServices,
SlotManager slotManager,
- MetricRegistry metricRegistry,
+ MetricRegistryImpl metricRegistry,
JobLeaderIdService jobLeaderIdService,
FatalErrorHandler fatalErrorHandler) {
super(
http://git-wip-us.apache.org/repos/asf/flink/blob/d45b9412/flink-yarn/src/main/java/org/apache/flink/yarn/entrypoint/YarnJobClusterEntrypoint.java
----------------------------------------------------------------------
diff --git a/flink-yarn/src/main/java/org/apache/flink/yarn/entrypoint/YarnJobClusterEntrypoint.java b/flink-yarn/src/main/java/org/apache/flink/yarn/entrypoint/YarnJobClusterEntrypoint.java
index e1efb54..439fdf3 100644
--- a/flink-yarn/src/main/java/org/apache/flink/yarn/entrypoint/YarnJobClusterEntrypoint.java
+++ b/flink-yarn/src/main/java/org/apache/flink/yarn/entrypoint/YarnJobClusterEntrypoint.java
@@ -24,7 +24,7 @@ import org.apache.flink.runtime.entrypoint.JobClusterEntrypoint;
import org.apache.flink.runtime.heartbeat.HeartbeatServices;
import org.apache.flink.runtime.highavailability.HighAvailabilityServices;
import org.apache.flink.runtime.jobgraph.JobGraph;
-import org.apache.flink.runtime.metrics.MetricRegistry;
+import org.apache.flink.runtime.metrics.MetricRegistryImpl;
import org.apache.flink.runtime.resourcemanager.ResourceManager;
import org.apache.flink.runtime.resourcemanager.ResourceManagerConfiguration;
import org.apache.flink.runtime.resourcemanager.ResourceManagerRuntimeServices;
@@ -78,7 +78,7 @@ public class YarnJobClusterEntrypoint extends JobClusterEntrypoint {
RpcService rpcService,
HighAvailabilityServices highAvailabilityServices,
HeartbeatServices heartbeatServices,
- MetricRegistry metricRegistry,
+ MetricRegistryImpl metricRegistry,
FatalErrorHandler fatalErrorHandler) throws Exception {
final ResourceManagerConfiguration rmConfiguration = ResourceManagerConfiguration.fromConfiguration(configuration);
final ResourceManagerRuntimeServicesConfiguration rmServicesConfiguration = ResourceManagerRuntimeServicesConfiguration.fromConfiguration(configuration);
http://git-wip-us.apache.org/repos/asf/flink/blob/d45b9412/flink-yarn/src/main/java/org/apache/flink/yarn/entrypoint/YarnSessionClusterEntrypoint.java
----------------------------------------------------------------------
diff --git a/flink-yarn/src/main/java/org/apache/flink/yarn/entrypoint/YarnSessionClusterEntrypoint.java b/flink-yarn/src/main/java/org/apache/flink/yarn/entrypoint/YarnSessionClusterEntrypoint.java
index 042644b..a13f62c 100644
--- a/flink-yarn/src/main/java/org/apache/flink/yarn/entrypoint/YarnSessionClusterEntrypoint.java
+++ b/flink-yarn/src/main/java/org/apache/flink/yarn/entrypoint/YarnSessionClusterEntrypoint.java
@@ -23,7 +23,7 @@ import org.apache.flink.runtime.clusterframework.types.ResourceID;
import org.apache.flink.runtime.entrypoint.SessionClusterEntrypoint;
import org.apache.flink.runtime.heartbeat.HeartbeatServices;
import org.apache.flink.runtime.highavailability.HighAvailabilityServices;
-import org.apache.flink.runtime.metrics.MetricRegistry;
+import org.apache.flink.runtime.metrics.MetricRegistryImpl;
import org.apache.flink.runtime.resourcemanager.ResourceManager;
import org.apache.flink.runtime.resourcemanager.ResourceManagerConfiguration;
import org.apache.flink.runtime.resourcemanager.ResourceManagerRuntimeServices;
@@ -68,7 +68,7 @@ public class YarnSessionClusterEntrypoint extends SessionClusterEntrypoint {
RpcService rpcService,
HighAvailabilityServices highAvailabilityServices,
HeartbeatServices heartbeatServices,
- MetricRegistry metricRegistry,
+ MetricRegistryImpl metricRegistry,
FatalErrorHandler fatalErrorHandler) throws Exception {
final ResourceManagerConfiguration rmConfiguration = ResourceManagerConfiguration.fromConfiguration(configuration);
final ResourceManagerRuntimeServicesConfiguration rmServicesConfiguration = ResourceManagerRuntimeServicesConfiguration.fromConfiguration(configuration);
http://git-wip-us.apache.org/repos/asf/flink/blob/d45b9412/flink-yarn/src/main/scala/org/apache/flink/yarn/YarnJobManager.scala
----------------------------------------------------------------------
diff --git a/flink-yarn/src/main/scala/org/apache/flink/yarn/YarnJobManager.scala b/flink-yarn/src/main/scala/org/apache/flink/yarn/YarnJobManager.scala
index 5909160..6b439bd 100644
--- a/flink-yarn/src/main/scala/org/apache/flink/yarn/YarnJobManager.scala
+++ b/flink-yarn/src/main/scala/org/apache/flink/yarn/YarnJobManager.scala
@@ -34,7 +34,8 @@ import org.apache.flink.runtime.instance.InstanceManager
import org.apache.flink.runtime.jobmanager.scheduler.{Scheduler => FlinkScheduler}
import org.apache.flink.runtime.jobmanager.{JobManager, SubmittedJobGraphStore}
import org.apache.flink.runtime.leaderelection.LeaderElectionService
-import org.apache.flink.runtime.metrics.MetricRegistry
+import org.apache.flink.runtime.metrics.MetricRegistryImpl
+import org.apache.flink.runtime.metrics.groups.JobManagerMetricGroup
import org.apache.flink.yarn.configuration.YarnConfigOptions
import scala.concurrent.duration._
@@ -72,7 +73,7 @@ class YarnJobManager(
submittedJobGraphs : SubmittedJobGraphStore,
checkpointRecoveryFactory : CheckpointRecoveryFactory,
jobRecoveryTimeout: FiniteDuration,
- metricsRegistry: Option[MetricRegistry],
+ jobManagerMetricGroup: JobManagerMetricGroup,
optRestAddress: Option[String])
extends ContaineredJobManager(
flinkConfiguration,
@@ -89,7 +90,7 @@ class YarnJobManager(
submittedJobGraphs,
checkpointRecoveryFactory,
jobRecoveryTimeout,
- metricsRegistry,
+ jobManagerMetricGroup,
optRestAddress) {
val DEFAULT_YARN_HEARTBEAT_DELAY: FiniteDuration = 5 seconds
http://git-wip-us.apache.org/repos/asf/flink/blob/d45b9412/flink-yarn/src/main/scala/org/apache/flink/yarn/YarnTaskManager.scala
----------------------------------------------------------------------
diff --git a/flink-yarn/src/main/scala/org/apache/flink/yarn/YarnTaskManager.scala b/flink-yarn/src/main/scala/org/apache/flink/yarn/YarnTaskManager.scala
index e37ff6f..615466d 100644
--- a/flink-yarn/src/main/scala/org/apache/flink/yarn/YarnTaskManager.scala
+++ b/flink-yarn/src/main/scala/org/apache/flink/yarn/YarnTaskManager.scala
@@ -23,7 +23,7 @@ import org.apache.flink.runtime.highavailability.HighAvailabilityServices
import org.apache.flink.runtime.io.disk.iomanager.IOManager
import org.apache.flink.runtime.io.network.NetworkEnvironment
import org.apache.flink.runtime.memory.MemoryManager
-import org.apache.flink.runtime.metrics.MetricRegistry
+import org.apache.flink.runtime.metrics.groups.TaskManagerMetricGroup
import org.apache.flink.runtime.taskexecutor.TaskManagerConfiguration
import org.apache.flink.runtime.taskmanager.{TaskManager, TaskManagerLocation}
@@ -39,7 +39,7 @@ class YarnTaskManager(
network: NetworkEnvironment,
numberOfSlots: Int,
highAvailabilityServices: HighAvailabilityServices,
- metricRegistry : MetricRegistry)
+ taskManagerMetricGroup: TaskManagerMetricGroup)
extends TaskManager(
config,
resourceID,
@@ -49,7 +49,7 @@ class YarnTaskManager(
network,
numberOfSlots,
highAvailabilityServices,
- metricRegistry) {
+ taskManagerMetricGroup) {
override def handleMessage: Receive = {
super.handleMessage
[3/7] flink git commit: [FLINK-7876] Register TaskManagerMetricGroup
under ResourceID
Posted by tr...@apache.org.
http://git-wip-us.apache.org/repos/asf/flink/blob/d45b9412/flink-runtime/src/main/java/org/apache/flink/runtime/metrics/MetricRegistryImpl.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/metrics/MetricRegistryImpl.java b/flink-runtime/src/main/java/org/apache/flink/runtime/metrics/MetricRegistryImpl.java
new file mode 100644
index 0000000..407fa8b
--- /dev/null
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/metrics/MetricRegistryImpl.java
@@ -0,0 +1,412 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.flink.runtime.metrics;
+
+import org.apache.flink.annotation.VisibleForTesting;
+import org.apache.flink.api.java.tuple.Tuple2;
+import org.apache.flink.configuration.ConfigConstants;
+import org.apache.flink.configuration.Configuration;
+import org.apache.flink.metrics.Metric;
+import org.apache.flink.metrics.MetricConfig;
+import org.apache.flink.metrics.MetricGroup;
+import org.apache.flink.metrics.View;
+import org.apache.flink.metrics.reporter.MetricReporter;
+import org.apache.flink.metrics.reporter.Scheduled;
+import org.apache.flink.runtime.akka.AkkaUtils;
+import org.apache.flink.runtime.clusterframework.types.ResourceID;
+import org.apache.flink.runtime.metrics.dump.MetricQueryService;
+import org.apache.flink.runtime.metrics.groups.AbstractMetricGroup;
+import org.apache.flink.runtime.metrics.groups.FrontMetricGroup;
+import org.apache.flink.runtime.metrics.scope.ScopeFormats;
+import org.apache.flink.runtime.util.ExecutorThreadFactory;
+import org.apache.flink.util.Preconditions;
+
+import akka.actor.ActorRef;
+import akka.actor.ActorSystem;
+import akka.actor.Kill;
+import akka.pattern.Patterns;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.annotation.Nullable;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.TimerTask;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
+
+import scala.concurrent.Await;
+import scala.concurrent.Future;
+import scala.concurrent.duration.FiniteDuration;
+
+/**
+ * A MetricRegistry keeps track of all registered {@link Metric Metrics}. It serves as the
+ * connection between {@link MetricGroup MetricGroups} and {@link MetricReporter MetricReporters}.
+ */
+public class MetricRegistryImpl implements MetricRegistry {
+ static final Logger LOG = LoggerFactory.getLogger(MetricRegistryImpl.class);
+
+ private final Object lock = new Object();
+
+ private List<MetricReporter> reporters;
+ private ScheduledExecutorService executor;
+
+ @Nullable
+ private ActorRef queryService;
+
+ @Nullable
+ private String metricQueryServicePath;
+
+ private ViewUpdater viewUpdater;
+
+ private final ScopeFormats scopeFormats;
+ private final char globalDelimiter;
+ private final List<Character> delimiters = new ArrayList<>();
+
+ /**
+ * Creates a new MetricRegistry and starts the configured reporter.
+ */
+ public MetricRegistryImpl(MetricRegistryConfiguration config) {
+ this.scopeFormats = config.getScopeFormats();
+ this.globalDelimiter = config.getDelimiter();
+
+ // second, instantiate any custom configured reporters
+ this.reporters = new ArrayList<>();
+
+ List<Tuple2<String, Configuration>> reporterConfigurations = config.getReporterConfigurations();
+
+ this.executor = Executors.newSingleThreadScheduledExecutor(new ExecutorThreadFactory("Flink-MetricRegistry"));
+
+ this.queryService = null;
+ this.metricQueryServicePath = null;
+
+ if (reporterConfigurations.isEmpty()) {
+ // no reporters defined
+ // by default, don't report anything
+ LOG.info("No metrics reporter configured, no metrics will be exposed/reported.");
+ } else {
+ // we have some reporters so
+ for (Tuple2<String, Configuration> reporterConfiguration: reporterConfigurations) {
+ String namedReporter = reporterConfiguration.f0;
+ Configuration reporterConfig = reporterConfiguration.f1;
+
+ final String className = reporterConfig.getString(ConfigConstants.METRICS_REPORTER_CLASS_SUFFIX, null);
+ if (className == null) {
+ LOG.error("No reporter class set for reporter " + namedReporter + ". Metrics might not be exposed/reported.");
+ continue;
+ }
+
+ try {
+ String configuredPeriod = reporterConfig.getString(ConfigConstants.METRICS_REPORTER_INTERVAL_SUFFIX, null);
+ TimeUnit timeunit = TimeUnit.SECONDS;
+ long period = 10;
+
+ if (configuredPeriod != null) {
+ try {
+ String[] interval = configuredPeriod.split(" ");
+ period = Long.parseLong(interval[0]);
+ timeunit = TimeUnit.valueOf(interval[1]);
+ }
+ catch (Exception e) {
+ LOG.error("Cannot parse report interval from config: " + configuredPeriod +
+ " - please use values like '10 SECONDS' or '500 MILLISECONDS'. " +
+ "Using default reporting interval.");
+ }
+ }
+
+ Class<?> reporterClass = Class.forName(className);
+ MetricReporter reporterInstance = (MetricReporter) reporterClass.newInstance();
+
+ MetricConfig metricConfig = new MetricConfig();
+ reporterConfig.addAllToProperties(metricConfig);
+ LOG.info("Configuring {} with {}.", reporterClass.getSimpleName(), metricConfig);
+ reporterInstance.open(metricConfig);
+
+ if (reporterInstance instanceof Scheduled) {
+ LOG.info("Periodically reporting metrics in intervals of {} {} for reporter {} of type {}.", period, timeunit.name(), namedReporter, className);
+
+ executor.scheduleWithFixedDelay(
+ new MetricRegistryImpl.ReporterTask((Scheduled) reporterInstance), period, period, timeunit);
+ } else {
+ LOG.info("Reporting metrics for reporter {} of type {}.", namedReporter, className);
+ }
+ reporters.add(reporterInstance);
+
+ String delimiterForReporter = reporterConfig.getString(ConfigConstants.METRICS_REPORTER_SCOPE_DELIMITER, String.valueOf(globalDelimiter));
+ if (delimiterForReporter.length() != 1) {
+ LOG.warn("Failed to parse delimiter '{}' for reporter '{}', using global delimiter '{}'.", delimiterForReporter, namedReporter, globalDelimiter);
+ delimiterForReporter = String.valueOf(globalDelimiter);
+ }
+ this.delimiters.add(delimiterForReporter.charAt(0));
+ }
+ catch (Throwable t) {
+ LOG.error("Could not instantiate metrics reporter {}. Metrics might not be exposed/reported.", namedReporter, t);
+ }
+ }
+ }
+ }
+
+ /**
+ * Initializes the MetricQueryService.
+ *
+ * @param actorSystem ActorSystem to create the MetricQueryService on
+ * @param resourceID resource ID used to disambiguate the actor name
+ */
+ public void startQueryService(ActorSystem actorSystem, ResourceID resourceID) {
+ synchronized (lock) {
+ Preconditions.checkState(!isShutdown(), "The metric registry has already been shut down.");
+
+ try {
+ queryService = MetricQueryService.startMetricQueryService(actorSystem, resourceID);
+ metricQueryServicePath = AkkaUtils.getAkkaURL(actorSystem, queryService);
+ } catch (Exception e) {
+ LOG.warn("Could not start MetricDumpActor. No metrics will be submitted to the WebInterface.", e);
+ }
+ }
+ }
+
+ /**
+ * Returns the address under which the {@link MetricQueryService} is reachable.
+ *
+ * @return address of the metric query service
+ */
+ @Nullable
+ public String getMetricQueryServicePath() {
+ return metricQueryServicePath;
+ }
+
+ @Override
+ public char getDelimiter() {
+ return this.globalDelimiter;
+ }
+
+ @Override
+ public char getDelimiter(int reporterIndex) {
+ try {
+ return delimiters.get(reporterIndex);
+ } catch (IndexOutOfBoundsException e) {
+ LOG.warn("Delimiter for reporter index {} not found, returning global delimiter.", reporterIndex);
+ return this.globalDelimiter;
+ }
+ }
+
+ @Override
+ public int getNumberReporters() {
+ return reporters.size();
+ }
+
+ public List<MetricReporter> getReporters() {
+ return reporters;
+ }
+
+ /**
+ * Returns whether this registry has been shutdown.
+ *
+ * @return true, if this registry was shutdown, otherwise false
+ */
+ public boolean isShutdown() {
+ synchronized (lock) {
+ return reporters == null && executor.isShutdown();
+ }
+ }
+
+ /**
+ * Shuts down this registry and the associated {@link MetricReporter}.
+ */
+ public void shutdown() {
+ synchronized (lock) {
+ Future<Boolean> stopFuture = null;
+ FiniteDuration stopTimeout = null;
+
+ if (queryService != null) {
+ stopTimeout = new FiniteDuration(1L, TimeUnit.SECONDS);
+ stopFuture = Patterns.gracefulStop(queryService, stopTimeout);
+ }
+
+ if (reporters != null) {
+ for (MetricReporter reporter : reporters) {
+ try {
+ reporter.close();
+ } catch (Throwable t) {
+ LOG.warn("Metrics reporter did not shut down cleanly", t);
+ }
+ }
+ reporters = null;
+ }
+ shutdownExecutor();
+
+ if (stopFuture != null) {
+ boolean stopped = false;
+
+ try {
+ stopped = Await.result(stopFuture, stopTimeout);
+ } catch (Exception e) {
+ LOG.warn("Query actor did not properly stop.", e);
+ }
+
+ if (!stopped) {
+ // the query actor did not stop in time, let's kill him
+ queryService.tell(Kill.getInstance(), ActorRef.noSender());
+ }
+ }
+ }
+ }
+
+ private void shutdownExecutor() {
+ if (executor != null) {
+ executor.shutdown();
+
+ try {
+ if (!executor.awaitTermination(1L, TimeUnit.SECONDS)) {
+ executor.shutdownNow();
+ }
+ } catch (InterruptedException e) {
+ executor.shutdownNow();
+ }
+ }
+ }
+
+ @Override
+ public ScopeFormats getScopeFormats() {
+ return scopeFormats;
+ }
+
+ // ------------------------------------------------------------------------
+ // Metrics (de)registration
+ // ------------------------------------------------------------------------
+
+ @Override
+ public void register(Metric metric, String metricName, AbstractMetricGroup group) {
+ synchronized (lock) {
+ if (isShutdown()) {
+ LOG.warn("Cannot register metric, because the MetricRegistry has already been shut down.");
+ } else {
+ if (reporters != null) {
+ for (int i = 0; i < reporters.size(); i++) {
+ MetricReporter reporter = reporters.get(i);
+ try {
+ if (reporter != null) {
+ FrontMetricGroup front = new FrontMetricGroup<AbstractMetricGroup<?>>(i, group);
+ reporter.notifyOfAddedMetric(metric, metricName, front);
+ }
+ } catch (Exception e) {
+ LOG.warn("Error while registering metric.", e);
+ }
+ }
+ }
+ try {
+ if (queryService != null) {
+ MetricQueryService.notifyOfAddedMetric(queryService, metric, metricName, group);
+ }
+ } catch (Exception e) {
+ LOG.warn("Error while registering metric.", e);
+ }
+ try {
+ if (metric instanceof View) {
+ if (viewUpdater == null) {
+ viewUpdater = new ViewUpdater(executor);
+ }
+ viewUpdater.notifyOfAddedView((View) metric);
+ }
+ } catch (Exception e) {
+ LOG.warn("Error while registering metric.", e);
+ }
+ }
+ }
+ }
+
+ @Override
+ public void unregister(Metric metric, String metricName, AbstractMetricGroup group) {
+ synchronized (lock) {
+ if (isShutdown()) {
+ LOG.warn("Cannot unregister metric, because the MetricRegistry has already been shut down.");
+ } else {
+ if (reporters != null) {
+ for (int i = 0; i < reporters.size(); i++) {
+ try {
+ MetricReporter reporter = reporters.get(i);
+ if (reporter != null) {
+ FrontMetricGroup front = new FrontMetricGroup<AbstractMetricGroup<?>>(i, group);
+ reporter.notifyOfRemovedMetric(metric, metricName, front);
+ }
+ } catch (Exception e) {
+ LOG.warn("Error while registering metric.", e);
+ }
+ }
+ }
+ try {
+ if (queryService != null) {
+ MetricQueryService.notifyOfRemovedMetric(queryService, metric);
+ }
+ } catch (Exception e) {
+ LOG.warn("Error while registering metric.", e);
+ }
+ try {
+ if (metric instanceof View) {
+ if (viewUpdater != null) {
+ viewUpdater.notifyOfRemovedView((View) metric);
+ }
+ }
+ } catch (Exception e) {
+ LOG.warn("Error while registering metric.", e);
+ }
+ }
+ }
+ }
+
+ // ------------------------------------------------------------------------
+
+ @VisibleForTesting
+ @Nullable
+ public ActorRef getQueryService() {
+ return queryService;
+ }
+
+ // ------------------------------------------------------------------------
+
+ /**
+ * This task is explicitly a static class, so that it does not hold any references to the enclosing
+ * MetricsRegistry instance.
+ *
+ * <p>This is a subtle difference, but very important: With this static class, the enclosing class instance
+ * may become garbage-collectible, whereas with an anonymous inner class, the timer thread
+ * (which is a GC root) will hold a reference via the timer task and its enclosing instance pointer.
+ * Making the MetricsRegistry garbage collectible makes the java.util.Timer garbage collectible,
+ * which acts as a fail-safe to stop the timer thread and prevents resource leaks.
+ */
+ private static final class ReporterTask extends TimerTask {
+
+ private final Scheduled reporter;
+
+ private ReporterTask(Scheduled reporter) {
+ this.reporter = reporter;
+ }
+
+ @Override
+ public void run() {
+ try {
+ reporter.report();
+ } catch (Throwable t) {
+ LOG.warn("Error while reporting metrics", t);
+ }
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/flink/blob/d45b9412/flink-runtime/src/main/java/org/apache/flink/runtime/metrics/groups/AbstractMetricGroup.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/metrics/groups/AbstractMetricGroup.java b/flink-runtime/src/main/java/org/apache/flink/runtime/metrics/groups/AbstractMetricGroup.java
index ab59977..66eace5 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/metrics/groups/AbstractMetricGroup.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/metrics/groups/AbstractMetricGroup.java
@@ -106,7 +106,7 @@ public abstract class AbstractMetricGroup<A extends AbstractMetricGroup<?>> impl
this.registry = checkNotNull(registry);
this.scopeComponents = checkNotNull(scope);
this.parent = parent;
- this.scopeStrings = new String[registry.getReporters() == null ? 0 : registry.getReporters().size()];
+ this.scopeStrings = new String[registry.getNumberReporters()];
}
public Map<String, String> getAllVariables() {
http://git-wip-us.apache.org/repos/asf/flink/blob/d45b9412/flink-runtime/src/main/java/org/apache/flink/runtime/minicluster/MiniCluster.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/minicluster/MiniCluster.java b/flink-runtime/src/main/java/org/apache/flink/runtime/minicluster/MiniCluster.java
index dd352bb..d4248ee 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/minicluster/MiniCluster.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/minicluster/MiniCluster.java
@@ -32,7 +32,7 @@ import org.apache.flink.runtime.highavailability.HighAvailabilityServicesUtils;
import org.apache.flink.runtime.jobgraph.JobGraph;
import org.apache.flink.runtime.leaderelection.LeaderAddressAndId;
import org.apache.flink.runtime.leaderretrieval.LeaderRetrievalService;
-import org.apache.flink.runtime.metrics.MetricRegistry;
+import org.apache.flink.runtime.metrics.MetricRegistryImpl;
import org.apache.flink.runtime.metrics.MetricRegistryConfiguration;
import org.apache.flink.runtime.resourcemanager.ResourceManagerGateway;
import org.apache.flink.runtime.resourcemanager.ResourceManagerId;
@@ -68,7 +68,7 @@ public class MiniCluster {
private final MiniClusterConfiguration miniClusterConfiguration;
@GuardedBy("lock")
- private MetricRegistry metricRegistry;
+ private MetricRegistryImpl metricRegistry;
@GuardedBy("lock")
private RpcService commonRpcService;
@@ -464,8 +464,8 @@ public class MiniCluster {
*
* @param config The configuration of the mini cluster
*/
- protected MetricRegistry createMetricRegistry(Configuration config) {
- return new MetricRegistry(MetricRegistryConfiguration.fromConfiguration(config));
+ protected MetricRegistryImpl createMetricRegistry(Configuration config) {
+ return new MetricRegistryImpl(MetricRegistryConfiguration.fromConfiguration(config));
}
/**
@@ -502,7 +502,7 @@ public class MiniCluster {
Configuration configuration,
HighAvailabilityServices haServices,
HeartbeatServices heartbeatServices,
- MetricRegistry metricRegistry,
+ MetricRegistryImpl metricRegistry,
int numResourceManagers,
RpcService[] resourceManagerRpcServices) throws Exception {
@@ -528,7 +528,7 @@ public class MiniCluster {
protected TaskExecutor[] startTaskManagers(
Configuration configuration,
HighAvailabilityServices haServices,
- MetricRegistry metricRegistry,
+ MetricRegistryImpl metricRegistry,
int numTaskManagers,
RpcService[] taskManagerRpcServices) throws Exception {
http://git-wip-us.apache.org/repos/asf/flink/blob/d45b9412/flink-runtime/src/main/java/org/apache/flink/runtime/minicluster/MiniClusterJobDispatcher.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/minicluster/MiniClusterJobDispatcher.java b/flink-runtime/src/main/java/org/apache/flink/runtime/minicluster/MiniClusterJobDispatcher.java
index 60d9a66..ca042b6 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/minicluster/MiniClusterJobDispatcher.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/minicluster/MiniClusterJobDispatcher.java
@@ -30,7 +30,7 @@ import org.apache.flink.runtime.jobgraph.JobGraph;
import org.apache.flink.runtime.jobmanager.OnCompletionActions;
import org.apache.flink.runtime.jobmaster.JobManagerRunner;
import org.apache.flink.runtime.jobmaster.JobManagerServices;
-import org.apache.flink.runtime.metrics.MetricRegistry;
+import org.apache.flink.runtime.metrics.MetricRegistryImpl;
import org.apache.flink.runtime.rpc.FatalErrorHandler;
import org.apache.flink.runtime.rpc.RpcService;
import org.apache.flink.util.ExceptionUtils;
@@ -75,7 +75,7 @@ public class MiniClusterJobDispatcher {
private final JobManagerServices jobManagerServices;
/** Registry for all metrics in the mini cluster */
- private final MetricRegistry metricRegistry;
+ private final MetricRegistryImpl metricRegistry;
/** The number of JobManagers to launch (more than one simulates a high-availability setup) */
private final int numJobManagers;
@@ -104,7 +104,7 @@ public class MiniClusterJobDispatcher {
HighAvailabilityServices haServices,
BlobServer blobServer,
HeartbeatServices heartbeatServices,
- MetricRegistry metricRegistry) throws Exception {
+ MetricRegistryImpl metricRegistry) throws Exception {
this(
config,
haServices,
@@ -132,7 +132,7 @@ public class MiniClusterJobDispatcher {
HighAvailabilityServices haServices,
BlobServer blobServer,
HeartbeatServices heartbeatServices,
- MetricRegistry metricRegistry,
+ MetricRegistryImpl metricRegistry,
int numJobManagers,
RpcService[] rpcServices) throws Exception {
http://git-wip-us.apache.org/repos/asf/flink/blob/d45b9412/flink-runtime/src/main/java/org/apache/flink/runtime/minicluster/StandaloneMiniCluster.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/minicluster/StandaloneMiniCluster.java b/flink-runtime/src/main/java/org/apache/flink/runtime/minicluster/StandaloneMiniCluster.java
index cbefe5a..90fb115 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/minicluster/StandaloneMiniCluster.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/minicluster/StandaloneMiniCluster.java
@@ -18,9 +18,6 @@
package org.apache.flink.runtime.minicluster;
-import akka.actor.ActorRef;
-import akka.actor.ActorSystem;
-import akka.pattern.Patterns;
import org.apache.flink.configuration.Configuration;
import org.apache.flink.configuration.JobManagerOptions;
import org.apache.flink.runtime.akka.AkkaUtils;
@@ -31,18 +28,25 @@ import org.apache.flink.runtime.highavailability.HighAvailabilityServicesUtils;
import org.apache.flink.runtime.jobmanager.JobManager;
import org.apache.flink.runtime.jobmanager.MemoryArchivist;
import org.apache.flink.runtime.messages.TaskManagerMessages;
+import org.apache.flink.runtime.metrics.MetricRegistryImpl;
+import org.apache.flink.runtime.metrics.MetricRegistryConfiguration;
import org.apache.flink.runtime.taskmanager.TaskManager;
import org.apache.flink.util.ExceptionUtils;
import org.apache.flink.util.Preconditions;
-import scala.Option;
-import scala.concurrent.Await;
-import scala.concurrent.Future;
-import scala.concurrent.duration.FiniteDuration;
+
+import akka.actor.ActorRef;
+import akka.actor.ActorSystem;
+import akka.pattern.Patterns;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.ScheduledThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
+import scala.Option;
+import scala.concurrent.Await;
+import scala.concurrent.Future;
+import scala.concurrent.duration.FiniteDuration;
+
/**
* Mini cluster to run the old JobManager code without embedded high availability services. This
* class has been implemented because the normal {@link FlinkMiniCluster} has been changed to use
@@ -63,6 +67,8 @@ public class StandaloneMiniCluster {
private final HighAvailabilityServices highAvailabilityServices;
+ private final MetricRegistryImpl metricRegistry;
+
private final FiniteDuration timeout;
private final int port;
@@ -86,21 +92,28 @@ public class StandaloneMiniCluster {
Executors.directExecutor(),
HighAvailabilityServicesUtils.AddressResolution.TRY_ADDRESS_RESOLUTION);
+ metricRegistry = new MetricRegistryImpl(
+ MetricRegistryConfiguration.fromConfiguration(configuration));
+
JobManager.startJobManagerActors(
configuration,
actorSystem,
scheduledExecutorService,
scheduledExecutorService,
highAvailabilityServices,
+ metricRegistry,
Option.empty(),
JobManager.class,
MemoryArchivist.class);
+ final ResourceID taskManagerResourceId = ResourceID.generate();
+
ActorRef taskManager = TaskManager.startTaskManagerComponentsAndActor(
configuration,
- ResourceID.generate(),
+ taskManagerResourceId,
actorSystem,
highAvailabilityServices,
+ metricRegistry,
LOCAL_HOSTNAME,
Option.<String>empty(),
true,
http://git-wip-us.apache.org/repos/asf/flink/blob/d45b9412/flink-runtime/src/main/java/org/apache/flink/runtime/resourcemanager/ResourceManager.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/resourcemanager/ResourceManager.java b/flink-runtime/src/main/java/org/apache/flink/runtime/resourcemanager/ResourceManager.java
index 1d4d4f3..98b80c6 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/resourcemanager/ResourceManager.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/resourcemanager/ResourceManager.java
@@ -42,7 +42,7 @@ import org.apache.flink.runtime.jobmaster.JobMasterRegistrationSuccess;
import org.apache.flink.runtime.leaderelection.LeaderContender;
import org.apache.flink.runtime.leaderelection.LeaderElectionService;
import org.apache.flink.runtime.messages.Acknowledge;
-import org.apache.flink.runtime.metrics.MetricRegistry;
+import org.apache.flink.runtime.metrics.MetricRegistryImpl;
import org.apache.flink.runtime.metrics.dump.MetricQueryService;
import org.apache.flink.runtime.registration.RegistrationResponse;
import org.apache.flink.runtime.resourcemanager.exceptions.ResourceManagerException;
@@ -118,7 +118,7 @@ public abstract class ResourceManager<WorkerType extends Serializable>
private final HeartbeatManager<Void, Void> jobManagerHeartbeatManager;
/** Registry to use for metrics. */
- private final MetricRegistry metricRegistry;
+ private final MetricRegistryImpl metricRegistry;
/** Fatal error handler. */
private final FatalErrorHandler fatalErrorHandler;
@@ -140,7 +140,7 @@ public abstract class ResourceManager<WorkerType extends Serializable>
HighAvailabilityServices highAvailabilityServices,
HeartbeatServices heartbeatServices,
SlotManager slotManager,
- MetricRegistry metricRegistry,
+ MetricRegistryImpl metricRegistry,
JobLeaderIdService jobLeaderIdService,
FatalErrorHandler fatalErrorHandler) {
@@ -498,8 +498,8 @@ public abstract class ResourceManager<WorkerType extends Serializable>
}
@Override
- public CompletableFuture<Collection<Tuple2<InstanceID, String>>> requestTaskManagerMetricQueryServicePaths(Time timeout) {
- final ArrayList<Tuple2<InstanceID, String>> metricQueryServicePaths = new ArrayList<>(taskExecutors.size());
+ public CompletableFuture<Collection<Tuple2<ResourceID, String>>> requestTaskManagerMetricQueryServicePaths(Time timeout) {
+ final ArrayList<Tuple2<ResourceID, String>> metricQueryServicePaths = new ArrayList<>(taskExecutors.size());
for (Map.Entry<ResourceID, WorkerRegistration<WorkerType>> workerRegistrationEntry : taskExecutors.entrySet()) {
final ResourceID tmResourceId = workerRegistrationEntry.getKey();
@@ -508,7 +508,7 @@ public abstract class ResourceManager<WorkerType extends Serializable>
final String tmMetricQueryServicePath = taskManagerAddress.substring(0, taskManagerAddress.lastIndexOf('/') + 1) +
MetricQueryService.METRIC_QUERY_SERVICE_NAME + '_' + tmResourceId.getResourceIdString();
- metricQueryServicePaths.add(Tuple2.of(workerRegistration.getInstanceID(), tmMetricQueryServicePath));
+ metricQueryServicePaths.add(Tuple2.of(tmResourceId, tmMetricQueryServicePath));
}
return CompletableFuture.completedFuture(metricQueryServicePaths);
http://git-wip-us.apache.org/repos/asf/flink/blob/d45b9412/flink-runtime/src/main/java/org/apache/flink/runtime/resourcemanager/ResourceManagerGateway.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/resourcemanager/ResourceManagerGateway.java b/flink-runtime/src/main/java/org/apache/flink/runtime/resourcemanager/ResourceManagerGateway.java
index 9eacb4b..cc2766b 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/resourcemanager/ResourceManagerGateway.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/resourcemanager/ResourceManagerGateway.java
@@ -176,5 +176,5 @@ public interface ResourceManagerGateway extends FencedRpcGateway<ResourceManager
* @param timeout for the asynchronous operation
* @return Future containing the collection of instance ids and the corresponding metric query service path
*/
- CompletableFuture<Collection<Tuple2<InstanceID, String>>> requestTaskManagerMetricQueryServicePaths(@RpcTimeout Time timeout);
+ CompletableFuture<Collection<Tuple2<ResourceID, String>>> requestTaskManagerMetricQueryServicePaths(@RpcTimeout Time timeout);
}
http://git-wip-us.apache.org/repos/asf/flink/blob/d45b9412/flink-runtime/src/main/java/org/apache/flink/runtime/resourcemanager/ResourceManagerRunner.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/resourcemanager/ResourceManagerRunner.java b/flink-runtime/src/main/java/org/apache/flink/runtime/resourcemanager/ResourceManagerRunner.java
index caa3ba0..361bdd4 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/resourcemanager/ResourceManagerRunner.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/resourcemanager/ResourceManagerRunner.java
@@ -22,7 +22,7 @@ import org.apache.flink.configuration.Configuration;
import org.apache.flink.runtime.clusterframework.types.ResourceID;
import org.apache.flink.runtime.heartbeat.HeartbeatServices;
import org.apache.flink.runtime.highavailability.HighAvailabilityServices;
-import org.apache.flink.runtime.metrics.MetricRegistry;
+import org.apache.flink.runtime.metrics.MetricRegistryImpl;
import org.apache.flink.runtime.rpc.FatalErrorHandler;
import org.apache.flink.runtime.rpc.RpcService;
import org.apache.flink.util.FlinkException;
@@ -55,7 +55,7 @@ public class ResourceManagerRunner implements FatalErrorHandler {
final RpcService rpcService,
final HighAvailabilityServices highAvailabilityServices,
final HeartbeatServices heartbeatServices,
- final MetricRegistry metricRegistry) throws Exception {
+ final MetricRegistryImpl metricRegistry) throws Exception {
Preconditions.checkNotNull(resourceId);
Preconditions.checkNotNull(configuration);
http://git-wip-us.apache.org/repos/asf/flink/blob/d45b9412/flink-runtime/src/main/java/org/apache/flink/runtime/resourcemanager/StandaloneResourceManager.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/resourcemanager/StandaloneResourceManager.java b/flink-runtime/src/main/java/org/apache/flink/runtime/resourcemanager/StandaloneResourceManager.java
index 624f31d..d2b1205 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/resourcemanager/StandaloneResourceManager.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/resourcemanager/StandaloneResourceManager.java
@@ -23,7 +23,7 @@ import org.apache.flink.runtime.clusterframework.types.ResourceID;
import org.apache.flink.runtime.clusterframework.types.ResourceProfile;
import org.apache.flink.runtime.heartbeat.HeartbeatServices;
import org.apache.flink.runtime.highavailability.HighAvailabilityServices;
-import org.apache.flink.runtime.metrics.MetricRegistry;
+import org.apache.flink.runtime.metrics.MetricRegistryImpl;
import org.apache.flink.runtime.resourcemanager.exceptions.ResourceManagerException;
import org.apache.flink.runtime.resourcemanager.slotmanager.SlotManager;
import org.apache.flink.runtime.rpc.FatalErrorHandler;
@@ -45,7 +45,7 @@ public class StandaloneResourceManager extends ResourceManager<ResourceID> {
HighAvailabilityServices highAvailabilityServices,
HeartbeatServices heartbeatServices,
SlotManager slotManager,
- MetricRegistry metricRegistry,
+ MetricRegistryImpl metricRegistry,
JobLeaderIdService jobLeaderIdService,
FatalErrorHandler fatalErrorHandler) {
super(
http://git-wip-us.apache.org/repos/asf/flink/blob/d45b9412/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/legacy/TaskManagerLogHandler.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/legacy/TaskManagerLogHandler.java b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/legacy/TaskManagerLogHandler.java
index cf5bfcb..4d6ccd5 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/legacy/TaskManagerLogHandler.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/legacy/TaskManagerLogHandler.java
@@ -31,8 +31,8 @@ import org.apache.flink.configuration.ConfigConstants;
import org.apache.flink.configuration.Configuration;
import org.apache.flink.runtime.blob.TransientBlobCache;
import org.apache.flink.runtime.blob.TransientBlobKey;
+import org.apache.flink.runtime.clusterframework.types.ResourceID;
import org.apache.flink.runtime.instance.Instance;
-import org.apache.flink.runtime.instance.InstanceID;
import org.apache.flink.runtime.jobmaster.JobManagerGateway;
import org.apache.flink.runtime.rest.handler.RedirectHandler;
import org.apache.flink.runtime.rest.handler.WebHandler;
@@ -166,13 +166,13 @@ public class TaskManagerLogHandler extends RedirectHandler<JobManagerGateway> im
//fetch TaskManager logs if no other process is currently doing it
if (lastRequestPending.putIfAbsent(taskManagerID, true) == null) {
try {
- InstanceID instanceID = new InstanceID(StringUtils.hexStringToByte(taskManagerID));
- CompletableFuture<Optional<Instance>> taskManagerFuture = jobManagerGateway.requestTaskManagerInstance(instanceID, timeout);
+ ResourceID resourceId = new ResourceID(new String(StringUtils.hexStringToByte(taskManagerID)));
+ CompletableFuture<Optional<Instance>> taskManagerFuture = jobManagerGateway.requestTaskManagerInstance(resourceId, timeout);
CompletableFuture<TransientBlobKey> blobKeyFuture = taskManagerFuture.thenCompose(
(Optional<Instance> optTMInstance) -> {
Instance taskManagerInstance = optTMInstance.orElseThrow(
- () -> new CompletionException(new FlinkException("Could not find instance with " + instanceID + '.')));
+ () -> new CompletionException(new FlinkException("Could not find instance with " + resourceId + '.')));
switch (fileMode) {
case LOG:
return taskManagerInstance.getTaskManagerGateway().requestTaskManagerLog(timeout);
http://git-wip-us.apache.org/repos/asf/flink/blob/d45b9412/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/legacy/TaskManagersHandler.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/legacy/TaskManagersHandler.java b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/legacy/TaskManagersHandler.java
index ad2ee1b..84c6e41 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/legacy/TaskManagersHandler.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/legacy/TaskManagersHandler.java
@@ -19,19 +19,20 @@
package org.apache.flink.runtime.rest.handler.legacy;
import org.apache.flink.api.common.time.Time;
+import org.apache.flink.runtime.clusterframework.types.ResourceID;
import org.apache.flink.runtime.concurrent.FutureUtils;
import org.apache.flink.runtime.instance.Instance;
-import org.apache.flink.runtime.instance.InstanceID;
import org.apache.flink.runtime.jobmaster.JobManagerGateway;
import org.apache.flink.runtime.rest.handler.legacy.metrics.MetricFetcher;
import org.apache.flink.runtime.rest.handler.legacy.metrics.MetricStore;
import org.apache.flink.util.FlinkException;
-import org.apache.flink.util.StringUtils;
import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.core.JsonGenerator;
import java.io.IOException;
import java.io.StringWriter;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
import java.util.Collection;
import java.util.Collections;
import java.util.Map;
@@ -74,8 +75,16 @@ public class TaskManagersHandler extends AbstractJsonRequestHandler {
// return them in an array. This avoids unnecessary code complexity.
// If only one task manager is requested, we only fetch one task manager metrics.
if (pathParams.containsKey(TASK_MANAGER_ID_KEY)) {
- InstanceID instanceID = new InstanceID(StringUtils.hexStringToByte(pathParams.get(TASK_MANAGER_ID_KEY)));
- CompletableFuture<Optional<Instance>> tmInstanceFuture = jobManagerGateway.requestTaskManagerInstance(instanceID, timeout);
+ final String unescapedString;
+
+ try {
+ unescapedString = URLDecoder.decode(pathParams.get(TASK_MANAGER_ID_KEY), "UTF-8");
+ } catch (UnsupportedEncodingException e) {
+ return FutureUtils.completedExceptionally(new FlinkException("Could not decode task manager id: " + pathParams.get(TASK_MANAGER_ID_KEY) + '.', e));
+ }
+
+ ResourceID resourceId = new ResourceID(unescapedString);
+ CompletableFuture<Optional<Instance>> tmInstanceFuture = jobManagerGateway.requestTaskManagerInstance(resourceId, timeout);
return tmInstanceFuture.thenApplyAsync(
(Optional<Instance> optTaskManager) -> {
@@ -116,7 +125,7 @@ public class TaskManagersHandler extends AbstractJsonRequestHandler {
for (Instance instance : instances) {
gen.writeStartObject();
- gen.writeStringField("id", instance.getId().toString());
+ gen.writeStringField("id", instance.getTaskManagerID().getResourceIdString());
gen.writeStringField("path", instance.getTaskManagerGateway().getAddress());
gen.writeNumberField("dataPort", instance.getTaskManagerLocation().dataPort());
gen.writeNumberField("timeSinceLastHeartbeat", instance.getLastHeartBeat());
@@ -131,7 +140,7 @@ public class TaskManagersHandler extends AbstractJsonRequestHandler {
if (pathParams.containsKey(TASK_MANAGER_ID_KEY)) {
fetcher.update();
- MetricStore.TaskManagerMetricStore metrics = fetcher.getMetricStore().getTaskManagerMetricStore(instance.getId().toString());
+ MetricStore.TaskManagerMetricStore metrics = fetcher.getMetricStore().getTaskManagerMetricStore(instance.getTaskManagerID().getResourceIdString());
if (metrics != null) {
gen.writeObjectFieldStart("metrics");
long heapUsed = Long.valueOf(metrics.getMetric("Status.JVM.Memory.Heap.Used", "0"));
http://git-wip-us.apache.org/repos/asf/flink/blob/d45b9412/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/legacy/metrics/MetricFetcher.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/legacy/metrics/MetricFetcher.java b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/legacy/metrics/MetricFetcher.java
index 1bfb9f2..e71a1d7 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/legacy/metrics/MetricFetcher.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/legacy/metrics/MetricFetcher.java
@@ -20,7 +20,7 @@ package org.apache.flink.runtime.rest.handler.legacy.metrics;
import org.apache.flink.api.common.time.Time;
import org.apache.flink.api.java.tuple.Tuple2;
-import org.apache.flink.runtime.instance.InstanceID;
+import org.apache.flink.runtime.clusterframework.types.ResourceID;
import org.apache.flink.runtime.messages.webmonitor.JobDetails;
import org.apache.flink.runtime.messages.webmonitor.MultipleJobsDetails;
import org.apache.flink.runtime.metrics.dump.MetricDumpSerialization;
@@ -145,20 +145,20 @@ public class MetricFetcher<T extends RestfulGateway> {
// TODO: Once the old code has been ditched, remove the explicit TaskManager query service discovery
// TODO: and return it as part of requestQueryServicePaths. Moreover, change the MetricStore such that
// TODO: we don't have to explicitly retain the valid TaskManagers, e.g. letting it be a cache with expiry time
- CompletableFuture<Collection<Tuple2<InstanceID, String>>> taskManagerQueryServicePathsFuture = leaderGateway
+ CompletableFuture<Collection<Tuple2<ResourceID, String>>> taskManagerQueryServicePathsFuture = leaderGateway
.requestTaskManagerMetricQueryServicePaths(timeout);
taskManagerQueryServicePathsFuture.whenCompleteAsync(
- (Collection<Tuple2<InstanceID, String>> queryServicePaths, Throwable throwable) -> {
+ (Collection<Tuple2<ResourceID, String>> queryServicePaths, Throwable throwable) -> {
if (throwable != null) {
LOG.warn("Requesting TaskManager's path for query services failed.", throwable);
} else {
List<String> taskManagersToRetain = queryServicePaths
.stream()
.map(
- (Tuple2<InstanceID, String> tuple) -> {
+ (Tuple2<ResourceID, String> tuple) -> {
retrieveAndQueryMetrics(tuple.f1);
- return tuple.f0.toString();
+ return tuple.f0.getResourceIdString();
}
).collect(Collectors.toList());
http://git-wip-us.apache.org/repos/asf/flink/blob/d45b9412/flink-runtime/src/main/java/org/apache/flink/runtime/taskexecutor/TaskExecutor.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/taskexecutor/TaskExecutor.java b/flink-runtime/src/main/java/org/apache/flink/runtime/taskexecutor/TaskExecutor.java
index cd67705..a956111 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/taskexecutor/TaskExecutor.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/taskexecutor/TaskExecutor.java
@@ -55,7 +55,7 @@ import org.apache.flink.runtime.jobmaster.JobMasterId;
import org.apache.flink.runtime.leaderretrieval.LeaderRetrievalListener;
import org.apache.flink.runtime.memory.MemoryManager;
import org.apache.flink.runtime.messages.Acknowledge;
-import org.apache.flink.runtime.metrics.MetricRegistry;
+import org.apache.flink.runtime.metrics.MetricRegistryImpl;
import org.apache.flink.runtime.metrics.groups.TaskManagerMetricGroup;
import org.apache.flink.runtime.metrics.groups.TaskMetricGroup;
import org.apache.flink.runtime.registration.RegistrationConnectionListener;
@@ -135,7 +135,7 @@ public class TaskExecutor extends RpcEndpoint implements TaskExecutorGateway {
private final NetworkEnvironment networkEnvironment;
/** The metric registry in the task manager */
- private final MetricRegistry metricRegistry;
+ private final MetricRegistryImpl metricRegistry;
/** The heartbeat manager for job manager in the task manager */
private final HeartbeatManager<Void, Void> jobManagerHeartbeatManager;
@@ -179,7 +179,7 @@ public class TaskExecutor extends RpcEndpoint implements TaskExecutorGateway {
NetworkEnvironment networkEnvironment,
HighAvailabilityServices haServices,
HeartbeatServices heartbeatServices,
- MetricRegistry metricRegistry,
+ MetricRegistryImpl metricRegistry,
TaskManagerMetricGroup taskManagerMetricGroup,
BroadcastVariableManager broadcastVariableManager,
FileCache fileCache,
http://git-wip-us.apache.org/repos/asf/flink/blob/d45b9412/flink-runtime/src/main/java/org/apache/flink/runtime/taskexecutor/TaskManagerRunner.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/taskexecutor/TaskManagerRunner.java b/flink-runtime/src/main/java/org/apache/flink/runtime/taskexecutor/TaskManagerRunner.java
index 782ab07..5a69bb1 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/taskexecutor/TaskManagerRunner.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/taskexecutor/TaskManagerRunner.java
@@ -29,22 +29,19 @@ import org.apache.flink.runtime.concurrent.Executors;
import org.apache.flink.runtime.heartbeat.HeartbeatServices;
import org.apache.flink.runtime.highavailability.HighAvailabilityServices;
import org.apache.flink.runtime.highavailability.HighAvailabilityServicesUtils;
-import org.apache.flink.runtime.metrics.MetricRegistry;
+import org.apache.flink.runtime.metrics.MetricRegistryImpl;
import org.apache.flink.runtime.metrics.MetricRegistryConfiguration;
-import org.apache.flink.runtime.metrics.groups.TaskManagerMetricGroup;
import org.apache.flink.runtime.rpc.FatalErrorHandler;
import org.apache.flink.runtime.rpc.RpcService;
import org.apache.flink.runtime.rpc.akka.AkkaRpcService;
import org.apache.flink.runtime.rpc.akka.AkkaRpcServiceUtils;
import org.apache.flink.runtime.security.SecurityConfiguration;
import org.apache.flink.runtime.security.SecurityUtils;
-import org.apache.flink.runtime.taskexecutor.utils.TaskExecutorMetricsInitializer;
import org.apache.flink.runtime.util.EnvironmentInformation;
import org.apache.flink.runtime.util.ExecutorThreadFactory;
import org.apache.flink.runtime.util.Hardware;
import org.apache.flink.runtime.util.JvmShutdownSafeguard;
import org.apache.flink.runtime.util.LeaderRetrievalUtils;
-
import org.apache.flink.runtime.util.SignalHandler;
import org.apache.flink.util.ExceptionUtils;
import org.apache.flink.util.Preconditions;
@@ -86,7 +83,7 @@ public class TaskManagerRunner implements FatalErrorHandler {
private final HighAvailabilityServices highAvailabilityServices;
- private final MetricRegistry metricRegistry;
+ private final MetricRegistryImpl metricRegistry;
/** Executor used to run future callbacks */
private final ExecutorService executor;
@@ -112,7 +109,7 @@ public class TaskManagerRunner implements FatalErrorHandler {
HeartbeatServices heartbeatServices = HeartbeatServices.fromConfiguration(configuration);
- metricRegistry = new MetricRegistry(MetricRegistryConfiguration.fromConfiguration(configuration));
+ metricRegistry = new MetricRegistryImpl(MetricRegistryConfiguration.fromConfiguration(configuration));
final ActorSystem actorSystem = ((AkkaRpcService) rpcService).getActorSystem();
metricRegistry.startQueryService(actorSystem, resourceId);
@@ -250,7 +247,7 @@ public class TaskManagerRunner implements FatalErrorHandler {
RpcService rpcService,
HighAvailabilityServices highAvailabilityServices,
HeartbeatServices heartbeatServices,
- MetricRegistry metricRegistry,
+ MetricRegistryImpl metricRegistry,
boolean localCommunicationOnly,
FatalErrorHandler fatalErrorHandler) throws Exception {
@@ -269,18 +266,11 @@ public class TaskManagerRunner implements FatalErrorHandler {
TaskManagerServices taskManagerServices = TaskManagerServices.fromConfiguration(
taskManagerServicesConfiguration,
- resourceID);
+ resourceID,
+ metricRegistry);
TaskManagerConfiguration taskManagerConfiguration = TaskManagerConfiguration.fromConfiguration(configuration);
- TaskManagerMetricGroup taskManagerMetricGroup = new TaskManagerMetricGroup(
- metricRegistry,
- taskManagerServices.getTaskManagerLocation().getHostname(),
- resourceID.toString());
-
- // Initialize the TM metrics
- TaskExecutorMetricsInitializer.instantiateStatusMetrics(taskManagerMetricGroup, taskManagerServices.getNetworkEnvironment());
-
return new TaskExecutor(
rpcService,
taskManagerConfiguration,
@@ -291,7 +281,7 @@ public class TaskManagerRunner implements FatalErrorHandler {
highAvailabilityServices,
heartbeatServices,
metricRegistry,
- taskManagerMetricGroup,
+ taskManagerServices.getTaskManagerMetricGroup(),
taskManagerServices.getBroadcastVariableManager(),
taskManagerServices.getFileCache(),
taskManagerServices.getTaskSlotTable(),
http://git-wip-us.apache.org/repos/asf/flink/blob/d45b9412/flink-runtime/src/main/java/org/apache/flink/runtime/taskexecutor/TaskManagerServices.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/taskexecutor/TaskManagerServices.java b/flink-runtime/src/main/java/org/apache/flink/runtime/taskexecutor/TaskManagerServices.java
index 2baf644..85e62c6 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/taskexecutor/TaskManagerServices.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/taskexecutor/TaskManagerServices.java
@@ -38,6 +38,7 @@ import org.apache.flink.runtime.io.network.netty.NettyConnectionManager;
import org.apache.flink.runtime.io.network.partition.ResultPartitionManager;
import org.apache.flink.runtime.memory.MemoryManager;
import org.apache.flink.runtime.metrics.MetricRegistry;
+import org.apache.flink.runtime.metrics.MetricRegistryImpl;
import org.apache.flink.runtime.metrics.groups.TaskManagerMetricGroup;
import org.apache.flink.runtime.query.KvStateClientProxy;
import org.apache.flink.runtime.query.KvStateRegistry;
@@ -62,7 +63,7 @@ import java.util.concurrent.ScheduledThreadPoolExecutor;
/**
* Container for {@link TaskExecutor} services such as the {@link MemoryManager}, {@link IOManager},
- * {@link NetworkEnvironment} and the {@link MetricRegistry}.
+ * {@link NetworkEnvironment} and the {@link MetricRegistryImpl}.
*/
public class TaskManagerServices {
private static final Logger LOG = LoggerFactory.getLogger(TaskManagerServices.class);
@@ -72,7 +73,6 @@ public class TaskManagerServices {
private final MemoryManager memoryManager;
private final IOManager ioManager;
private final NetworkEnvironment networkEnvironment;
- private final MetricRegistry metricRegistry;
private final TaskManagerMetricGroup taskManagerMetricGroup;
private final BroadcastVariableManager broadcastVariableManager;
private final FileCache fileCache;
@@ -85,7 +85,6 @@ public class TaskManagerServices {
MemoryManager memoryManager,
IOManager ioManager,
NetworkEnvironment networkEnvironment,
- MetricRegistry metricRegistry,
TaskManagerMetricGroup taskManagerMetricGroup,
BroadcastVariableManager broadcastVariableManager,
FileCache fileCache,
@@ -97,7 +96,6 @@ public class TaskManagerServices {
this.memoryManager = Preconditions.checkNotNull(memoryManager);
this.ioManager = Preconditions.checkNotNull(ioManager);
this.networkEnvironment = Preconditions.checkNotNull(networkEnvironment);
- this.metricRegistry = Preconditions.checkNotNull(metricRegistry);
this.taskManagerMetricGroup = Preconditions.checkNotNull(taskManagerMetricGroup);
this.broadcastVariableManager = Preconditions.checkNotNull(broadcastVariableManager);
this.fileCache = Preconditions.checkNotNull(fileCache);
@@ -126,10 +124,6 @@ public class TaskManagerServices {
return taskManagerLocation;
}
- public MetricRegistry getMetricRegistry() {
- return metricRegistry;
- }
-
public TaskManagerMetricGroup getTaskManagerMetricGroup() {
return taskManagerMetricGroup;
}
@@ -163,12 +157,14 @@ public class TaskManagerServices {
*
* @param resourceID resource ID of the task manager
* @param taskManagerServicesConfiguration task manager configuration
+ * @param metricRegistry to register the TaskManagerMetricGroup
* @return task manager components
* @throws Exception
*/
public static TaskManagerServices fromConfiguration(
TaskManagerServicesConfiguration taskManagerServicesConfiguration,
- ResourceID resourceID) throws Exception {
+ ResourceID resourceID,
+ MetricRegistry metricRegistry) throws Exception {
// pre-start checks
checkTempDirs(taskManagerServicesConfiguration.getTmpDirPaths());
@@ -187,9 +183,6 @@ public class TaskManagerServices {
// start the I/O manager, it will create some temp directories.
final IOManager ioManager = new IOManagerAsync(taskManagerServicesConfiguration.getTmpDirPaths());
- final MetricRegistry metricRegistry = new MetricRegistry(
- taskManagerServicesConfiguration.getMetricRegistryConfiguration());
-
final TaskManagerMetricGroup taskManagerMetricGroup = new TaskManagerMetricGroup(
metricRegistry,
taskManagerLocation.getHostname(),
@@ -223,7 +216,6 @@ public class TaskManagerServices {
memoryManager,
ioManager,
network,
- metricRegistry,
taskManagerMetricGroup,
broadcastVariableManager,
fileCache,
http://git-wip-us.apache.org/repos/asf/flink/blob/d45b9412/flink-runtime/src/main/java/org/apache/flink/runtime/taskexecutor/TaskManagerServicesConfiguration.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/taskexecutor/TaskManagerServicesConfiguration.java b/flink-runtime/src/main/java/org/apache/flink/runtime/taskexecutor/TaskManagerServicesConfiguration.java
index bfd37bc..990fb22 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/taskexecutor/TaskManagerServicesConfiguration.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/taskexecutor/TaskManagerServicesConfiguration.java
@@ -28,7 +28,6 @@ import org.apache.flink.runtime.akka.AkkaUtils;
import org.apache.flink.runtime.io.disk.iomanager.IOManager;
import org.apache.flink.runtime.io.network.netty.NettyConfig;
import org.apache.flink.runtime.memory.MemoryManager;
-import org.apache.flink.runtime.metrics.MetricRegistryConfiguration;
import org.apache.flink.runtime.taskmanager.NetworkEnvironmentConfiguration;
import org.apache.flink.util.MathUtils;
import org.apache.flink.util.NetUtils;
@@ -72,8 +71,6 @@ public class TaskManagerServicesConfiguration {
private final float memoryFraction;
- private final MetricRegistryConfiguration metricRegistryConfiguration;
-
private final long timerServiceShutdownTimeout;
public TaskManagerServicesConfiguration(
@@ -85,7 +82,6 @@ public class TaskManagerServicesConfiguration {
long configuredMemory,
boolean preAllocateMemory,
float memoryFraction,
- MetricRegistryConfiguration metricRegistryConfiguration,
long timerServiceShutdownTimeout) {
this.taskManagerAddress = checkNotNull(taskManagerAddress);
@@ -98,8 +94,6 @@ public class TaskManagerServicesConfiguration {
this.preAllocateMemory = preAllocateMemory;
this.memoryFraction = memoryFraction;
- this.metricRegistryConfiguration = checkNotNull(metricRegistryConfiguration);
-
checkArgument(timerServiceShutdownTimeout >= 0L, "The timer " +
"service shutdown timeout must be greater or equal to 0.");
this.timerServiceShutdownTimeout = timerServiceShutdownTimeout;
@@ -148,10 +142,6 @@ public class TaskManagerServicesConfiguration {
return preAllocateMemory;
}
- public MetricRegistryConfiguration getMetricRegistryConfiguration() {
- return metricRegistryConfiguration;
- }
-
public long getTimerServiceShutdownTimeout() {
return timerServiceShutdownTimeout;
}
@@ -211,8 +201,6 @@ public class TaskManagerServicesConfiguration {
TaskManagerOptions.MANAGED_MEMORY_FRACTION.key(),
"MemoryManager fraction of the free memory must be between 0.0 and 1.0");
- final MetricRegistryConfiguration metricRegistryConfiguration = MetricRegistryConfiguration.fromConfiguration(configuration);
-
long timerServiceShutdownTimeout = AkkaUtils.getTimeout(configuration).toMillis();
return new TaskManagerServicesConfiguration(
@@ -224,7 +212,6 @@ public class TaskManagerServicesConfiguration {
configuredMemory,
preAllocateMemory,
memoryFraction,
- metricRegistryConfiguration,
timerServiceShutdownTimeout);
}
http://git-wip-us.apache.org/repos/asf/flink/blob/d45b9412/flink-runtime/src/main/java/org/apache/flink/runtime/webmonitor/RestfulGateway.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/webmonitor/RestfulGateway.java b/flink-runtime/src/main/java/org/apache/flink/runtime/webmonitor/RestfulGateway.java
index d871b06..331e96b 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/webmonitor/RestfulGateway.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/webmonitor/RestfulGateway.java
@@ -21,8 +21,8 @@ package org.apache.flink.runtime.webmonitor;
import org.apache.flink.api.common.JobID;
import org.apache.flink.api.common.time.Time;
import org.apache.flink.api.java.tuple.Tuple2;
+import org.apache.flink.runtime.clusterframework.types.ResourceID;
import org.apache.flink.runtime.executiongraph.AccessExecutionGraph;
-import org.apache.flink.runtime.instance.InstanceID;
import org.apache.flink.runtime.messages.FlinkJobNotFoundException;
import org.apache.flink.runtime.messages.webmonitor.ClusterOverview;
import org.apache.flink.runtime.messages.webmonitor.MultipleJobsDetails;
@@ -95,5 +95,5 @@ public interface RestfulGateway extends RpcGateway {
* @param timeout for the asynchronous operation
* @return Future containing the collection of instance ids and the corresponding metric query service path
*/
- CompletableFuture<Collection<Tuple2<InstanceID, String>>> requestTaskManagerMetricQueryServicePaths(@RpcTimeout Time timeout);
+ CompletableFuture<Collection<Tuple2<ResourceID, String>>> requestTaskManagerMetricQueryServicePaths(@RpcTimeout Time timeout);
}
http://git-wip-us.apache.org/repos/asf/flink/blob/d45b9412/flink-runtime/src/main/scala/org/apache/flink/runtime/clusterframework/ContaineredJobManager.scala
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/scala/org/apache/flink/runtime/clusterframework/ContaineredJobManager.scala b/flink-runtime/src/main/scala/org/apache/flink/runtime/clusterframework/ContaineredJobManager.scala
index 74ef1de..1c573c0 100644
--- a/flink-runtime/src/main/scala/org/apache/flink/runtime/clusterframework/ContaineredJobManager.scala
+++ b/flink-runtime/src/main/scala/org/apache/flink/runtime/clusterframework/ContaineredJobManager.scala
@@ -35,7 +35,8 @@ import org.apache.flink.runtime.jobmanager.{JobManager, SubmittedJobGraphStore}
import org.apache.flink.runtime.leaderelection.LeaderElectionService
import org.apache.flink.runtime.messages.Acknowledge
import org.apache.flink.runtime.messages.JobManagerMessages.{CurrentJobStatus, JobNotFound, RequestJobStatus}
-import org.apache.flink.runtime.metrics.{MetricRegistry => FlinkMetricRegistry}
+import org.apache.flink.runtime.metrics.groups.JobManagerMetricGroup
+import org.apache.flink.runtime.metrics.{MetricRegistryImpl => FlinkMetricRegistry}
import scala.concurrent.duration._
import scala.language.postfixOps
@@ -74,7 +75,7 @@ abstract class ContaineredJobManager(
submittedJobGraphs : SubmittedJobGraphStore,
checkpointRecoveryFactory : CheckpointRecoveryFactory,
jobRecoveryTimeout: FiniteDuration,
- metricsRegistry: Option[FlinkMetricRegistry],
+ jobManagerMetricGroup: JobManagerMetricGroup,
optRestAddress: Option[String])
extends JobManager(
flinkConfiguration,
@@ -91,7 +92,7 @@ abstract class ContaineredJobManager(
submittedJobGraphs,
checkpointRecoveryFactory,
jobRecoveryTimeout,
- metricsRegistry,
+ jobManagerMetricGroup,
optRestAddress) {
val jobPollingInterval: FiniteDuration
http://git-wip-us.apache.org/repos/asf/flink/blob/d45b9412/flink-runtime/src/main/scala/org/apache/flink/runtime/jobmanager/JobManager.scala
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/scala/org/apache/flink/runtime/jobmanager/JobManager.scala b/flink-runtime/src/main/scala/org/apache/flink/runtime/jobmanager/JobManager.scala
index 0435046..d40a0fd 100644
--- a/flink-runtime/src/main/scala/org/apache/flink/runtime/jobmanager/JobManager.scala
+++ b/flink-runtime/src/main/scala/org/apache/flink/runtime/jobmanager/JobManager.scala
@@ -34,7 +34,6 @@ import org.apache.flink.api.common.time.Time
import org.apache.flink.configuration._
import org.apache.flink.core.fs.{FileSystem, Path}
import org.apache.flink.core.io.InputSplitAssigner
-import org.apache.flink.metrics.groups.UnregisteredMetricsGroup
import org.apache.flink.metrics.{Gauge, MetricGroup}
import org.apache.flink.runtime.accumulators.AccumulatorSnapshot
import org.apache.flink.runtime.akka.{AkkaUtils, ListeningBehaviour}
@@ -50,10 +49,10 @@ import org.apache.flink.runtime.concurrent.{FutureUtils, ScheduledExecutorServic
import org.apache.flink.runtime.execution.SuppressRestartsException
import org.apache.flink.runtime.execution.librarycache.FlinkUserCodeClassLoaders.ResolveOrder
import org.apache.flink.runtime.execution.librarycache.{BlobLibraryCacheManager, LibraryCacheManager}
-import org.apache.flink.runtime.executiongraph.restart.RestartStrategyFactory
import org.apache.flink.runtime.executiongraph._
-import org.apache.flink.runtime.highavailability.{HighAvailabilityServices, HighAvailabilityServicesUtils}
+import org.apache.flink.runtime.executiongraph.restart.RestartStrategyFactory
import org.apache.flink.runtime.highavailability.HighAvailabilityServicesUtils.AddressResolution
+import org.apache.flink.runtime.highavailability.{HighAvailabilityServices, HighAvailabilityServicesUtils}
import org.apache.flink.runtime.instance.{AkkaActorGateway, InstanceID, InstanceManager}
import org.apache.flink.runtime.jobgraph.{JobGraph, JobStatus}
import org.apache.flink.runtime.jobmanager.SubmittedJobGraphStore.SubmittedJobGraphListener
@@ -66,20 +65,18 @@ import org.apache.flink.runtime.messages.ExecutionGraphMessages.JobStatusChanged
import org.apache.flink.runtime.messages.JobManagerMessages._
import org.apache.flink.runtime.messages.Messages.Disconnect
import org.apache.flink.runtime.messages.RegistrationMessages._
-import org.apache.flink.runtime.messages.{Acknowledge, StackTrace}
import org.apache.flink.runtime.messages.TaskManagerMessages.Heartbeat
import org.apache.flink.runtime.messages.TaskMessages.UpdateTaskExecutionState
import org.apache.flink.runtime.messages.accumulators._
import org.apache.flink.runtime.messages.checkpoint.{AbstractCheckpointMessage, AcknowledgeCheckpoint, DeclineCheckpoint}
import org.apache.flink.runtime.messages.webmonitor.{InfoMessage, _}
+import org.apache.flink.runtime.messages.{Acknowledge, StackTrace}
import org.apache.flink.runtime.metrics.groups.JobManagerMetricGroup
-import org.apache.flink.runtime.metrics.{MetricRegistryConfiguration, MetricRegistry => FlinkMetricRegistry}
import org.apache.flink.runtime.metrics.util.MetricUtils
-import org.apache.flink.runtime.net.SSLUtils
+import org.apache.flink.runtime.metrics.{MetricRegistryConfiguration, MetricRegistryImpl, MetricRegistry => FlinkMetricRegistry}
import org.apache.flink.runtime.process.ProcessReaper
import org.apache.flink.runtime.query.KvStateMessage.{LookupKvStateLocation, NotifyKvStateRegistered, NotifyKvStateUnregistered}
import org.apache.flink.runtime.query.{KvStateMessage, UnknownKvStateLocation}
-import org.apache.flink.runtime.rpc.akka.AkkaRpcServiceUtils
import org.apache.flink.runtime.security.{SecurityConfiguration, SecurityUtils}
import org.apache.flink.runtime.taskexecutor.TaskExecutor
import org.apache.flink.runtime.taskmanager.TaskManager
@@ -137,7 +134,7 @@ class JobManager(
protected val submittedJobGraphs : SubmittedJobGraphStore,
protected val checkpointRecoveryFactory : CheckpointRecoveryFactory,
protected val jobRecoveryTimeout: FiniteDuration,
- protected val metricsRegistry: Option[FlinkMetricRegistry],
+ protected val jobManagerMetricGroup: JobManagerMetricGroup,
protected val optRestAddress: Option[String])
extends FlinkActor
with LeaderSessionMessageFilter // mixin oder is important, we want filtering after logging
@@ -154,16 +151,6 @@ class JobManager(
var leaderSessionID: Option[UUID] = None
- protected val jobManagerMetricGroup : Option[JobManagerMetricGroup] = metricsRegistry match {
- case Some(registry) =>
- val host = flinkConfiguration.getString(JobManagerOptions.ADDRESS)
- Option(new JobManagerMetricGroup(
- registry, NetUtils.unresolvedHostToNormalizedString(host)))
- case None =>
- log.warn("Could not instantiate JobManager metrics.")
- None
- }
-
/** Futures which have to be completed before terminating the job manager */
var futuresToComplete: Option[Seq[Future[Unit]]] = None
@@ -205,12 +192,7 @@ class JobManager(
throw new RuntimeException("Could not start the submitted job graphs service.", e)
}
- jobManagerMetricGroup match {
- case Some(group) =>
- instantiateMetrics(group)
- case None =>
- log.warn("Could not instantiate JobManager metric group.")
- }
+ instantiateMetrics(jobManagerMetricGroup)
}
override def postStop(): Unit = {
@@ -250,6 +232,8 @@ class JobManager(
archive ! decorateMessage(PoisonPill)
}
+ jobManagerMetricGroup.close()
+
instanceManager.shutdown()
scheduler.shutdown()
libraryCacheManager.shutdown()
@@ -260,13 +244,6 @@ class JobManager(
case e: IOException => log.error("Could not properly shutdown the blob server.", e)
}
- // failsafe shutdown of the metrics registry
- try {
- metricsRegistry.foreach(_.shutdown())
- } catch {
- case t: Exception => log.error("MetricRegistry did not shutdown properly.", t)
- }
-
log.debug(s"Job manager ${self.path} is completely stopped.")
}
@@ -1073,9 +1050,9 @@ class JobManager(
)
)
- case RequestTaskManagerInstance(instanceID) =>
+ case RequestTaskManagerInstance(resourceId) =>
sender ! decorateMessage(
- TaskManagerInstance(Option(instanceManager.getRegisteredInstanceById(instanceID)))
+ TaskManagerInstance(Option(instanceManager.getRegisteredInstance(resourceId)))
)
case Heartbeat(instanceID, accumulators) =>
@@ -1283,15 +1260,7 @@ class JobManager(
log.info(s"Using restart strategy $restartStrategy for $jobId.")
- val jobMetrics = jobManagerMetricGroup match {
- case Some(group) =>
- group.addJob(jobGraph) match {
- case (jobGroup:Any) => jobGroup
- case null => new UnregisteredMetricsGroup()
- }
- case None =>
- new UnregisteredMetricsGroup()
- }
+ val jobMetrics = jobManagerMetricGroup.addJob(jobGraph)
val numSlots = scheduler.getTotalNumberOfSlots()
@@ -1791,7 +1760,7 @@ class JobManager(
libraryCacheManager.unregisterJob(jobID)
blobServer.cleanupJob(jobID)
- jobManagerMetricGroup.foreach(_.removeJob(jobID))
+ jobManagerMetricGroup.removeJob(jobID)
futureOption
}
@@ -2042,7 +2011,12 @@ object JobManager {
val highAvailabilityServices = HighAvailabilityServicesUtils.createHighAvailabilityServices(
configuration,
ioExecutor,
- AddressResolution.NO_ADDRESS_RESOLUTION);
+ AddressResolution.NO_ADDRESS_RESOLUTION)
+
+ val metricRegistry = new MetricRegistryImpl(
+ MetricRegistryConfiguration.fromConfiguration(configuration))
+
+ metricRegistry.startQueryService(jobManagerSystem, null)
val (_, _, webMonitorOption, _) = try {
startJobManagerActors(
@@ -2053,6 +2027,7 @@ object JobManager {
futureExecutor,
ioExecutor,
highAvailabilityServices,
+ metricRegistry,
classOf[JobManager],
classOf[MemoryArchivist],
Option(classOf[StandaloneResourceManager])
@@ -2085,6 +2060,13 @@ object JobManager {
LOG.warn("Could not properly stop the high availability services.", t)
}
+ try {
+ metricRegistry.shutdown()
+ } catch {
+ case t: Throwable =>
+ LOG.warn("Could not properly shut down the metric registry.", t)
+ }
+
FlinkExecutors.gracefulShutdown(
timeout.toMillis,
TimeUnit.MILLISECONDS,
@@ -2191,6 +2173,7 @@ object JobManager {
futureExecutor: ScheduledExecutorService,
ioExecutor: Executor,
highAvailabilityServices: HighAvailabilityServices,
+ metricRegistry: FlinkMetricRegistry,
jobManagerClass: Class[_ <: JobManager],
archiveClass: Class[_ <: MemoryArchivist],
resourceManagerClass: Option[Class[_ <: FlinkResourceManager[_]]])
@@ -2231,6 +2214,7 @@ object JobManager {
futureExecutor,
ioExecutor,
highAvailabilityServices,
+ metricRegistry,
webMonitor.map(_.getRestAddress),
jobManagerClass,
archiveClass)
@@ -2250,11 +2234,14 @@ object JobManager {
if (executionMode == JobManagerMode.LOCAL) {
LOG.info("Starting embedded TaskManager for JobManager's LOCAL execution mode")
+ val resourceId = ResourceID.generate()
+
val taskManagerActor = TaskManager.startTaskManagerComponentsAndActor(
configuration,
- ResourceID.generate(),
+ resourceId,
jobManagerSystem,
highAvailabilityServices,
+ metricRegistry,
externalHostname,
Some(TaskExecutor.TASK_MANAGER_NAME),
localTaskManagerCommunication = true,
@@ -2433,7 +2420,8 @@ object JobManager {
configuration: Configuration,
futureExecutor: ScheduledExecutorService,
ioExecutor: Executor,
- blobStore: BlobStore) :
+ blobStore: BlobStore,
+ metricRegistry: FlinkMetricRegistry) :
(InstanceManager,
FlinkScheduler,
BlobServer,
@@ -2443,7 +2431,7 @@ object JobManager {
Int, // number of archived jobs
Option[Path], // archive path
FiniteDuration, // timeout for job recovery
- Option[FlinkMetricRegistry]
+ JobManagerMetricGroup
) = {
val timeout: FiniteDuration = AkkaUtils.getTimeout(configuration)
@@ -2525,12 +2513,9 @@ object JobManager {
}
}
- val metricRegistry = try {
- Option(new FlinkMetricRegistry(MetricRegistryConfiguration.fromConfiguration(configuration)))
- } catch {
- case _: Exception =>
- None
- }
+ val jobManagerMetricGroup = new JobManagerMetricGroup(
+ metricRegistry,
+ configuration.getString(JobManagerOptions.ADDRESS))
(instanceManager,
scheduler,
@@ -2541,7 +2526,7 @@ object JobManager {
archiveCount,
archivePath,
jobRecoveryTimeout,
- metricRegistry)
+ jobManagerMetricGroup)
}
/**
@@ -2564,6 +2549,7 @@ object JobManager {
futureExecutor: ScheduledExecutorService,
ioExecutor: Executor,
highAvailabilityServices: HighAvailabilityServices,
+ metricRegistry: FlinkMetricRegistry,
optRestAddress: Option[String],
jobManagerClass: Class[_ <: JobManager],
archiveClass: Class[_ <: MemoryArchivist])
@@ -2575,6 +2561,7 @@ object JobManager {
futureExecutor,
ioExecutor,
highAvailabilityServices,
+ metricRegistry,
optRestAddress,
Some(JobMaster.JOB_MANAGER_NAME),
Some(JobMaster.ARCHIVE_NAME),
@@ -2606,6 +2593,7 @@ object JobManager {
futureExecutor: ScheduledExecutorService,
ioExecutor: Executor,
highAvailabilityServices: HighAvailabilityServices,
+ metricRegistry: FlinkMetricRegistry,
optRestAddress: Option[String],
jobManagerActorName: Option[String],
archiveActorName: Option[String],
@@ -2622,11 +2610,12 @@ object JobManager {
archiveCount,
archivePath,
jobRecoveryTimeout,
- metricsRegistry) = createJobManagerComponents(
+ jobManagerMetricGroup) = createJobManagerComponents(
configuration,
futureExecutor,
ioExecutor,
- highAvailabilityServices.createBlobStore())
+ highAvailabilityServices.createBlobStore(),
+ metricRegistry)
val archiveProps = getArchiveProps(archiveClass, archiveCount, archivePath)
@@ -2653,7 +2642,7 @@ object JobManager {
highAvailabilityServices.getSubmittedJobGraphStore(),
highAvailabilityServices.getCheckpointRecoveryFactory(),
jobRecoveryTimeout,
- metricsRegistry,
+ jobManagerMetricGroup,
optRestAddress)
val jobManager: ActorRef = jobManagerActorName match {
@@ -2661,12 +2650,6 @@ object JobManager {
case None => actorSystem.actorOf(jobManagerProps)
}
- metricsRegistry match {
- case Some(registry) =>
- registry.startQueryService(actorSystem, null)
- case None =>
- }
-
(jobManager, archive)
}
@@ -2693,7 +2676,7 @@ object JobManager {
submittedJobGraphStore: SubmittedJobGraphStore,
checkpointRecoveryFactory: CheckpointRecoveryFactory,
jobRecoveryTimeout: FiniteDuration,
- metricsRegistry: Option[FlinkMetricRegistry],
+ jobManagerMetricGroup: JobManagerMetricGroup,
optRestAddress: Option[String]): Props = {
Props(
@@ -2712,7 +2695,7 @@ object JobManager {
submittedJobGraphStore,
checkpointRecoveryFactory,
jobRecoveryTimeout,
- metricsRegistry,
+ jobManagerMetricGroup,
optRestAddress)
}
}
http://git-wip-us.apache.org/repos/asf/flink/blob/d45b9412/flink-runtime/src/main/scala/org/apache/flink/runtime/messages/JobManagerMessages.scala
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/scala/org/apache/flink/runtime/messages/JobManagerMessages.scala b/flink-runtime/src/main/scala/org/apache/flink/runtime/messages/JobManagerMessages.scala
index 3e896ca..5c19c7a 100644
--- a/flink-runtime/src/main/scala/org/apache/flink/runtime/messages/JobManagerMessages.scala
+++ b/flink-runtime/src/main/scala/org/apache/flink/runtime/messages/JobManagerMessages.scala
@@ -24,8 +24,9 @@ import java.util.UUID
import akka.actor.ActorRef
import org.apache.flink.api.common.JobID
import org.apache.flink.runtime.akka.ListeningBehaviour
-import org.apache.flink.runtime.blob.{PermanentBlobKey}
+import org.apache.flink.runtime.blob.PermanentBlobKey
import org.apache.flink.runtime.client.{JobStatusMessage, SerializedJobExecutionResult}
+import org.apache.flink.runtime.clusterframework.types.ResourceID
import org.apache.flink.runtime.executiongraph.{AccessExecutionGraph, ExecutionAttemptID, ExecutionGraph}
import org.apache.flink.runtime.instance.{Instance, InstanceID}
import org.apache.flink.runtime.io.network.partition.ResultPartitionID
@@ -419,9 +420,9 @@ object JobManagerMessages {
/**
* Requests the [[Instance]] object of the task manager with the given instance ID
*
- * @param instanceID Instance ID of the task manager
+ * @param resourceId identifying the TaskManager which shall be retrieved
*/
- case class RequestTaskManagerInstance(instanceID: InstanceID)
+ case class RequestTaskManagerInstance(resourceId: ResourceID)
/**
* Returns the [[Instance]] object of the requested task manager. This is in response to
http://git-wip-us.apache.org/repos/asf/flink/blob/d45b9412/flink-runtime/src/main/scala/org/apache/flink/runtime/minicluster/FlinkMiniCluster.scala
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/scala/org/apache/flink/runtime/minicluster/FlinkMiniCluster.scala b/flink-runtime/src/main/scala/org/apache/flink/runtime/minicluster/FlinkMiniCluster.scala
index c152f4a..689d98f 100644
--- a/flink-runtime/src/main/scala/org/apache/flink/runtime/minicluster/FlinkMiniCluster.scala
+++ b/flink-runtime/src/main/scala/org/apache/flink/runtime/minicluster/FlinkMiniCluster.scala
@@ -40,6 +40,7 @@ import org.apache.flink.runtime.jobgraph.JobGraph
import org.apache.flink.runtime.jobmanager.HighAvailabilityMode
import org.apache.flink.runtime.leaderretrieval.{LeaderRetrievalListener, LeaderRetrievalService}
import org.apache.flink.runtime.messages.TaskManagerMessages.NotifyWhenRegisteredAtJobManager
+import org.apache.flink.runtime.metrics.{MetricRegistryConfiguration, MetricRegistryImpl}
import org.apache.flink.runtime.util.{ExecutorThreadFactory, Hardware}
import org.apache.flink.runtime.webmonitor.retriever.impl.{AkkaJobManagerRetriever, AkkaQueryServiceRetriever}
import org.apache.flink.runtime.webmonitor.{WebMonitor, WebMonitorUtils}
@@ -121,6 +122,9 @@ abstract class FlinkMiniCluster(
Hardware.getNumberCPUCores(),
new ExecutorThreadFactory("mini-cluster-io"))
+ protected val metricRegistry = new MetricRegistryImpl(
+ MetricRegistryConfiguration.fromConfiguration(originalConfiguration))
+
def this(configuration: Configuration, useSingleActorSystem: Boolean) {
this(
configuration,
@@ -325,6 +329,10 @@ abstract class FlinkMiniCluster(
lazy val singleActorSystem = startJobManagerActorSystem(0)
+ if (originalConfiguration.getBoolean(ConfigConstants.LOCAL_START_WEBSERVER, false)) {
+ metricRegistry.startQueryService(singleActorSystem, null)
+ }
+
val (jmActorSystems, jmActors) =
(for(i <- 0 until numJobManagers) yield {
val actorSystem = if(useSingleActorSystem) {
http://git-wip-us.apache.org/repos/asf/flink/blob/d45b9412/flink-runtime/src/main/scala/org/apache/flink/runtime/minicluster/LocalFlinkMiniCluster.scala
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/scala/org/apache/flink/runtime/minicluster/LocalFlinkMiniCluster.scala b/flink-runtime/src/main/scala/org/apache/flink/runtime/minicluster/LocalFlinkMiniCluster.scala
index e22230e..e9bdb2a 100644
--- a/flink-runtime/src/main/scala/org/apache/flink/runtime/minicluster/LocalFlinkMiniCluster.scala
+++ b/flink-runtime/src/main/scala/org/apache/flink/runtime/minicluster/LocalFlinkMiniCluster.scala
@@ -19,6 +19,7 @@
package org.apache.flink.runtime.minicluster
import java.net.InetAddress
+import java.util.UUID
import java.util.concurrent.{Executor, ScheduledExecutorService}
import akka.actor.{ActorRef, ActorSystem, Props}
@@ -46,7 +47,8 @@ import org.apache.flink.runtime.leaderretrieval.LeaderRetrievalService
import org.apache.flink.runtime.memory.MemoryManager
import org.apache.flink.runtime.messages.JobManagerMessages
import org.apache.flink.runtime.messages.JobManagerMessages.{RunningJobsStatus, StoppingFailure, StoppingResponse}
-import org.apache.flink.runtime.metrics.MetricRegistry
+import org.apache.flink.runtime.metrics.groups.{JobManagerMetricGroup, TaskManagerMetricGroup}
+import org.apache.flink.runtime.metrics.{MetricRegistryConfiguration, MetricRegistryImpl}
import org.apache.flink.runtime.taskexecutor.{TaskExecutor, TaskManagerConfiguration, TaskManagerServices, TaskManagerServicesConfiguration}
import org.apache.flink.runtime.taskmanager.{TaskManager, TaskManagerLocation}
import org.apache.flink.runtime.util.EnvironmentInformation
@@ -83,6 +85,12 @@ class LocalFlinkMiniCluster(
def this(userConfiguration: Configuration) = this(userConfiguration, true)
+ override def startInternalShutdown() {
+ metricRegistry.shutdown()
+
+ super.startInternalShutdown()
+ }
+
// --------------------------------------------------------------------------
override def generateConfiguration(userConfiguration: Configuration): Configuration = {
@@ -137,23 +145,20 @@ class LocalFlinkMiniCluster(
}
val (instanceManager,
- scheduler,
- blobServer,
- libraryCacheManager,
- restartStrategyFactory,
- timeout,
- archiveCount,
- archivePath,
- jobRecoveryTimeout,
- metricsRegistry) = JobManager.createJobManagerComponents(
+ scheduler,
+ blobServer,
+ libraryCacheManager,
+ restartStrategyFactory,
+ timeout,
+ archiveCount,
+ archivePath,
+ jobRecoveryTimeout,
+ jobManagerMetricGroup) = JobManager.createJobManagerComponents(
config,
futureExecutor,
ioExecutor,
- highAvailabilityServices.createBlobStore())
-
- if (config.getBoolean(ConfigConstants.LOCAL_START_WEBSERVER, false)) {
- metricsRegistry.get.startQueryService(system, null)
- }
+ highAvailabilityServices.createBlobStore(),
+ metricRegistry)
val archive = system.actorOf(
getArchiveProps(
@@ -180,7 +185,7 @@ class LocalFlinkMiniCluster(
highAvailabilityServices.getSubmittedJobGraphStore(),
highAvailabilityServices.getCheckpointRecoveryFactory(),
jobRecoveryTimeout,
- metricsRegistry,
+ jobManagerMetricGroup,
optRestAddress),
jobManagerName)
}
@@ -248,9 +253,8 @@ class LocalFlinkMiniCluster(
val taskManagerServices = TaskManagerServices.fromConfiguration(
taskManagerServicesConfiguration,
- resourceID)
-
- val metricRegistry = taskManagerServices.getMetricRegistry()
+ resourceID,
+ metricRegistry)
val props = getTaskManagerProps(
taskManagerClass,
@@ -260,7 +264,7 @@ class LocalFlinkMiniCluster(
taskManagerServices.getMemoryManager(),
taskManagerServices.getIOManager(),
taskManagerServices.getNetworkEnvironment,
- metricRegistry)
+ taskManagerServices.getTaskManagerMetricGroup)
if (config.getBoolean(ConfigConstants.LOCAL_START_WEBSERVER, false)) {
metricRegistry.startQueryService(system, resourceID)
@@ -296,7 +300,7 @@ class LocalFlinkMiniCluster(
submittedJobGraphStore: SubmittedJobGraphStore,
checkpointRecoveryFactory: CheckpointRecoveryFactory,
jobRecoveryTimeout: FiniteDuration,
- metricsRegistry: Option[MetricRegistry],
+ jobManagerMetricGroup: JobManagerMetricGroup,
optRestAddress: Option[String])
: Props = {
@@ -316,7 +320,7 @@ class LocalFlinkMiniCluster(
submittedJobGraphStore,
checkpointRecoveryFactory,
jobRecoveryTimeout,
- metricsRegistry,
+ jobManagerMetricGroup,
optRestAddress)
}
@@ -328,7 +332,7 @@ class LocalFlinkMiniCluster(
memoryManager: MemoryManager,
ioManager: IOManager,
networkEnvironment: NetworkEnvironment,
- metricsRegistry: MetricRegistry): Props = {
+ taskManagerMetricGroup: TaskManagerMetricGroup): Props = {
TaskManager.getTaskManagerProps(
taskManagerClass,
@@ -339,7 +343,7 @@ class LocalFlinkMiniCluster(
ioManager,
networkEnvironment,
highAvailabilityServices,
- metricsRegistry)
+ taskManagerMetricGroup)
}
def getResourceManagerProps(
http://git-wip-us.apache.org/repos/asf/flink/blob/d45b9412/flink-runtime/src/main/scala/org/apache/flink/runtime/taskmanager/TaskManager.scala
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/scala/org/apache/flink/runtime/taskmanager/TaskManager.scala b/flink-runtime/src/main/scala/org/apache/flink/runtime/taskmanager/TaskManager.scala
index cc01a8d..f209dac 100644
--- a/flink-runtime/src/main/scala/org/apache/flink/runtime/taskmanager/TaskManager.scala
+++ b/flink-runtime/src/main/scala/org/apache/flink/runtime/taskmanager/TaskManager.scala
@@ -22,7 +22,7 @@ import java.io.{File, FileInputStream, IOException}
import java.lang.management.ManagementFactory
import java.net.{BindException, InetAddress, InetSocketAddress, ServerSocket}
import java.util
-import java.util.concurrent.{Callable, TimeUnit}
+import java.util.concurrent.{Callable, TimeUnit, TimeoutException}
import java.util.{Collections, UUID}
import _root_.akka.actor._
@@ -63,8 +63,7 @@ import org.apache.flink.runtime.messages.TaskMessages._
import org.apache.flink.runtime.messages.checkpoint.{AbstractCheckpointMessage, NotifyCheckpointComplete, TriggerCheckpoint}
import org.apache.flink.runtime.messages.{Acknowledge, StackTraceSampleResponse}
import org.apache.flink.runtime.metrics.groups.TaskManagerMetricGroup
-import org.apache.flink.runtime.metrics.util.MetricUtils
-import org.apache.flink.runtime.metrics.{MetricRegistry => FlinkMetricRegistry}
+import org.apache.flink.runtime.metrics.{MetricRegistryConfiguration, MetricRegistryImpl, MetricRegistry => FlinkMetricRegistry}
import org.apache.flink.runtime.process.ProcessReaper
import org.apache.flink.runtime.security.{SecurityConfiguration, SecurityUtils}
import org.apache.flink.runtime.taskexecutor.{TaskExecutor, TaskManagerConfiguration, TaskManagerServices, TaskManagerServicesConfiguration}
@@ -127,7 +126,7 @@ class TaskManager(
protected val network: NetworkEnvironment,
protected val numberOfSlots: Int,
protected val highAvailabilityServices: HighAvailabilityServices,
- protected val metricsRegistry: FlinkMetricRegistry)
+ protected val taskManagerMetricGroup: TaskManagerMetricGroup)
extends FlinkActor
with LeaderSessionMessageFilter // Mixin order is important: We want to filter after logging
with LogMessages // Mixin order is important: first we want to support message logging
@@ -154,8 +153,6 @@ class TaskManager(
getJobManagerLeaderRetriever(
HighAvailabilityServices.DEFAULT_JOB_ID)
- private var taskManagerMetricGroup : TaskManagerMetricGroup = _
-
/** Actors which want to be notified once this task manager has been
* registered at the job manager */
private val waitForRegistration = scala.collection.mutable.Set[ActorRef]()
@@ -258,13 +255,8 @@ class TaskManager(
} catch {
case t: Exception => log.error("FileCache did not shutdown properly.", t)
}
-
- // failsafe shutdown of the metrics registry
- try {
- metricsRegistry.shutdown()
- } catch {
- case t: Exception => log.error("MetricRegistry did not shutdown properly.", t)
- }
+
+ taskManagerMetricGroup.close()
log.info(s"Task manager ${self.path} is completely shut down.")
}
@@ -980,12 +972,6 @@ class TaskManager(
throw new RuntimeException(message, e)
}
- taskManagerMetricGroup =
- new TaskManagerMetricGroup(metricsRegistry, location.getHostname, id.toString)
-
- MetricUtils.instantiateStatusMetrics(taskManagerMetricGroup)
- MetricUtils.instantiateNetworkMetrics(taskManagerMetricGroup, network)
-
// watch job manager to detect when it dies
context.watch(jobManager)
@@ -1832,15 +1818,22 @@ object TaskManager {
actorSystemPort,
LOG.logger)
+ val metricRegistry = new MetricRegistryImpl(
+ MetricRegistryConfiguration.fromConfiguration(configuration))
+
+ metricRegistry.startQueryService(taskManagerSystem, resourceID)
+
// start all the TaskManager services (network stack, library cache, ...)
// and the TaskManager actor
try {
+
LOG.info("Starting TaskManager actor")
val taskManager = startTaskManagerComponentsAndActor(
configuration,
resourceID,
taskManagerSystem,
highAvailabilityServices,
+ metricRegistry,
taskManagerHostname,
Some(TaskExecutor.TASK_MANAGER_NAME),
localTaskManagerCommunication = false,
@@ -1893,6 +1886,9 @@ object TaskManager {
}
throw t
}
+
+ // shut down the metric query service
+ metricRegistry.shutdown()
}
/**
@@ -1984,6 +1980,7 @@ object TaskManager {
resourceID: ResourceID,
actorSystem: ActorSystem,
highAvailabilityServices: HighAvailabilityServices,
+ metricRegistry: FlinkMetricRegistry,
taskManagerHostname: String,
taskManagerActorName: Option[String],
localTaskManagerCommunication: Boolean,
@@ -1999,9 +1996,8 @@ object TaskManager {
val taskManagerServices = TaskManagerServices.fromConfiguration(
taskManagerServicesConfiguration,
- resourceID)
-
- val metricRegistry = taskManagerServices.getMetricRegistry()
+ resourceID,
+ metricRegistry)
// create the actor properties (which define the actor constructor parameters)
val tmProps = getTaskManagerProps(
@@ -2013,9 +2009,7 @@ object TaskManager {
taskManagerServices.getIOManager(),
taskManagerServices.getNetworkEnvironment(),
highAvailabilityServices,
- metricRegistry)
-
- metricRegistry.startQueryService(actorSystem, resourceID)
+ taskManagerServices.getTaskManagerMetricGroup)
taskManagerActorName match {
case Some(actorName) => actorSystem.actorOf(tmProps, actorName)
@@ -2032,7 +2026,7 @@ object TaskManager {
ioManager: IOManager,
networkEnvironment: NetworkEnvironment,
highAvailabilityServices: HighAvailabilityServices,
- metricsRegistry: FlinkMetricRegistry
+ taskManagerMetricGroup: TaskManagerMetricGroup
): Props = {
Props(
taskManagerClass,
@@ -2044,7 +2038,7 @@ object TaskManager {
networkEnvironment,
taskManagerConfig.getNumberSlots(),
highAvailabilityServices,
- metricsRegistry)
+ taskManagerMetricGroup)
}
// --------------------------------------------------------------------------
[6/7] flink git commit: [FLINK-7876] Properly start and shutdown
MetricRegistry by ClusterEntrypoint
Posted by tr...@apache.org.
[FLINK-7876] Properly start and shutdown MetricRegistry by ClusterEntrypoint
Suppress MetricRegistry#shutdown exceptions if the metric query service actor's actor system has already been
shut down.
Address PR comments
Pull out TaskManagerMetricGroup instantiation from TaskManagerServices
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/ad42ee27
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/ad42ee27
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/ad42ee27
Branch: refs/heads/master
Commit: ad42ee27decb7c563e58ef090373ae8648ca8e81
Parents: d45b941
Author: Till <ti...@gmail.com>
Authored: Fri Oct 20 12:13:10 2017 +0200
Committer: Till Rohrmann <tr...@apache.org>
Committed: Wed Nov 1 15:52:01 2017 +0100
----------------------------------------------------------------------
.../entrypoint/MesosJobClusterEntrypoint.java | 12 ++++--
.../MesosSessionClusterEntrypoint.java | 12 ++++--
.../MesosApplicationMasterRunner.java | 6 ++-
.../clusterframework/MesosResourceManager.java | 4 +-
.../clusterframework/MesosJobManager.scala | 1 -
.../MesosResourceManagerTest.java | 5 ++-
.../ScheduledDropwizardReporterTest.java | 2 +-
.../DropwizardFlinkHistogramWrapperTest.java | 2 +-
.../flink/metrics/jmx/JMXReporterTest.java | 2 +-
.../metrics/statsd/StatsDReporterTest.java | 2 +-
.../flink/runtime/dispatcher/Dispatcher.java | 22 ++---------
.../dispatcher/StandaloneDispatcher.java | 6 +--
.../runtime/entrypoint/ClusterEntrypoint.java | 8 +++-
.../entrypoint/JobClusterEntrypoint.java | 8 ++--
.../entrypoint/SessionClusterEntrypoint.java | 8 ++--
.../StandaloneSessionClusterEntrypoint.java | 4 +-
.../runtime/jobmaster/JobManagerRunner.java | 4 +-
.../flink/runtime/metrics/MetricRegistry.java | 16 ++++++++
.../runtime/metrics/MetricRegistryImpl.java | 12 +++++-
.../flink/runtime/metrics/util/MetricUtils.java | 19 +++++++++
.../flink/runtime/minicluster/MiniCluster.java | 23 ++++++-----
.../minicluster/MiniClusterJobDispatcher.java | 8 ++--
.../minicluster/StandaloneMiniCluster.java | 8 ++++
.../resourcemanager/ResourceManager.java | 6 +--
.../resourcemanager/ResourceManagerGateway.java | 2 +-
.../resourcemanager/ResourceManagerRunner.java | 4 +-
.../StandaloneResourceManager.java | 4 +-
.../handler/legacy/TaskManagerLogHandler.java | 37 +++++++++++-------
.../runtime/taskexecutor/TaskExecutor.java | 6 ---
.../runtime/taskexecutor/TaskManagerRunner.java | 41 ++++++++++++--------
.../taskexecutor/TaskManagerServices.java | 26 +------------
.../runtime/minicluster/FlinkMiniCluster.scala | 11 ++++--
.../minicluster/LocalFlinkMiniCluster.scala | 29 ++++++--------
.../flink/runtime/taskmanager/TaskManager.scala | 18 +++++++--
.../runtime/dispatcher/DispatcherTest.java | 5 ++-
.../jobmanager/JobManagerHARecoveryTest.java | 8 ++--
.../JobManagerLeaderElectionTest.java | 29 +++++++-------
.../runtime/metrics/NoOpMetricRegistry.java | 8 ++++
.../runtime/metrics/TaskManagerMetricsTest.java | 12 ++++--
.../testutils/UnregisteredTaskMetricsGroup.java | 10 ++---
.../legacy/metrics/MetricFetcherTest.java | 4 +-
.../taskexecutor/TaskExecutorITCase.java | 1 -
.../runtime/taskexecutor/TaskExecutorTest.java | 25 ++++++------
...askManagerComponentsStartupShutdownTest.java | 25 ++++++------
.../runtime/testingUtils/TestingCluster.scala | 1 -
.../test/checkpointing/SavepointITCase.java | 1 +
.../flink/yarn/YarnApplicationMasterRunner.java | 6 ++-
.../apache/flink/yarn/YarnResourceManager.java | 4 +-
.../entrypoint/YarnJobClusterEntrypoint.java | 4 +-
.../YarnSessionClusterEntrypoint.java | 4 +-
50 files changed, 300 insertions(+), 225 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/ad42ee27/flink-mesos/src/main/java/org/apache/flink/mesos/entrypoint/MesosJobClusterEntrypoint.java
----------------------------------------------------------------------
diff --git a/flink-mesos/src/main/java/org/apache/flink/mesos/entrypoint/MesosJobClusterEntrypoint.java b/flink-mesos/src/main/java/org/apache/flink/mesos/entrypoint/MesosJobClusterEntrypoint.java
index b98adff..2fe99de 100755
--- a/flink-mesos/src/main/java/org/apache/flink/mesos/entrypoint/MesosJobClusterEntrypoint.java
+++ b/flink-mesos/src/main/java/org/apache/flink/mesos/entrypoint/MesosJobClusterEntrypoint.java
@@ -34,7 +34,7 @@ import org.apache.flink.runtime.entrypoint.JobClusterEntrypoint;
import org.apache.flink.runtime.heartbeat.HeartbeatServices;
import org.apache.flink.runtime.highavailability.HighAvailabilityServices;
import org.apache.flink.runtime.jobgraph.JobGraph;
-import org.apache.flink.runtime.metrics.MetricRegistryImpl;
+import org.apache.flink.runtime.metrics.MetricRegistry;
import org.apache.flink.runtime.resourcemanager.ResourceManager;
import org.apache.flink.runtime.resourcemanager.ResourceManagerConfiguration;
import org.apache.flink.runtime.resourcemanager.ResourceManagerRuntimeServices;
@@ -112,7 +112,13 @@ public class MesosJobClusterEntrypoint extends JobClusterEntrypoint {
}
@Override
- protected void startClusterComponents(Configuration configuration, RpcService rpcService, HighAvailabilityServices highAvailabilityServices, BlobServer blobServer, HeartbeatServices heartbeatServices, MetricRegistryImpl metricRegistry) throws Exception {
+ protected void startClusterComponents(
+ Configuration configuration,
+ RpcService rpcService,
+ HighAvailabilityServices highAvailabilityServices,
+ BlobServer blobServer,
+ HeartbeatServices heartbeatServices,
+ MetricRegistry metricRegistry) throws Exception {
super.startClusterComponents(configuration, rpcService, highAvailabilityServices, blobServer, heartbeatServices, metricRegistry);
}
@@ -123,7 +129,7 @@ public class MesosJobClusterEntrypoint extends JobClusterEntrypoint {
RpcService rpcService,
HighAvailabilityServices highAvailabilityServices,
HeartbeatServices heartbeatServices,
- MetricRegistryImpl metricRegistry,
+ MetricRegistry metricRegistry,
FatalErrorHandler fatalErrorHandler) throws Exception {
final ResourceManagerConfiguration rmConfiguration = ResourceManagerConfiguration.fromConfiguration(configuration);
final ResourceManagerRuntimeServicesConfiguration rmServicesConfiguration = ResourceManagerRuntimeServicesConfiguration.fromConfiguration(configuration);
http://git-wip-us.apache.org/repos/asf/flink/blob/ad42ee27/flink-mesos/src/main/java/org/apache/flink/mesos/entrypoint/MesosSessionClusterEntrypoint.java
----------------------------------------------------------------------
diff --git a/flink-mesos/src/main/java/org/apache/flink/mesos/entrypoint/MesosSessionClusterEntrypoint.java b/flink-mesos/src/main/java/org/apache/flink/mesos/entrypoint/MesosSessionClusterEntrypoint.java
index 0cf0fce..b8d9f65 100755
--- a/flink-mesos/src/main/java/org/apache/flink/mesos/entrypoint/MesosSessionClusterEntrypoint.java
+++ b/flink-mesos/src/main/java/org/apache/flink/mesos/entrypoint/MesosSessionClusterEntrypoint.java
@@ -33,7 +33,7 @@ import org.apache.flink.runtime.clusterframework.types.ResourceID;
import org.apache.flink.runtime.entrypoint.SessionClusterEntrypoint;
import org.apache.flink.runtime.heartbeat.HeartbeatServices;
import org.apache.flink.runtime.highavailability.HighAvailabilityServices;
-import org.apache.flink.runtime.metrics.MetricRegistryImpl;
+import org.apache.flink.runtime.metrics.MetricRegistry;
import org.apache.flink.runtime.resourcemanager.ResourceManager;
import org.apache.flink.runtime.resourcemanager.ResourceManagerConfiguration;
import org.apache.flink.runtime.resourcemanager.ResourceManagerRuntimeServices;
@@ -102,7 +102,13 @@ public class MesosSessionClusterEntrypoint extends SessionClusterEntrypoint {
}
@Override
- protected void startClusterComponents(Configuration configuration, RpcService rpcService, HighAvailabilityServices highAvailabilityServices, BlobServer blobServer, HeartbeatServices heartbeatServices, MetricRegistryImpl metricRegistry) throws Exception {
+ protected void startClusterComponents(
+ Configuration configuration,
+ RpcService rpcService,
+ HighAvailabilityServices highAvailabilityServices,
+ BlobServer blobServer,
+ HeartbeatServices heartbeatServices,
+ MetricRegistry metricRegistry) throws Exception {
super.startClusterComponents(configuration, rpcService, highAvailabilityServices, blobServer, heartbeatServices, metricRegistry);
}
@@ -113,7 +119,7 @@ public class MesosSessionClusterEntrypoint extends SessionClusterEntrypoint {
RpcService rpcService,
HighAvailabilityServices highAvailabilityServices,
HeartbeatServices heartbeatServices,
- MetricRegistryImpl metricRegistry,
+ MetricRegistry metricRegistry,
FatalErrorHandler fatalErrorHandler) throws Exception {
final ResourceManagerConfiguration rmConfiguration = ResourceManagerConfiguration.fromConfiguration(configuration);
final ResourceManagerRuntimeServicesConfiguration rmServicesConfiguration = ResourceManagerRuntimeServicesConfiguration.fromConfiguration(configuration);
http://git-wip-us.apache.org/repos/asf/flink/blob/ad42ee27/flink-mesos/src/main/java/org/apache/flink/mesos/runtime/clusterframework/MesosApplicationMasterRunner.java
----------------------------------------------------------------------
diff --git a/flink-mesos/src/main/java/org/apache/flink/mesos/runtime/clusterframework/MesosApplicationMasterRunner.java b/flink-mesos/src/main/java/org/apache/flink/mesos/runtime/clusterframework/MesosApplicationMasterRunner.java
index 9887d97..93eb3c6 100755
--- a/flink-mesos/src/main/java/org/apache/flink/mesos/runtime/clusterframework/MesosApplicationMasterRunner.java
+++ b/flink-mesos/src/main/java/org/apache/flink/mesos/runtime/clusterframework/MesosApplicationMasterRunner.java
@@ -432,7 +432,11 @@ public class MesosApplicationMasterRunner {
}
if (metricRegistry != null) {
- metricRegistry.shutdown();
+ try {
+ metricRegistry.shutdown();
+ } catch (Throwable t) {
+ LOG.error("Could not shut down metric registry.", t);
+ }
}
org.apache.flink.runtime.concurrent.Executors.gracefulShutdown(
http://git-wip-us.apache.org/repos/asf/flink/blob/ad42ee27/flink-mesos/src/main/java/org/apache/flink/mesos/runtime/clusterframework/MesosResourceManager.java
----------------------------------------------------------------------
diff --git a/flink-mesos/src/main/java/org/apache/flink/mesos/runtime/clusterframework/MesosResourceManager.java b/flink-mesos/src/main/java/org/apache/flink/mesos/runtime/clusterframework/MesosResourceManager.java
index 7ea4908..1e32b2c 100644
--- a/flink-mesos/src/main/java/org/apache/flink/mesos/runtime/clusterframework/MesosResourceManager.java
+++ b/flink-mesos/src/main/java/org/apache/flink/mesos/runtime/clusterframework/MesosResourceManager.java
@@ -49,7 +49,7 @@ import org.apache.flink.runtime.clusterframework.types.ResourceProfile;
import org.apache.flink.runtime.concurrent.FutureUtils;
import org.apache.flink.runtime.heartbeat.HeartbeatServices;
import org.apache.flink.runtime.highavailability.HighAvailabilityServices;
-import org.apache.flink.runtime.metrics.MetricRegistryImpl;
+import org.apache.flink.runtime.metrics.MetricRegistry;
import org.apache.flink.runtime.resourcemanager.JobLeaderIdService;
import org.apache.flink.runtime.resourcemanager.ResourceManager;
import org.apache.flink.runtime.resourcemanager.ResourceManagerConfiguration;
@@ -145,7 +145,7 @@ public class MesosResourceManager extends ResourceManager<RegisteredMesosWorkerN
HighAvailabilityServices highAvailabilityServices,
HeartbeatServices heartbeatServices,
SlotManager slotManager,
- MetricRegistryImpl metricRegistry,
+ MetricRegistry metricRegistry,
JobLeaderIdService jobLeaderIdService,
FatalErrorHandler fatalErrorHandler,
// Mesos specifics
http://git-wip-us.apache.org/repos/asf/flink/blob/ad42ee27/flink-mesos/src/main/scala/org/apache/flink/mesos/runtime/clusterframework/MesosJobManager.scala
----------------------------------------------------------------------
diff --git a/flink-mesos/src/main/scala/org/apache/flink/mesos/runtime/clusterframework/MesosJobManager.scala b/flink-mesos/src/main/scala/org/apache/flink/mesos/runtime/clusterframework/MesosJobManager.scala
index c6230e7..972af35 100644
--- a/flink-mesos/src/main/scala/org/apache/flink/mesos/runtime/clusterframework/MesosJobManager.scala
+++ b/flink-mesos/src/main/scala/org/apache/flink/mesos/runtime/clusterframework/MesosJobManager.scala
@@ -32,7 +32,6 @@ import org.apache.flink.runtime.jobmanager.SubmittedJobGraphStore
import org.apache.flink.runtime.jobmanager.scheduler.{Scheduler => FlinkScheduler}
import org.apache.flink.runtime.leaderelection.LeaderElectionService
import org.apache.flink.runtime.metrics.groups.JobManagerMetricGroup
-import org.apache.flink.runtime.metrics.{MetricRegistryImpl => FlinkMetricRegistry}
import scala.concurrent.duration._
http://git-wip-us.apache.org/repos/asf/flink/blob/ad42ee27/flink-mesos/src/test/java/org/apache/flink/mesos/runtime/clusterframework/MesosResourceManagerTest.java
----------------------------------------------------------------------
diff --git a/flink-mesos/src/test/java/org/apache/flink/mesos/runtime/clusterframework/MesosResourceManagerTest.java b/flink-mesos/src/test/java/org/apache/flink/mesos/runtime/clusterframework/MesosResourceManagerTest.java
index 1cdd087..a45abe0 100644
--- a/flink-mesos/src/test/java/org/apache/flink/mesos/runtime/clusterframework/MesosResourceManagerTest.java
+++ b/flink-mesos/src/test/java/org/apache/flink/mesos/runtime/clusterframework/MesosResourceManagerTest.java
@@ -52,6 +52,7 @@ import org.apache.flink.runtime.jobmaster.JobMasterId;
import org.apache.flink.runtime.jobmaster.JobMasterRegistrationSuccess;
import org.apache.flink.runtime.leaderelection.TestingLeaderElectionService;
import org.apache.flink.runtime.leaderelection.TestingLeaderRetrievalService;
+import org.apache.flink.runtime.metrics.MetricRegistry;
import org.apache.flink.runtime.metrics.MetricRegistryImpl;
import org.apache.flink.runtime.registration.RegistrationResponse;
import org.apache.flink.runtime.resourcemanager.JobLeaderIdService;
@@ -160,7 +161,7 @@ public class MesosResourceManagerTest extends TestLogger {
HighAvailabilityServices highAvailabilityServices,
HeartbeatServices heartbeatServices,
SlotManager slotManager,
- MetricRegistryImpl metricRegistry,
+ MetricRegistry metricRegistry,
JobLeaderIdService jobLeaderIdService,
FatalErrorHandler fatalErrorHandler,
@@ -306,7 +307,7 @@ public class MesosResourceManagerTest extends TestLogger {
public final ScheduledExecutor scheduledExecutor;
public final TestingHighAvailabilityServices highAvailabilityServices;
public final HeartbeatServices heartbeatServices;
- public final MetricRegistryImpl metricRegistry;
+ public final MetricRegistry metricRegistry;
public final TestingLeaderElectionService rmLeaderElectionService;
public final JobLeaderIdService jobLeaderIdService;
public final SlotManager slotManager;
http://git-wip-us.apache.org/repos/asf/flink/blob/ad42ee27/flink-metrics/flink-metrics-dropwizard/src/test/java/org/apache/flink/dropwizard/ScheduledDropwizardReporterTest.java
----------------------------------------------------------------------
diff --git a/flink-metrics/flink-metrics-dropwizard/src/test/java/org/apache/flink/dropwizard/ScheduledDropwizardReporterTest.java b/flink-metrics/flink-metrics-dropwizard/src/test/java/org/apache/flink/dropwizard/ScheduledDropwizardReporterTest.java
index e6d5e27..3fa0474 100644
--- a/flink-metrics/flink-metrics-dropwizard/src/test/java/org/apache/flink/dropwizard/ScheduledDropwizardReporterTest.java
+++ b/flink-metrics/flink-metrics-dropwizard/src/test/java/org/apache/flink/dropwizard/ScheduledDropwizardReporterTest.java
@@ -34,8 +34,8 @@ import org.apache.flink.metrics.SimpleCounter;
import org.apache.flink.metrics.groups.UnregisteredMetricsGroup;
import org.apache.flink.metrics.reporter.MetricReporter;
import org.apache.flink.runtime.jobgraph.JobVertexID;
-import org.apache.flink.runtime.metrics.MetricRegistryImpl;
import org.apache.flink.runtime.metrics.MetricRegistryConfiguration;
+import org.apache.flink.runtime.metrics.MetricRegistryImpl;
import org.apache.flink.runtime.metrics.groups.TaskManagerJobMetricGroup;
import org.apache.flink.runtime.metrics.groups.TaskManagerMetricGroup;
import org.apache.flink.runtime.metrics.groups.TaskMetricGroup;
http://git-wip-us.apache.org/repos/asf/flink/blob/ad42ee27/flink-metrics/flink-metrics-dropwizard/src/test/java/org/apache/flink/dropwizard/metrics/DropwizardFlinkHistogramWrapperTest.java
----------------------------------------------------------------------
diff --git a/flink-metrics/flink-metrics-dropwizard/src/test/java/org/apache/flink/dropwizard/metrics/DropwizardFlinkHistogramWrapperTest.java b/flink-metrics/flink-metrics-dropwizard/src/test/java/org/apache/flink/dropwizard/metrics/DropwizardFlinkHistogramWrapperTest.java
index a927a30..8f70abb 100644
--- a/flink-metrics/flink-metrics-dropwizard/src/test/java/org/apache/flink/dropwizard/metrics/DropwizardFlinkHistogramWrapperTest.java
+++ b/flink-metrics/flink-metrics-dropwizard/src/test/java/org/apache/flink/dropwizard/metrics/DropwizardFlinkHistogramWrapperTest.java
@@ -24,8 +24,8 @@ import org.apache.flink.configuration.MetricOptions;
import org.apache.flink.dropwizard.ScheduledDropwizardReporter;
import org.apache.flink.metrics.MetricConfig;
import org.apache.flink.metrics.reporter.MetricReporter;
-import org.apache.flink.runtime.metrics.MetricRegistryImpl;
import org.apache.flink.runtime.metrics.MetricRegistryConfiguration;
+import org.apache.flink.runtime.metrics.MetricRegistryImpl;
import org.apache.flink.runtime.metrics.groups.TaskManagerMetricGroup;
import org.apache.flink.util.TestLogger;
http://git-wip-us.apache.org/repos/asf/flink/blob/ad42ee27/flink-metrics/flink-metrics-jmx/src/test/java/org/apache/flink/metrics/jmx/JMXReporterTest.java
----------------------------------------------------------------------
diff --git a/flink-metrics/flink-metrics-jmx/src/test/java/org/apache/flink/metrics/jmx/JMXReporterTest.java b/flink-metrics/flink-metrics-jmx/src/test/java/org/apache/flink/metrics/jmx/JMXReporterTest.java
index 4c97055..98c2d1b 100644
--- a/flink-metrics/flink-metrics-jmx/src/test/java/org/apache/flink/metrics/jmx/JMXReporterTest.java
+++ b/flink-metrics/flink-metrics-jmx/src/test/java/org/apache/flink/metrics/jmx/JMXReporterTest.java
@@ -24,8 +24,8 @@ import org.apache.flink.configuration.MetricOptions;
import org.apache.flink.metrics.Gauge;
import org.apache.flink.metrics.reporter.MetricReporter;
import org.apache.flink.metrics.util.TestMeter;
-import org.apache.flink.runtime.metrics.MetricRegistryImpl;
import org.apache.flink.runtime.metrics.MetricRegistryConfiguration;
+import org.apache.flink.runtime.metrics.MetricRegistryImpl;
import org.apache.flink.runtime.metrics.groups.FrontMetricGroup;
import org.apache.flink.runtime.metrics.groups.TaskManagerMetricGroup;
import org.apache.flink.runtime.metrics.util.TestReporter;
http://git-wip-us.apache.org/repos/asf/flink/blob/ad42ee27/flink-metrics/flink-metrics-statsd/src/test/java/org/apache/flink/metrics/statsd/StatsDReporterTest.java
----------------------------------------------------------------------
diff --git a/flink-metrics/flink-metrics-statsd/src/test/java/org/apache/flink/metrics/statsd/StatsDReporterTest.java b/flink-metrics/flink-metrics-statsd/src/test/java/org/apache/flink/metrics/statsd/StatsDReporterTest.java
index f460abd..275f2e1 100644
--- a/flink-metrics/flink-metrics-statsd/src/test/java/org/apache/flink/metrics/statsd/StatsDReporterTest.java
+++ b/flink-metrics/flink-metrics-statsd/src/test/java/org/apache/flink/metrics/statsd/StatsDReporterTest.java
@@ -30,8 +30,8 @@ import org.apache.flink.metrics.SimpleCounter;
import org.apache.flink.metrics.reporter.MetricReporter;
import org.apache.flink.metrics.util.TestMeter;
import org.apache.flink.runtime.jobgraph.JobVertexID;
-import org.apache.flink.runtime.metrics.MetricRegistryImpl;
import org.apache.flink.runtime.metrics.MetricRegistryConfiguration;
+import org.apache.flink.runtime.metrics.MetricRegistryImpl;
import org.apache.flink.runtime.metrics.groups.TaskManagerJobMetricGroup;
import org.apache.flink.runtime.metrics.groups.TaskManagerMetricGroup;
import org.apache.flink.runtime.metrics.groups.TaskMetricGroup;
http://git-wip-us.apache.org/repos/asf/flink/blob/ad42ee27/flink-runtime/src/main/java/org/apache/flink/runtime/dispatcher/Dispatcher.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/dispatcher/Dispatcher.java b/flink-runtime/src/main/java/org/apache/flink/runtime/dispatcher/Dispatcher.java
index c2f8539..cf3405b 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/dispatcher/Dispatcher.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/dispatcher/Dispatcher.java
@@ -45,20 +45,17 @@ import org.apache.flink.runtime.messages.FlinkJobNotFoundException;
import org.apache.flink.runtime.messages.webmonitor.ClusterOverview;
import org.apache.flink.runtime.messages.webmonitor.JobDetails;
import org.apache.flink.runtime.messages.webmonitor.MultipleJobsDetails;
-import org.apache.flink.runtime.metrics.MetricRegistryImpl;
+import org.apache.flink.runtime.metrics.MetricRegistry;
import org.apache.flink.runtime.resourcemanager.ResourceManagerGateway;
import org.apache.flink.runtime.resourcemanager.ResourceOverview;
import org.apache.flink.runtime.rpc.FatalErrorHandler;
import org.apache.flink.runtime.rpc.FencedRpcEndpoint;
import org.apache.flink.runtime.rpc.RpcService;
import org.apache.flink.runtime.rpc.RpcUtils;
-import org.apache.flink.runtime.rpc.akka.AkkaRpcService;
import org.apache.flink.util.ExceptionUtils;
import org.apache.flink.util.FlinkException;
import org.apache.flink.util.Preconditions;
-import akka.actor.ActorSystem;
-
import java.io.IOException;
import java.util.ArrayList;
import java.util.Collection;
@@ -88,7 +85,7 @@ public abstract class Dispatcher extends FencedRpcEndpoint<DispatcherId> impleme
private final ResourceManagerGateway resourceManagerGateway;
private final JobManagerServices jobManagerServices;
private final HeartbeatServices heartbeatServices;
- private final MetricRegistryImpl metricRegistry;
+ private final MetricRegistry metricRegistry;
private final FatalErrorHandler fatalErrorHandler;
@@ -106,7 +103,7 @@ public abstract class Dispatcher extends FencedRpcEndpoint<DispatcherId> impleme
ResourceManagerGateway resourceManagerGateway,
BlobServer blobServer,
HeartbeatServices heartbeatServices,
- MetricRegistryImpl metricRegistry,
+ MetricRegistry metricRegistry,
FatalErrorHandler fatalErrorHandler,
Optional<String> restAddress) throws Exception {
super(rpcService, endpointId);
@@ -162,12 +159,6 @@ public abstract class Dispatcher extends FencedRpcEndpoint<DispatcherId> impleme
}
try {
- metricRegistry.shutdown();
- } catch (Exception e) {
- exception = ExceptionUtils.firstOrSuppressed(e, exception);
- }
-
- try {
super.postStop();
} catch (Exception e) {
exception = ExceptionUtils.firstOrSuppressed(e, exception);
@@ -182,11 +173,6 @@ public abstract class Dispatcher extends FencedRpcEndpoint<DispatcherId> impleme
public void start() throws Exception {
super.start();
- // start the MetricQueryService
- // TODO: This is a temporary hack until we have ported the MetricQueryService to the new RpcEndpoint
- final ActorSystem actorSystem = ((AkkaRpcService) getRpcService()).getActorSystem();
- metricRegistry.startQueryService(actorSystem, null);
-
leaderElectionService.start(this);
}
@@ -479,7 +465,7 @@ public abstract class Dispatcher extends FencedRpcEndpoint<DispatcherId> impleme
HighAvailabilityServices highAvailabilityServices,
HeartbeatServices heartbeatServices,
JobManagerServices jobManagerServices,
- MetricRegistryImpl metricRegistry,
+ MetricRegistry metricRegistry,
OnCompletionActions onCompleteActions,
FatalErrorHandler fatalErrorHandler) throws Exception;
http://git-wip-us.apache.org/repos/asf/flink/blob/ad42ee27/flink-runtime/src/main/java/org/apache/flink/runtime/dispatcher/StandaloneDispatcher.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/dispatcher/StandaloneDispatcher.java b/flink-runtime/src/main/java/org/apache/flink/runtime/dispatcher/StandaloneDispatcher.java
index ee92663..5a6889e 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/dispatcher/StandaloneDispatcher.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/dispatcher/StandaloneDispatcher.java
@@ -28,7 +28,7 @@ import org.apache.flink.runtime.jobmanager.OnCompletionActions;
import org.apache.flink.runtime.jobmaster.JobManagerRunner;
import org.apache.flink.runtime.jobmaster.JobManagerServices;
import org.apache.flink.runtime.jobmaster.JobMaster;
-import org.apache.flink.runtime.metrics.MetricRegistryImpl;
+import org.apache.flink.runtime.metrics.MetricRegistry;
import org.apache.flink.runtime.resourcemanager.ResourceManagerGateway;
import org.apache.flink.runtime.rpc.FatalErrorHandler;
import org.apache.flink.runtime.rpc.RpcService;
@@ -49,7 +49,7 @@ public class StandaloneDispatcher extends Dispatcher {
ResourceManagerGateway resourceManagerGateway,
BlobServer blobServer,
HeartbeatServices heartbeatServices,
- MetricRegistryImpl metricRegistry,
+ MetricRegistry metricRegistry,
FatalErrorHandler fatalErrorHandler,
Optional<String> restAddress) throws Exception {
super(
@@ -74,7 +74,7 @@ public class StandaloneDispatcher extends Dispatcher {
HighAvailabilityServices highAvailabilityServices,
HeartbeatServices heartbeatServices,
JobManagerServices jobManagerServices,
- MetricRegistryImpl metricRegistry,
+ MetricRegistry metricRegistry,
OnCompletionActions onCompleteActions,
FatalErrorHandler fatalErrorHandler) throws Exception {
// create the standard job manager runner
http://git-wip-us.apache.org/repos/asf/flink/blob/ad42ee27/flink-runtime/src/main/java/org/apache/flink/runtime/entrypoint/ClusterEntrypoint.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/entrypoint/ClusterEntrypoint.java b/flink-runtime/src/main/java/org/apache/flink/runtime/entrypoint/ClusterEntrypoint.java
index 1a0e2ae..156efdc 100755
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/entrypoint/ClusterEntrypoint.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/entrypoint/ClusterEntrypoint.java
@@ -30,6 +30,7 @@ import org.apache.flink.runtime.clusterframework.BootstrapTools;
import org.apache.flink.runtime.heartbeat.HeartbeatServices;
import org.apache.flink.runtime.highavailability.HighAvailabilityServices;
import org.apache.flink.runtime.highavailability.HighAvailabilityServicesUtils;
+import org.apache.flink.runtime.metrics.MetricRegistry;
import org.apache.flink.runtime.metrics.MetricRegistryConfiguration;
import org.apache.flink.runtime.metrics.MetricRegistryImpl;
import org.apache.flink.runtime.rpc.FatalErrorHandler;
@@ -180,6 +181,11 @@ public abstract class ClusterEntrypoint implements FatalErrorHandler {
blobServer.start();
heartbeatServices = createHeartbeatServices(configuration);
metricRegistry = createMetricRegistry(configuration);
+
+ // TODO: This is a temporary hack until we have ported the MetricQueryService to the new RpcEndpoint
+ // start the MetricQueryService
+ final ActorSystem actorSystem = ((AkkaRpcService) commonRpcService).getActorSystem();
+ metricRegistry.startQueryService(actorSystem, null);
}
protected RpcService createRpcService(
@@ -278,7 +284,7 @@ public abstract class ClusterEntrypoint implements FatalErrorHandler {
HighAvailabilityServices highAvailabilityServices,
BlobServer blobServer,
HeartbeatServices heartbeatServices,
- MetricRegistryImpl metricRegistry) throws Exception;
+ MetricRegistry metricRegistry) throws Exception;
protected void stopClusterComponents(boolean cleanupHaData) throws Exception {
}
http://git-wip-us.apache.org/repos/asf/flink/blob/ad42ee27/flink-runtime/src/main/java/org/apache/flink/runtime/entrypoint/JobClusterEntrypoint.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/entrypoint/JobClusterEntrypoint.java b/flink-runtime/src/main/java/org/apache/flink/runtime/entrypoint/JobClusterEntrypoint.java
index 50d29da..124c6c6 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/entrypoint/JobClusterEntrypoint.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/entrypoint/JobClusterEntrypoint.java
@@ -29,7 +29,7 @@ import org.apache.flink.runtime.jobgraph.JobGraph;
import org.apache.flink.runtime.jobmanager.OnCompletionActions;
import org.apache.flink.runtime.jobmaster.JobManagerRunner;
import org.apache.flink.runtime.jobmaster.JobManagerServices;
-import org.apache.flink.runtime.metrics.MetricRegistryImpl;
+import org.apache.flink.runtime.metrics.MetricRegistry;
import org.apache.flink.runtime.resourcemanager.ResourceManager;
import org.apache.flink.runtime.rpc.FatalErrorHandler;
import org.apache.flink.runtime.rpc.RpcService;
@@ -59,7 +59,7 @@ public abstract class JobClusterEntrypoint extends ClusterEntrypoint {
HighAvailabilityServices highAvailabilityServices,
BlobServer blobServer,
HeartbeatServices heartbeatServices,
- MetricRegistryImpl metricRegistry) throws Exception {
+ MetricRegistry metricRegistry) throws Exception {
resourceManager = createResourceManager(
configuration,
@@ -96,7 +96,7 @@ public abstract class JobClusterEntrypoint extends ClusterEntrypoint {
HighAvailabilityServices highAvailabilityServices,
JobManagerServices jobManagerServices,
HeartbeatServices heartbeatServices,
- MetricRegistryImpl metricRegistry,
+ MetricRegistry metricRegistry,
FatalErrorHandler fatalErrorHandler) throws Exception {
JobGraph jobGraph = retrieveJobGraph(configuration);
@@ -163,7 +163,7 @@ public abstract class JobClusterEntrypoint extends ClusterEntrypoint {
RpcService rpcService,
HighAvailabilityServices highAvailabilityServices,
HeartbeatServices heartbeatServices,
- MetricRegistryImpl metricRegistry,
+ MetricRegistry metricRegistry,
FatalErrorHandler fatalErrorHandler) throws Exception;
protected abstract JobGraph retrieveJobGraph(Configuration configuration) throws FlinkException;
http://git-wip-us.apache.org/repos/asf/flink/blob/ad42ee27/flink-runtime/src/main/java/org/apache/flink/runtime/entrypoint/SessionClusterEntrypoint.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/entrypoint/SessionClusterEntrypoint.java b/flink-runtime/src/main/java/org/apache/flink/runtime/entrypoint/SessionClusterEntrypoint.java
index 8a48864..e24e01a 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/entrypoint/SessionClusterEntrypoint.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/entrypoint/SessionClusterEntrypoint.java
@@ -30,7 +30,7 @@ import org.apache.flink.runtime.dispatcher.StandaloneDispatcher;
import org.apache.flink.runtime.heartbeat.HeartbeatServices;
import org.apache.flink.runtime.highavailability.HighAvailabilityServices;
import org.apache.flink.runtime.leaderretrieval.LeaderRetrievalService;
-import org.apache.flink.runtime.metrics.MetricRegistryImpl;
+import org.apache.flink.runtime.metrics.MetricRegistry;
import org.apache.flink.runtime.resourcemanager.ResourceManager;
import org.apache.flink.runtime.resourcemanager.ResourceManagerGateway;
import org.apache.flink.runtime.rest.RestServerEndpointConfiguration;
@@ -69,7 +69,7 @@ public abstract class SessionClusterEntrypoint extends ClusterEntrypoint {
HighAvailabilityServices highAvailabilityServices,
BlobServer blobServer,
HeartbeatServices heartbeatServices,
- MetricRegistryImpl metricRegistry) throws Exception {
+ MetricRegistry metricRegistry) throws Exception {
dispatcherLeaderRetrievalService = highAvailabilityServices.getDispatcherLeaderRetriever();
@@ -173,7 +173,7 @@ public abstract class SessionClusterEntrypoint extends ClusterEntrypoint {
ResourceManagerGateway resourceManagerGateway,
BlobServer blobServer,
HeartbeatServices heartbeatServices,
- MetricRegistryImpl metricRegistry,
+ MetricRegistry metricRegistry,
FatalErrorHandler fatalErrorHandler,
Optional<String> restAddress) throws Exception {
@@ -197,6 +197,6 @@ public abstract class SessionClusterEntrypoint extends ClusterEntrypoint {
RpcService rpcService,
HighAvailabilityServices highAvailabilityServices,
HeartbeatServices heartbeatServices,
- MetricRegistryImpl metricRegistry,
+ MetricRegistry metricRegistry,
FatalErrorHandler fatalErrorHandler) throws Exception;
}
http://git-wip-us.apache.org/repos/asf/flink/blob/ad42ee27/flink-runtime/src/main/java/org/apache/flink/runtime/entrypoint/StandaloneSessionClusterEntrypoint.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/entrypoint/StandaloneSessionClusterEntrypoint.java b/flink-runtime/src/main/java/org/apache/flink/runtime/entrypoint/StandaloneSessionClusterEntrypoint.java
index 7d4373d..e7c9816 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/entrypoint/StandaloneSessionClusterEntrypoint.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/entrypoint/StandaloneSessionClusterEntrypoint.java
@@ -23,7 +23,7 @@ import org.apache.flink.runtime.clusterframework.FlinkResourceManager;
import org.apache.flink.runtime.clusterframework.types.ResourceID;
import org.apache.flink.runtime.heartbeat.HeartbeatServices;
import org.apache.flink.runtime.highavailability.HighAvailabilityServices;
-import org.apache.flink.runtime.metrics.MetricRegistryImpl;
+import org.apache.flink.runtime.metrics.MetricRegistry;
import org.apache.flink.runtime.resourcemanager.ResourceManager;
import org.apache.flink.runtime.resourcemanager.ResourceManagerConfiguration;
import org.apache.flink.runtime.resourcemanager.ResourceManagerRuntimeServices;
@@ -51,7 +51,7 @@ public class StandaloneSessionClusterEntrypoint extends SessionClusterEntrypoint
RpcService rpcService,
HighAvailabilityServices highAvailabilityServices,
HeartbeatServices heartbeatServices,
- MetricRegistryImpl metricRegistry,
+ MetricRegistry metricRegistry,
FatalErrorHandler fatalErrorHandler) throws Exception {
final ResourceManagerConfiguration resourceManagerConfiguration = ResourceManagerConfiguration.fromConfiguration(configuration);
final ResourceManagerRuntimeServicesConfiguration resourceManagerRuntimeServicesConfiguration = ResourceManagerRuntimeServicesConfiguration.fromConfiguration(configuration);
http://git-wip-us.apache.org/repos/asf/flink/blob/ad42ee27/flink-runtime/src/main/java/org/apache/flink/runtime/jobmaster/JobManagerRunner.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/jobmaster/JobManagerRunner.java b/flink-runtime/src/main/java/org/apache/flink/runtime/jobmaster/JobManagerRunner.java
index 0a85bbe..14baa6f 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/jobmaster/JobManagerRunner.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/jobmaster/JobManagerRunner.java
@@ -34,7 +34,7 @@ import org.apache.flink.runtime.jobmanager.OnCompletionActions;
import org.apache.flink.runtime.leaderelection.LeaderContender;
import org.apache.flink.runtime.leaderelection.LeaderElectionService;
import org.apache.flink.runtime.messages.Acknowledge;
-import org.apache.flink.runtime.metrics.MetricRegistryImpl;
+import org.apache.flink.runtime.metrics.MetricRegistry;
import org.apache.flink.runtime.metrics.groups.JobManagerMetricGroup;
import org.apache.flink.runtime.rpc.FatalErrorHandler;
import org.apache.flink.runtime.rpc.RpcService;
@@ -111,7 +111,7 @@ public class JobManagerRunner implements LeaderContender, OnCompletionActions, F
final HighAvailabilityServices haServices,
final HeartbeatServices heartbeatServices,
final JobManagerServices jobManagerServices,
- final MetricRegistryImpl metricRegistry,
+ final MetricRegistry metricRegistry,
final OnCompletionActions toNotifyOnComplete,
final FatalErrorHandler errorHandler) throws Exception {
http://git-wip-us.apache.org/repos/asf/flink/blob/ad42ee27/flink-runtime/src/main/java/org/apache/flink/runtime/metrics/MetricRegistry.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/metrics/MetricRegistry.java b/flink-runtime/src/main/java/org/apache/flink/runtime/metrics/MetricRegistry.java
index 9aa97cb..782d66a 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/metrics/MetricRegistry.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/metrics/MetricRegistry.java
@@ -19,9 +19,12 @@
package org.apache.flink.runtime.metrics;
import org.apache.flink.metrics.Metric;
+import org.apache.flink.runtime.metrics.dump.MetricQueryService;
import org.apache.flink.runtime.metrics.groups.AbstractMetricGroup;
import org.apache.flink.runtime.metrics.scope.ScopeFormats;
+import javax.annotation.Nullable;
+
/**
* Interface for a metric registry.
*/
@@ -65,5 +68,18 @@ public interface MetricRegistry {
*/
void unregister(Metric metric, String metricName, AbstractMetricGroup group);
+ /**
+ * Returns the scope formats.
+ *
+ * @return scope formats
+ */
ScopeFormats getScopeFormats();
+
+ /**
+ * Returns the path of the {@link MetricQueryService} or null, if none is started.
+ *
+ * @return Path of the MetricQueryService or null, if none is started
+ */
+ @Nullable
+ String getMetricQueryServicePath();
}
http://git-wip-us.apache.org/repos/asf/flink/blob/ad42ee27/flink-runtime/src/main/java/org/apache/flink/runtime/metrics/MetricRegistryImpl.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/metrics/MetricRegistryImpl.java b/flink-runtime/src/main/java/org/apache/flink/runtime/metrics/MetricRegistryImpl.java
index 407fa8b..3e4f56f 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/metrics/MetricRegistryImpl.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/metrics/MetricRegistryImpl.java
@@ -188,6 +188,7 @@ public class MetricRegistryImpl implements MetricRegistry {
*
* @return address of the metric query service
*/
+ @Override
@Nullable
public String getMetricQueryServicePath() {
return metricQueryServicePath;
@@ -238,7 +239,16 @@ public class MetricRegistryImpl implements MetricRegistry {
if (queryService != null) {
stopTimeout = new FiniteDuration(1L, TimeUnit.SECONDS);
- stopFuture = Patterns.gracefulStop(queryService, stopTimeout);
+
+ try {
+ stopFuture = Patterns.gracefulStop(queryService, stopTimeout);
+ } catch (IllegalStateException ignored) {
+ // this can happen if the underlying actor system has been stopped before shutting
+ // the metric registry down
+ // TODO: Pull the MetricQueryService actor out of the MetricRegistry
+ LOG.debug("The metric query service actor has already been stopped because the " +
+ "underlying ActorSystem has already been shut down.");
+ }
}
if (reporters != null) {
http://git-wip-us.apache.org/repos/asf/flink/blob/ad42ee27/flink-runtime/src/main/java/org/apache/flink/runtime/metrics/util/MetricUtils.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/metrics/util/MetricUtils.java b/flink-runtime/src/main/java/org/apache/flink/runtime/metrics/util/MetricUtils.java
index 2ecde42..08353e3 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/metrics/util/MetricUtils.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/metrics/util/MetricUtils.java
@@ -21,6 +21,10 @@ package org.apache.flink.runtime.metrics.util;
import org.apache.flink.metrics.Gauge;
import org.apache.flink.metrics.MetricGroup;
import org.apache.flink.runtime.io.network.NetworkEnvironment;
+import org.apache.flink.runtime.metrics.MetricRegistry;
+import org.apache.flink.runtime.metrics.groups.TaskManagerMetricGroup;
+import org.apache.flink.runtime.taskexecutor.utils.TaskExecutorMetricsInitializer;
+import org.apache.flink.runtime.taskmanager.TaskManagerLocation;
import org.apache.commons.lang3.text.WordUtils;
import org.slf4j.Logger;
@@ -47,6 +51,21 @@ public class MetricUtils {
private MetricUtils() {
}
+ public static TaskManagerMetricGroup instantiateTaskManagerMetricGroup(
+ MetricRegistry metricRegistry,
+ TaskManagerLocation taskManagerLocation,
+ NetworkEnvironment network) {
+ final TaskManagerMetricGroup taskManagerMetricGroup = new TaskManagerMetricGroup(
+ metricRegistry,
+ taskManagerLocation.getHostname(),
+ taskManagerLocation.getResourceID().toString());
+
+ // Initialize the TM metrics
+ TaskExecutorMetricsInitializer.instantiateStatusMetrics(taskManagerMetricGroup, network);
+
+ return taskManagerMetricGroup;
+ }
+
public static void instantiateNetworkMetrics(
MetricGroup metrics,
final NetworkEnvironment network) {
http://git-wip-us.apache.org/repos/asf/flink/blob/ad42ee27/flink-runtime/src/main/java/org/apache/flink/runtime/minicluster/MiniCluster.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/minicluster/MiniCluster.java b/flink-runtime/src/main/java/org/apache/flink/runtime/minicluster/MiniCluster.java
index d4248ee..2bbd2c7 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/minicluster/MiniCluster.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/minicluster/MiniCluster.java
@@ -32,8 +32,9 @@ import org.apache.flink.runtime.highavailability.HighAvailabilityServicesUtils;
import org.apache.flink.runtime.jobgraph.JobGraph;
import org.apache.flink.runtime.leaderelection.LeaderAddressAndId;
import org.apache.flink.runtime.leaderretrieval.LeaderRetrievalService;
-import org.apache.flink.runtime.metrics.MetricRegistryImpl;
+import org.apache.flink.runtime.metrics.MetricRegistry;
import org.apache.flink.runtime.metrics.MetricRegistryConfiguration;
+import org.apache.flink.runtime.metrics.MetricRegistryImpl;
import org.apache.flink.runtime.resourcemanager.ResourceManagerGateway;
import org.apache.flink.runtime.resourcemanager.ResourceManagerId;
import org.apache.flink.runtime.resourcemanager.ResourceManagerRunner;
@@ -160,6 +161,10 @@ public class MiniCluster {
// we always need the 'commonRpcService' for auxiliary calls
commonRpcService = createRpcService(configuration, rpcTimeout, false, null);
+ // TODO: Temporary hack until the metric query service is ported to the RpcEndpoint
+ final ActorSystem actorSystem = ((AkkaRpcService) commonRpcService).getActorSystem();
+ metricRegistry.startQueryService(actorSystem, null);
+
if (useSingleRpcService) {
// set that same RPC service for all JobManagers and TaskManagers
for (int i = 0; i < numJobManagers; i++) {
@@ -326,6 +331,12 @@ public class MiniCluster {
taskManagers = null;
}
+ // metrics shutdown
+ if (metricRegistry != null) {
+ metricRegistry.shutdown();
+ metricRegistry = null;
+ }
+
// shut down the RpcServices
exception = shutDownRpc(commonRpcService, exception);
exception = shutDownRpcs(jobManagerRpcServices, exception);
@@ -356,12 +367,6 @@ public class MiniCluster {
haServices = null;
}
- // metrics shutdown
- if (metricRegistry != null) {
- metricRegistry.shutdown();
- metricRegistry = null;
- }
-
// if anything went wrong, throw the first error with all the additional suppressed exceptions
if (exception != null) {
ExceptionUtils.rethrowException(exception, "Error while shutting down mini cluster");
@@ -502,7 +507,7 @@ public class MiniCluster {
Configuration configuration,
HighAvailabilityServices haServices,
HeartbeatServices heartbeatServices,
- MetricRegistryImpl metricRegistry,
+ MetricRegistry metricRegistry,
int numResourceManagers,
RpcService[] resourceManagerRpcServices) throws Exception {
@@ -528,7 +533,7 @@ public class MiniCluster {
protected TaskExecutor[] startTaskManagers(
Configuration configuration,
HighAvailabilityServices haServices,
- MetricRegistryImpl metricRegistry,
+ MetricRegistry metricRegistry,
int numTaskManagers,
RpcService[] taskManagerRpcServices) throws Exception {
http://git-wip-us.apache.org/repos/asf/flink/blob/ad42ee27/flink-runtime/src/main/java/org/apache/flink/runtime/minicluster/MiniClusterJobDispatcher.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/minicluster/MiniClusterJobDispatcher.java b/flink-runtime/src/main/java/org/apache/flink/runtime/minicluster/MiniClusterJobDispatcher.java
index ca042b6..60d9a66 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/minicluster/MiniClusterJobDispatcher.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/minicluster/MiniClusterJobDispatcher.java
@@ -30,7 +30,7 @@ import org.apache.flink.runtime.jobgraph.JobGraph;
import org.apache.flink.runtime.jobmanager.OnCompletionActions;
import org.apache.flink.runtime.jobmaster.JobManagerRunner;
import org.apache.flink.runtime.jobmaster.JobManagerServices;
-import org.apache.flink.runtime.metrics.MetricRegistryImpl;
+import org.apache.flink.runtime.metrics.MetricRegistry;
import org.apache.flink.runtime.rpc.FatalErrorHandler;
import org.apache.flink.runtime.rpc.RpcService;
import org.apache.flink.util.ExceptionUtils;
@@ -75,7 +75,7 @@ public class MiniClusterJobDispatcher {
private final JobManagerServices jobManagerServices;
/** Registry for all metrics in the mini cluster */
- private final MetricRegistryImpl metricRegistry;
+ private final MetricRegistry metricRegistry;
/** The number of JobManagers to launch (more than one simulates a high-availability setup) */
private final int numJobManagers;
@@ -104,7 +104,7 @@ public class MiniClusterJobDispatcher {
HighAvailabilityServices haServices,
BlobServer blobServer,
HeartbeatServices heartbeatServices,
- MetricRegistryImpl metricRegistry) throws Exception {
+ MetricRegistry metricRegistry) throws Exception {
this(
config,
haServices,
@@ -132,7 +132,7 @@ public class MiniClusterJobDispatcher {
HighAvailabilityServices haServices,
BlobServer blobServer,
HeartbeatServices heartbeatServices,
- MetricRegistryImpl metricRegistry,
+ MetricRegistry metricRegistry,
int numJobManagers,
RpcService[] rpcServices) throws Exception {
http://git-wip-us.apache.org/repos/asf/flink/blob/ad42ee27/flink-runtime/src/main/java/org/apache/flink/runtime/minicluster/StandaloneMiniCluster.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/minicluster/StandaloneMiniCluster.java b/flink-runtime/src/main/java/org/apache/flink/runtime/minicluster/StandaloneMiniCluster.java
index 90fb115..a8c402a 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/minicluster/StandaloneMiniCluster.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/minicluster/StandaloneMiniCluster.java
@@ -95,6 +95,8 @@ public class StandaloneMiniCluster {
metricRegistry = new MetricRegistryImpl(
MetricRegistryConfiguration.fromConfiguration(configuration));
+ metricRegistry.startQueryService(actorSystem, null);
+
JobManager.startJobManagerActors(
configuration,
actorSystem,
@@ -142,6 +144,12 @@ public class StandaloneMiniCluster {
public void close() throws Exception {
Exception exception = null;
+ try {
+ metricRegistry.shutdown();
+ } catch (Exception e) {
+ exception = ExceptionUtils.firstOrSuppressed(e, exception);
+ }
+
actorSystem.shutdown();
actorSystem.awaitTermination();
http://git-wip-us.apache.org/repos/asf/flink/blob/ad42ee27/flink-runtime/src/main/java/org/apache/flink/runtime/resourcemanager/ResourceManager.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/resourcemanager/ResourceManager.java b/flink-runtime/src/main/java/org/apache/flink/runtime/resourcemanager/ResourceManager.java
index 98b80c6..cccaf95 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/resourcemanager/ResourceManager.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/resourcemanager/ResourceManager.java
@@ -42,7 +42,7 @@ import org.apache.flink.runtime.jobmaster.JobMasterRegistrationSuccess;
import org.apache.flink.runtime.leaderelection.LeaderContender;
import org.apache.flink.runtime.leaderelection.LeaderElectionService;
import org.apache.flink.runtime.messages.Acknowledge;
-import org.apache.flink.runtime.metrics.MetricRegistryImpl;
+import org.apache.flink.runtime.metrics.MetricRegistry;
import org.apache.flink.runtime.metrics.dump.MetricQueryService;
import org.apache.flink.runtime.registration.RegistrationResponse;
import org.apache.flink.runtime.resourcemanager.exceptions.ResourceManagerException;
@@ -118,7 +118,7 @@ public abstract class ResourceManager<WorkerType extends Serializable>
private final HeartbeatManager<Void, Void> jobManagerHeartbeatManager;
/** Registry to use for metrics. */
- private final MetricRegistryImpl metricRegistry;
+ private final MetricRegistry metricRegistry;
/** Fatal error handler. */
private final FatalErrorHandler fatalErrorHandler;
@@ -140,7 +140,7 @@ public abstract class ResourceManager<WorkerType extends Serializable>
HighAvailabilityServices highAvailabilityServices,
HeartbeatServices heartbeatServices,
SlotManager slotManager,
- MetricRegistryImpl metricRegistry,
+ MetricRegistry metricRegistry,
JobLeaderIdService jobLeaderIdService,
FatalErrorHandler fatalErrorHandler) {
http://git-wip-us.apache.org/repos/asf/flink/blob/ad42ee27/flink-runtime/src/main/java/org/apache/flink/runtime/resourcemanager/ResourceManagerGateway.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/resourcemanager/ResourceManagerGateway.java b/flink-runtime/src/main/java/org/apache/flink/runtime/resourcemanager/ResourceManagerGateway.java
index cc2766b..f67368c 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/resourcemanager/ResourceManagerGateway.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/resourcemanager/ResourceManagerGateway.java
@@ -174,7 +174,7 @@ public interface ResourceManagerGateway extends FencedRpcGateway<ResourceManager
* Requests the paths for the TaskManager's {@link MetricQueryService} to query.
*
* @param timeout for the asynchronous operation
- * @return Future containing the collection of instance ids and the corresponding metric query service path
+ * @return Future containing the collection of resource ids and the corresponding metric query service path
*/
CompletableFuture<Collection<Tuple2<ResourceID, String>>> requestTaskManagerMetricQueryServicePaths(@RpcTimeout Time timeout);
}
http://git-wip-us.apache.org/repos/asf/flink/blob/ad42ee27/flink-runtime/src/main/java/org/apache/flink/runtime/resourcemanager/ResourceManagerRunner.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/resourcemanager/ResourceManagerRunner.java b/flink-runtime/src/main/java/org/apache/flink/runtime/resourcemanager/ResourceManagerRunner.java
index 361bdd4..caa3ba0 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/resourcemanager/ResourceManagerRunner.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/resourcemanager/ResourceManagerRunner.java
@@ -22,7 +22,7 @@ import org.apache.flink.configuration.Configuration;
import org.apache.flink.runtime.clusterframework.types.ResourceID;
import org.apache.flink.runtime.heartbeat.HeartbeatServices;
import org.apache.flink.runtime.highavailability.HighAvailabilityServices;
-import org.apache.flink.runtime.metrics.MetricRegistryImpl;
+import org.apache.flink.runtime.metrics.MetricRegistry;
import org.apache.flink.runtime.rpc.FatalErrorHandler;
import org.apache.flink.runtime.rpc.RpcService;
import org.apache.flink.util.FlinkException;
@@ -55,7 +55,7 @@ public class ResourceManagerRunner implements FatalErrorHandler {
final RpcService rpcService,
final HighAvailabilityServices highAvailabilityServices,
final HeartbeatServices heartbeatServices,
- final MetricRegistryImpl metricRegistry) throws Exception {
+ final MetricRegistry metricRegistry) throws Exception {
Preconditions.checkNotNull(resourceId);
Preconditions.checkNotNull(configuration);
http://git-wip-us.apache.org/repos/asf/flink/blob/ad42ee27/flink-runtime/src/main/java/org/apache/flink/runtime/resourcemanager/StandaloneResourceManager.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/resourcemanager/StandaloneResourceManager.java b/flink-runtime/src/main/java/org/apache/flink/runtime/resourcemanager/StandaloneResourceManager.java
index d2b1205..624f31d 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/resourcemanager/StandaloneResourceManager.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/resourcemanager/StandaloneResourceManager.java
@@ -23,7 +23,7 @@ import org.apache.flink.runtime.clusterframework.types.ResourceID;
import org.apache.flink.runtime.clusterframework.types.ResourceProfile;
import org.apache.flink.runtime.heartbeat.HeartbeatServices;
import org.apache.flink.runtime.highavailability.HighAvailabilityServices;
-import org.apache.flink.runtime.metrics.MetricRegistryImpl;
+import org.apache.flink.runtime.metrics.MetricRegistry;
import org.apache.flink.runtime.resourcemanager.exceptions.ResourceManagerException;
import org.apache.flink.runtime.resourcemanager.slotmanager.SlotManager;
import org.apache.flink.runtime.rpc.FatalErrorHandler;
@@ -45,7 +45,7 @@ public class StandaloneResourceManager extends ResourceManager<ResourceID> {
HighAvailabilityServices highAvailabilityServices,
HeartbeatServices heartbeatServices,
SlotManager slotManager,
- MetricRegistryImpl metricRegistry,
+ MetricRegistry metricRegistry,
JobLeaderIdService jobLeaderIdService,
FatalErrorHandler fatalErrorHandler) {
super(
http://git-wip-us.apache.org/repos/asf/flink/blob/ad42ee27/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/legacy/TaskManagerLogHandler.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/legacy/TaskManagerLogHandler.java b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/legacy/TaskManagerLogHandler.java
index 4d6ccd5..118e356 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/legacy/TaskManagerLogHandler.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/legacy/TaskManagerLogHandler.java
@@ -38,7 +38,6 @@ import org.apache.flink.runtime.rest.handler.RedirectHandler;
import org.apache.flink.runtime.rest.handler.WebHandler;
import org.apache.flink.runtime.webmonitor.retriever.GatewayRetriever;
import org.apache.flink.util.FlinkException;
-import org.apache.flink.util.StringUtils;
import org.apache.flink.shaded.netty4.io.netty.buffer.ByteBuf;
import org.apache.flink.shaded.netty4.io.netty.buffer.Unpooled;
@@ -66,7 +65,9 @@ import java.io.File;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.RandomAccessFile;
+import java.io.UnsupportedEncodingException;
import java.net.InetSocketAddress;
+import java.net.URLDecoder;
import java.nio.channels.FileChannel;
import java.util.HashMap;
import java.util.Objects;
@@ -160,14 +161,22 @@ public class TaskManagerLogHandler extends RedirectHandler<JobManagerGateway> im
executor);
}
- final String taskManagerID = routed.pathParams().get(TaskManagersHandler.TASK_MANAGER_ID_KEY);
+ final String taskManagerId = routed.pathParams().get(TaskManagersHandler.TASK_MANAGER_ID_KEY);
final HttpRequest request = routed.request();
//fetch TaskManager logs if no other process is currently doing it
- if (lastRequestPending.putIfAbsent(taskManagerID, true) == null) {
+ if (lastRequestPending.putIfAbsent(taskManagerId, true) == null) {
try {
- ResourceID resourceId = new ResourceID(new String(StringUtils.hexStringToByte(taskManagerID)));
- CompletableFuture<Optional<Instance>> taskManagerFuture = jobManagerGateway.requestTaskManagerInstance(resourceId, timeout);
+ final String unescapedString;
+
+ try {
+ unescapedString = URLDecoder.decode(taskManagerId, "UTF-8");
+ } catch (UnsupportedEncodingException e) {
+ throw new FlinkException("Could not decode task manager id: " + taskManagerId + '.', e);
+ }
+
+ final ResourceID resourceId = new ResourceID(unescapedString);
+ final CompletableFuture<Optional<Instance>> taskManagerFuture = jobManagerGateway.requestTaskManagerInstance(resourceId, timeout);
CompletableFuture<TransientBlobKey> blobKeyFuture = taskManagerFuture.thenCompose(
(Optional<Instance> optTMInstance) -> {
@@ -189,18 +198,18 @@ public class TaskManagerLogHandler extends RedirectHandler<JobManagerGateway> im
(blobKey, blobCache) -> {
//delete previous log file, if it is different than the current one
HashMap<String, TransientBlobKey> lastSubmittedFile = fileMode == FileMode.LOG ? lastSubmittedLog : lastSubmittedStdout;
- if (lastSubmittedFile.containsKey(taskManagerID)) {
+ if (lastSubmittedFile.containsKey(taskManagerId)) {
// the BlobKey will almost certainly be different but the old file
// may not exist anymore so we cannot rely on it and need to
// download the new file anyway, even if the hashes match
- if (!Objects.equals(blobKey, lastSubmittedFile.get(taskManagerID))) {
- if (!blobCache.deleteFromCache(lastSubmittedFile.get(taskManagerID))) {
- throw new CompletionException(new FlinkException("Could not delete file for " + taskManagerID + '.'));
+ if (!Objects.equals(blobKey, lastSubmittedFile.get(taskManagerId))) {
+ if (!blobCache.deleteFromCache(lastSubmittedFile.get(taskManagerId))) {
+ throw new CompletionException(new FlinkException("Could not delete file for " + taskManagerId + '.'));
}
- lastSubmittedFile.put(taskManagerID, blobKey);
+ lastSubmittedFile.put(taskManagerId, blobKey);
}
} else {
- lastSubmittedFile.put(taskManagerID, blobKey);
+ lastSubmittedFile.put(taskManagerId, blobKey);
}
try {
return blobCache.getFile(blobKey).getAbsolutePath();
@@ -214,7 +223,7 @@ public class TaskManagerLogHandler extends RedirectHandler<JobManagerGateway> im
failure -> {
display(ctx, request, "Fetching TaskManager log failed.");
LOG.error("Fetching TaskManager log failed.", failure);
- lastRequestPending.remove(taskManagerID);
+ lastRequestPending.remove(taskManagerId);
return null;
});
@@ -261,7 +270,7 @@ public class TaskManagerLogHandler extends RedirectHandler<JobManagerGateway> im
// write the content.
ChannelFuture lastContentFuture;
final GenericFutureListener<Future<? super Void>> completionListener = future -> {
- lastRequestPending.remove(taskManagerID);
+ lastRequestPending.remove(taskManagerId);
fc.close();
raf.close();
};
@@ -294,7 +303,7 @@ public class TaskManagerLogHandler extends RedirectHandler<JobManagerGateway> im
} catch (Exception e) {
display(ctx, request, "Error: " + e.getMessage());
LOG.error("Fetching TaskManager log failed.", e);
- lastRequestPending.remove(taskManagerID);
+ lastRequestPending.remove(taskManagerId);
}
} else {
display(ctx, request, "loading...");
http://git-wip-us.apache.org/repos/asf/flink/blob/ad42ee27/flink-runtime/src/main/java/org/apache/flink/runtime/taskexecutor/TaskExecutor.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/taskexecutor/TaskExecutor.java b/flink-runtime/src/main/java/org/apache/flink/runtime/taskexecutor/TaskExecutor.java
index a956111..c48d188 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/taskexecutor/TaskExecutor.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/taskexecutor/TaskExecutor.java
@@ -55,7 +55,6 @@ import org.apache.flink.runtime.jobmaster.JobMasterId;
import org.apache.flink.runtime.leaderretrieval.LeaderRetrievalListener;
import org.apache.flink.runtime.memory.MemoryManager;
import org.apache.flink.runtime.messages.Acknowledge;
-import org.apache.flink.runtime.metrics.MetricRegistryImpl;
import org.apache.flink.runtime.metrics.groups.TaskManagerMetricGroup;
import org.apache.flink.runtime.metrics.groups.TaskMetricGroup;
import org.apache.flink.runtime.registration.RegistrationConnectionListener;
@@ -134,9 +133,6 @@ public class TaskExecutor extends RpcEndpoint implements TaskExecutorGateway {
/** The network component in the task manager */
private final NetworkEnvironment networkEnvironment;
- /** The metric registry in the task manager */
- private final MetricRegistryImpl metricRegistry;
-
/** The heartbeat manager for job manager in the task manager */
private final HeartbeatManager<Void, Void> jobManagerHeartbeatManager;
@@ -179,7 +175,6 @@ public class TaskExecutor extends RpcEndpoint implements TaskExecutorGateway {
NetworkEnvironment networkEnvironment,
HighAvailabilityServices haServices,
HeartbeatServices heartbeatServices,
- MetricRegistryImpl metricRegistry,
TaskManagerMetricGroup taskManagerMetricGroup,
BroadcastVariableManager broadcastVariableManager,
FileCache fileCache,
@@ -198,7 +193,6 @@ public class TaskExecutor extends RpcEndpoint implements TaskExecutorGateway {
this.ioManager = checkNotNull(ioManager);
this.networkEnvironment = checkNotNull(networkEnvironment);
this.haServices = checkNotNull(haServices);
- this.metricRegistry = checkNotNull(metricRegistry);
this.taskSlotTable = checkNotNull(taskSlotTable);
this.fatalErrorHandler = checkNotNull(fatalErrorHandler);
this.taskManagerMetricGroup = checkNotNull(taskManagerMetricGroup);
http://git-wip-us.apache.org/repos/asf/flink/blob/ad42ee27/flink-runtime/src/main/java/org/apache/flink/runtime/taskexecutor/TaskManagerRunner.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/taskexecutor/TaskManagerRunner.java b/flink-runtime/src/main/java/org/apache/flink/runtime/taskexecutor/TaskManagerRunner.java
index 5a69bb1..a24daf0 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/taskexecutor/TaskManagerRunner.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/taskexecutor/TaskManagerRunner.java
@@ -29,8 +29,11 @@ import org.apache.flink.runtime.concurrent.Executors;
import org.apache.flink.runtime.heartbeat.HeartbeatServices;
import org.apache.flink.runtime.highavailability.HighAvailabilityServices;
import org.apache.flink.runtime.highavailability.HighAvailabilityServicesUtils;
-import org.apache.flink.runtime.metrics.MetricRegistryImpl;
+import org.apache.flink.runtime.metrics.MetricRegistry;
import org.apache.flink.runtime.metrics.MetricRegistryConfiguration;
+import org.apache.flink.runtime.metrics.MetricRegistryImpl;
+import org.apache.flink.runtime.metrics.groups.TaskManagerMetricGroup;
+import org.apache.flink.runtime.metrics.util.MetricUtils;
import org.apache.flink.runtime.rpc.FatalErrorHandler;
import org.apache.flink.runtime.rpc.RpcService;
import org.apache.flink.runtime.rpc.akka.AkkaRpcService;
@@ -75,7 +78,7 @@ public class TaskManagerRunner implements FatalErrorHandler {
private final Configuration configuration;
- private final ResourceID resourceID;
+ private final ResourceID resourceId;
private final Time timeout;
@@ -92,7 +95,7 @@ public class TaskManagerRunner implements FatalErrorHandler {
public TaskManagerRunner(Configuration configuration, ResourceID resourceId) throws Exception {
this.configuration = Preconditions.checkNotNull(configuration);
- this.resourceID = Preconditions.checkNotNull(resourceId);
+ this.resourceId = Preconditions.checkNotNull(resourceId);
timeout = AkkaUtils.getTimeoutAsTime(configuration);
@@ -111,12 +114,13 @@ public class TaskManagerRunner implements FatalErrorHandler {
metricRegistry = new MetricRegistryImpl(MetricRegistryConfiguration.fromConfiguration(configuration));
+ // TODO: Temporary hack until the MetricQueryService has been ported to RpcEndpoint
final ActorSystem actorSystem = ((AkkaRpcService) rpcService).getActorSystem();
metricRegistry.startQueryService(actorSystem, resourceId);
taskManager = startTaskManager(
- configuration,
- resourceId,
+ this.configuration,
+ this.resourceId,
rpcService,
highAvailabilityServices,
heartbeatServices,
@@ -242,14 +246,14 @@ public class TaskManagerRunner implements FatalErrorHandler {
// --------------------------------------------------------------------------------------------
public static TaskExecutor startTaskManager(
- Configuration configuration,
- ResourceID resourceID,
- RpcService rpcService,
- HighAvailabilityServices highAvailabilityServices,
- HeartbeatServices heartbeatServices,
- MetricRegistryImpl metricRegistry,
- boolean localCommunicationOnly,
- FatalErrorHandler fatalErrorHandler) throws Exception {
+ Configuration configuration,
+ ResourceID resourceID,
+ RpcService rpcService,
+ HighAvailabilityServices highAvailabilityServices,
+ HeartbeatServices heartbeatServices,
+ MetricRegistry metricRegistry,
+ boolean localCommunicationOnly,
+ FatalErrorHandler fatalErrorHandler) throws Exception {
Preconditions.checkNotNull(configuration);
Preconditions.checkNotNull(resourceID);
@@ -266,8 +270,12 @@ public class TaskManagerRunner implements FatalErrorHandler {
TaskManagerServices taskManagerServices = TaskManagerServices.fromConfiguration(
taskManagerServicesConfiguration,
- resourceID,
- metricRegistry);
+ resourceID);
+
+ TaskManagerMetricGroup taskManagerMetricGroup = MetricUtils.instantiateTaskManagerMetricGroup(
+ metricRegistry,
+ taskManagerServices.getTaskManagerLocation(),
+ taskManagerServices.getNetworkEnvironment());
TaskManagerConfiguration taskManagerConfiguration = TaskManagerConfiguration.fromConfiguration(configuration);
@@ -280,8 +288,7 @@ public class TaskManagerRunner implements FatalErrorHandler {
taskManagerServices.getNetworkEnvironment(),
highAvailabilityServices,
heartbeatServices,
- metricRegistry,
- taskManagerServices.getTaskManagerMetricGroup(),
+ taskManagerMetricGroup,
taskManagerServices.getBroadcastVariableManager(),
taskManagerServices.getFileCache(),
taskManagerServices.getTaskSlotTable(),
http://git-wip-us.apache.org/repos/asf/flink/blob/ad42ee27/flink-runtime/src/main/java/org/apache/flink/runtime/taskexecutor/TaskManagerServices.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/taskexecutor/TaskManagerServices.java b/flink-runtime/src/main/java/org/apache/flink/runtime/taskexecutor/TaskManagerServices.java
index 85e62c6..aed03f6 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/taskexecutor/TaskManagerServices.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/taskexecutor/TaskManagerServices.java
@@ -37,16 +37,12 @@ import org.apache.flink.runtime.io.network.buffer.NetworkBufferPool;
import org.apache.flink.runtime.io.network.netty.NettyConnectionManager;
import org.apache.flink.runtime.io.network.partition.ResultPartitionManager;
import org.apache.flink.runtime.memory.MemoryManager;
-import org.apache.flink.runtime.metrics.MetricRegistry;
-import org.apache.flink.runtime.metrics.MetricRegistryImpl;
-import org.apache.flink.runtime.metrics.groups.TaskManagerMetricGroup;
import org.apache.flink.runtime.query.KvStateClientProxy;
import org.apache.flink.runtime.query.KvStateRegistry;
import org.apache.flink.runtime.query.KvStateServer;
import org.apache.flink.runtime.query.QueryableStateUtils;
import org.apache.flink.runtime.taskexecutor.slot.TaskSlotTable;
import org.apache.flink.runtime.taskexecutor.slot.TimerService;
-import org.apache.flink.runtime.taskexecutor.utils.TaskExecutorMetricsInitializer;
import org.apache.flink.runtime.taskmanager.NetworkEnvironmentConfiguration;
import org.apache.flink.runtime.taskmanager.TaskManagerLocation;
import org.apache.flink.runtime.util.EnvironmentInformation;
@@ -63,7 +59,7 @@ import java.util.concurrent.ScheduledThreadPoolExecutor;
/**
* Container for {@link TaskExecutor} services such as the {@link MemoryManager}, {@link IOManager},
- * {@link NetworkEnvironment} and the {@link MetricRegistryImpl}.
+ * {@link NetworkEnvironment}.
*/
public class TaskManagerServices {
private static final Logger LOG = LoggerFactory.getLogger(TaskManagerServices.class);
@@ -73,7 +69,6 @@ public class TaskManagerServices {
private final MemoryManager memoryManager;
private final IOManager ioManager;
private final NetworkEnvironment networkEnvironment;
- private final TaskManagerMetricGroup taskManagerMetricGroup;
private final BroadcastVariableManager broadcastVariableManager;
private final FileCache fileCache;
private final TaskSlotTable taskSlotTable;
@@ -85,7 +80,6 @@ public class TaskManagerServices {
MemoryManager memoryManager,
IOManager ioManager,
NetworkEnvironment networkEnvironment,
- TaskManagerMetricGroup taskManagerMetricGroup,
BroadcastVariableManager broadcastVariableManager,
FileCache fileCache,
TaskSlotTable taskSlotTable,
@@ -96,7 +90,6 @@ public class TaskManagerServices {
this.memoryManager = Preconditions.checkNotNull(memoryManager);
this.ioManager = Preconditions.checkNotNull(ioManager);
this.networkEnvironment = Preconditions.checkNotNull(networkEnvironment);
- this.taskManagerMetricGroup = Preconditions.checkNotNull(taskManagerMetricGroup);
this.broadcastVariableManager = Preconditions.checkNotNull(broadcastVariableManager);
this.fileCache = Preconditions.checkNotNull(fileCache);
this.taskSlotTable = Preconditions.checkNotNull(taskSlotTable);
@@ -124,10 +117,6 @@ public class TaskManagerServices {
return taskManagerLocation;
}
- public TaskManagerMetricGroup getTaskManagerMetricGroup() {
- return taskManagerMetricGroup;
- }
-
public BroadcastVariableManager getBroadcastVariableManager() {
return broadcastVariableManager;
}
@@ -157,14 +146,12 @@ public class TaskManagerServices {
*
* @param resourceID resource ID of the task manager
* @param taskManagerServicesConfiguration task manager configuration
- * @param metricRegistry to register the TaskManagerMetricGroup
* @return task manager components
* @throws Exception
*/
public static TaskManagerServices fromConfiguration(
TaskManagerServicesConfiguration taskManagerServicesConfiguration,
- ResourceID resourceID,
- MetricRegistry metricRegistry) throws Exception {
+ ResourceID resourceID) throws Exception {
// pre-start checks
checkTempDirs(taskManagerServicesConfiguration.getTmpDirPaths());
@@ -183,14 +170,6 @@ public class TaskManagerServices {
// start the I/O manager, it will create some temp directories.
final IOManager ioManager = new IOManagerAsync(taskManagerServicesConfiguration.getTmpDirPaths());
- final TaskManagerMetricGroup taskManagerMetricGroup = new TaskManagerMetricGroup(
- metricRegistry,
- taskManagerLocation.getHostname(),
- taskManagerLocation.getResourceID().toString());
-
- // Initialize the TM metrics
- TaskExecutorMetricsInitializer.instantiateStatusMetrics(taskManagerMetricGroup, network);
-
final BroadcastVariableManager broadcastVariableManager = new BroadcastVariableManager();
final FileCache fileCache = new FileCache(taskManagerServicesConfiguration.getTmpDirPaths());
@@ -216,7 +195,6 @@ public class TaskManagerServices {
memoryManager,
ioManager,
network,
- taskManagerMetricGroup,
broadcastVariableManager,
fileCache,
taskSlotTable,
http://git-wip-us.apache.org/repos/asf/flink/blob/ad42ee27/flink-runtime/src/main/scala/org/apache/flink/runtime/minicluster/FlinkMiniCluster.scala
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/scala/org/apache/flink/runtime/minicluster/FlinkMiniCluster.scala b/flink-runtime/src/main/scala/org/apache/flink/runtime/minicluster/FlinkMiniCluster.scala
index 689d98f..227b854 100644
--- a/flink-runtime/src/main/scala/org/apache/flink/runtime/minicluster/FlinkMiniCluster.scala
+++ b/flink-runtime/src/main/scala/org/apache/flink/runtime/minicluster/FlinkMiniCluster.scala
@@ -122,8 +122,7 @@ abstract class FlinkMiniCluster(
Hardware.getNumberCPUCores(),
new ExecutorThreadFactory("mini-cluster-io"))
- protected val metricRegistry = new MetricRegistryImpl(
- MetricRegistryConfiguration.fromConfiguration(originalConfiguration))
+ protected var metricRegistryOpt: Option[MetricRegistryImpl] = None
def this(configuration: Configuration, useSingleActorSystem: Boolean) {
this(
@@ -329,6 +328,11 @@ abstract class FlinkMiniCluster(
lazy val singleActorSystem = startJobManagerActorSystem(0)
+ val metricRegistry = new MetricRegistryImpl(
+ MetricRegistryConfiguration.fromConfiguration(originalConfiguration))
+
+ metricRegistryOpt = Some(metricRegistry)
+
if (originalConfiguration.getBoolean(ConfigConstants.LOCAL_START_WEBSERVER, false)) {
metricRegistry.startQueryService(singleActorSystem, null)
}
@@ -463,6 +467,8 @@ abstract class FlinkMiniCluster(
Await.ready(Future.sequence(jmFutures ++ tmFutures ++ rmFutures), timeout)
+ metricRegistryOpt.foreach(_.shutdown())
+
if (!useSingleActorSystem) {
taskManagerActorSystems foreach {
_ foreach(_.shutdown())
@@ -476,7 +482,6 @@ abstract class FlinkMiniCluster(
jobManagerActorSystems foreach {
_ foreach(_.shutdown())
}
-
}
def awaitTermination(): Unit = {
http://git-wip-us.apache.org/repos/asf/flink/blob/ad42ee27/flink-runtime/src/main/scala/org/apache/flink/runtime/minicluster/LocalFlinkMiniCluster.scala
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/scala/org/apache/flink/runtime/minicluster/LocalFlinkMiniCluster.scala b/flink-runtime/src/main/scala/org/apache/flink/runtime/minicluster/LocalFlinkMiniCluster.scala
index e9bdb2a..89197e2 100644
--- a/flink-runtime/src/main/scala/org/apache/flink/runtime/minicluster/LocalFlinkMiniCluster.scala
+++ b/flink-runtime/src/main/scala/org/apache/flink/runtime/minicluster/LocalFlinkMiniCluster.scala
@@ -19,13 +19,12 @@
package org.apache.flink.runtime.minicluster
import java.net.InetAddress
-import java.util.UUID
import java.util.concurrent.{Executor, ScheduledExecutorService}
import akka.actor.{ActorRef, ActorSystem, Props}
import org.apache.flink.api.common.JobID
import org.apache.flink.api.common.io.FileOutputFormat
-import org.apache.flink.configuration.{ConfigConstants, Configuration, JobManagerOptions, QueryableStateOptions, ResourceManagerOptions, TaskManagerOptions}
+import org.apache.flink.configuration._
import org.apache.flink.core.fs.Path
import org.apache.flink.runtime.blob.BlobServer
import org.apache.flink.runtime.checkpoint.CheckpointRecoveryFactory
@@ -48,14 +47,14 @@ import org.apache.flink.runtime.memory.MemoryManager
import org.apache.flink.runtime.messages.JobManagerMessages
import org.apache.flink.runtime.messages.JobManagerMessages.{RunningJobsStatus, StoppingFailure, StoppingResponse}
import org.apache.flink.runtime.metrics.groups.{JobManagerMetricGroup, TaskManagerMetricGroup}
-import org.apache.flink.runtime.metrics.{MetricRegistryConfiguration, MetricRegistryImpl}
+import org.apache.flink.runtime.metrics.util.MetricUtils
import org.apache.flink.runtime.taskexecutor.{TaskExecutor, TaskManagerConfiguration, TaskManagerServices, TaskManagerServicesConfiguration}
import org.apache.flink.runtime.taskmanager.{TaskManager, TaskManagerLocation}
import org.apache.flink.runtime.util.EnvironmentInformation
import org.apache.flink.util.NetUtils
-import scala.concurrent.{Await, ExecutionContext}
import scala.concurrent.duration.FiniteDuration
+import scala.concurrent.{Await, ExecutionContext}
/**
* Local Flink mini cluster which executes all [[TaskManager]]s and the [[JobManager]] in the same
@@ -85,12 +84,6 @@ class LocalFlinkMiniCluster(
def this(userConfiguration: Configuration) = this(userConfiguration, true)
- override def startInternalShutdown() {
- metricRegistry.shutdown()
-
- super.startInternalShutdown()
- }
-
// --------------------------------------------------------------------------
override def generateConfiguration(userConfiguration: Configuration): Configuration = {
@@ -158,7 +151,7 @@ class LocalFlinkMiniCluster(
futureExecutor,
ioExecutor,
highAvailabilityServices.createBlobStore(),
- metricRegistry)
+ metricRegistryOpt.get)
val archive = system.actorOf(
getArchiveProps(
@@ -253,8 +246,12 @@ class LocalFlinkMiniCluster(
val taskManagerServices = TaskManagerServices.fromConfiguration(
taskManagerServicesConfiguration,
- resourceID,
- metricRegistry)
+ resourceID)
+
+ val taskManagerMetricGroup = MetricUtils.instantiateTaskManagerMetricGroup(
+ metricRegistryOpt.get,
+ taskManagerServices.getTaskManagerLocation(),
+ taskManagerServices.getNetworkEnvironment())
val props = getTaskManagerProps(
taskManagerClass,
@@ -264,11 +261,7 @@ class LocalFlinkMiniCluster(
taskManagerServices.getMemoryManager(),
taskManagerServices.getIOManager(),
taskManagerServices.getNetworkEnvironment,
- taskManagerServices.getTaskManagerMetricGroup)
-
- if (config.getBoolean(ConfigConstants.LOCAL_START_WEBSERVER, false)) {
- metricRegistry.startQueryService(system, resourceID)
- }
+ taskManagerMetricGroup)
system.actorOf(props, taskManagerActorName)
}
http://git-wip-us.apache.org/repos/asf/flink/blob/ad42ee27/flink-runtime/src/main/scala/org/apache/flink/runtime/taskmanager/TaskManager.scala
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/scala/org/apache/flink/runtime/taskmanager/TaskManager.scala b/flink-runtime/src/main/scala/org/apache/flink/runtime/taskmanager/TaskManager.scala
index f209dac..f948df4 100644
--- a/flink-runtime/src/main/scala/org/apache/flink/runtime/taskmanager/TaskManager.scala
+++ b/flink-runtime/src/main/scala/org/apache/flink/runtime/taskmanager/TaskManager.scala
@@ -63,6 +63,7 @@ import org.apache.flink.runtime.messages.TaskMessages._
import org.apache.flink.runtime.messages.checkpoint.{AbstractCheckpointMessage, NotifyCheckpointComplete, TriggerCheckpoint}
import org.apache.flink.runtime.messages.{Acknowledge, StackTraceSampleResponse}
import org.apache.flink.runtime.metrics.groups.TaskManagerMetricGroup
+import org.apache.flink.runtime.metrics.util.MetricUtils
import org.apache.flink.runtime.metrics.{MetricRegistryConfiguration, MetricRegistryImpl, MetricRegistry => FlinkMetricRegistry}
import org.apache.flink.runtime.process.ProcessReaper
import org.apache.flink.runtime.security.{SecurityConfiguration, SecurityUtils}
@@ -1888,7 +1889,12 @@ object TaskManager {
}
// shut down the metric query service
- metricRegistry.shutdown()
+ try {
+ metricRegistry.shutdown()
+ } catch {
+ case t: Throwable =>
+ LOG.error("Could not properly shut down the metric registry.", t)
+ }
}
/**
@@ -1996,8 +2002,12 @@ object TaskManager {
val taskManagerServices = TaskManagerServices.fromConfiguration(
taskManagerServicesConfiguration,
- resourceID,
- metricRegistry)
+ resourceID)
+
+ val taskManagerMetricGroup = MetricUtils.instantiateTaskManagerMetricGroup(
+ metricRegistry,
+ taskManagerServices.getTaskManagerLocation(),
+ taskManagerServices.getNetworkEnvironment())
// create the actor properties (which define the actor constructor parameters)
val tmProps = getTaskManagerProps(
@@ -2009,7 +2019,7 @@ object TaskManager {
taskManagerServices.getIOManager(),
taskManagerServices.getNetworkEnvironment(),
highAvailabilityServices,
- taskManagerServices.getTaskManagerMetricGroup)
+ taskManagerMetricGroup)
taskManagerActorName match {
case Some(actorName) => actorSystem.actorOf(tmProps, actorName)
http://git-wip-us.apache.org/repos/asf/flink/blob/ad42ee27/flink-runtime/src/test/java/org/apache/flink/runtime/dispatcher/DispatcherTest.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/dispatcher/DispatcherTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/dispatcher/DispatcherTest.java
index 8558145..a511d45 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/dispatcher/DispatcherTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/dispatcher/DispatcherTest.java
@@ -34,6 +34,7 @@ import org.apache.flink.runtime.jobmaster.JobManagerRunner;
import org.apache.flink.runtime.jobmaster.JobManagerServices;
import org.apache.flink.runtime.leaderelection.TestingLeaderElectionService;
import org.apache.flink.runtime.messages.Acknowledge;
+import org.apache.flink.runtime.metrics.MetricRegistry;
import org.apache.flink.runtime.metrics.MetricRegistryImpl;
import org.apache.flink.runtime.resourcemanager.ResourceManagerGateway;
import org.apache.flink.runtime.rpc.FatalErrorHandler;
@@ -209,7 +210,7 @@ public class DispatcherTest extends TestLogger {
ResourceManagerGateway resourceManagerGateway,
BlobServer blobServer,
HeartbeatServices heartbeatServices,
- MetricRegistryImpl metricRegistry,
+ MetricRegistry metricRegistry,
FatalErrorHandler fatalErrorHandler,
JobManagerRunner jobManagerRunner,
JobID expectedJobId) throws Exception {
@@ -238,7 +239,7 @@ public class DispatcherTest extends TestLogger {
HighAvailabilityServices highAvailabilityServices,
HeartbeatServices heartbeatServices,
JobManagerServices jobManagerServices,
- MetricRegistryImpl metricRegistry,
+ MetricRegistry metricRegistry,
OnCompletionActions onCompleteActions,
FatalErrorHandler fatalErrorHandler) throws Exception {
assertEquals(expectedJobId, jobGraph.getJobID());
http://git-wip-us.apache.org/repos/asf/flink/blob/ad42ee27/flink-runtime/src/test/java/org/apache/flink/runtime/jobmanager/JobManagerHARecoveryTest.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/jobmanager/JobManagerHARecoveryTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/jobmanager/JobManagerHARecoveryTest.java
index d843da2..88141d6 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/jobmanager/JobManagerHARecoveryTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/jobmanager/JobManagerHARecoveryTest.java
@@ -53,8 +53,8 @@ import org.apache.flink.runtime.jobgraph.JobVertex;
import org.apache.flink.runtime.jobgraph.JobVertexID;
import org.apache.flink.runtime.jobgraph.OperatorID;
import org.apache.flink.runtime.jobgraph.tasks.AbstractInvokable;
-import org.apache.flink.runtime.jobgraph.tasks.ExternalizedCheckpointSettings;
import org.apache.flink.runtime.jobgraph.tasks.CheckpointCoordinatorConfiguration;
+import org.apache.flink.runtime.jobgraph.tasks.ExternalizedCheckpointSettings;
import org.apache.flink.runtime.jobgraph.tasks.JobCheckpointingSettings;
import org.apache.flink.runtime.jobgraph.tasks.StatefulTask;
import org.apache.flink.runtime.jobmanager.scheduler.Scheduler;
@@ -62,7 +62,6 @@ import org.apache.flink.runtime.leaderelection.LeaderElectionService;
import org.apache.flink.runtime.leaderelection.TestingLeaderElectionService;
import org.apache.flink.runtime.leaderelection.TestingLeaderRetrievalService;
import org.apache.flink.runtime.messages.JobManagerMessages;
-import org.apache.flink.runtime.metrics.MetricRegistryImpl;
import org.apache.flink.runtime.metrics.NoOpMetricRegistry;
import org.apache.flink.runtime.metrics.groups.JobManagerMetricGroup;
import org.apache.flink.runtime.state.OperatorStateHandle;
@@ -96,7 +95,6 @@ import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.TemporaryFolder;
-
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
@@ -208,7 +206,7 @@ public class JobManagerHARecoveryTest extends TestLogger {
mySubmittedJobGraphStore,
checkpointStateFactory,
jobRecoveryTimeout,
- Option.<MetricRegistryImpl>empty(),
+ new JobManagerMetricGroup(new NoOpMetricRegistry(), "localhost"),
Option.<String>empty());
jobManager = system.actorOf(jobManagerProps);
@@ -383,7 +381,7 @@ public class JobManagerHARecoveryTest extends TestLogger {
submittedJobGraphStore,
mock(CheckpointRecoveryFactory.class),
jobRecoveryTimeout,
- Option.<MetricRegistryImpl>apply(null),
+ new JobManagerMetricGroup(new NoOpMetricRegistry(), "localhost"),
recoveredJobs).withDispatcher(CallingThreadDispatcher.Id());
jobManager = system.actorOf(jobManagerProps);
[5/7] flink git commit: [FLINK-7876] Properly start and shutdown
MetricRegistry by ClusterEntrypoint
Posted by tr...@apache.org.
http://git-wip-us.apache.org/repos/asf/flink/blob/ad42ee27/flink-runtime/src/test/java/org/apache/flink/runtime/leaderelection/JobManagerLeaderElectionTest.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/leaderelection/JobManagerLeaderElectionTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/leaderelection/JobManagerLeaderElectionTest.java
index e4ceb40..72c03af 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/leaderelection/JobManagerLeaderElectionTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/leaderelection/JobManagerLeaderElectionTest.java
@@ -18,15 +18,6 @@
package org.apache.flink.runtime.leaderelection;
-import akka.actor.ActorRef;
-import akka.actor.ActorSystem;
-import akka.actor.PoisonPill;
-import akka.actor.Props;
-import akka.pattern.Patterns;
-import akka.testkit.JavaTestKit;
-import akka.util.Timeout;
-import org.apache.curator.framework.CuratorFramework;
-import org.apache.curator.test.TestingServer;
import org.apache.flink.configuration.BlobServerOptions;
import org.apache.flink.configuration.Configuration;
import org.apache.flink.runtime.akka.AkkaUtils;
@@ -42,25 +33,37 @@ import org.apache.flink.runtime.jobmanager.HighAvailabilityMode;
import org.apache.flink.runtime.jobmanager.StandaloneSubmittedJobGraphStore;
import org.apache.flink.runtime.jobmanager.SubmittedJobGraphStore;
import org.apache.flink.runtime.jobmanager.scheduler.Scheduler;
-import org.apache.flink.runtime.metrics.MetricRegistryImpl;
+import org.apache.flink.runtime.metrics.NoOpMetricRegistry;
+import org.apache.flink.runtime.metrics.groups.JobManagerMetricGroup;
import org.apache.flink.runtime.testingUtils.TestingJobManager;
import org.apache.flink.runtime.testingUtils.TestingJobManagerMessages;
import org.apache.flink.runtime.testingUtils.TestingUtils;
import org.apache.flink.runtime.testutils.ZooKeeperTestUtils;
import org.apache.flink.runtime.util.ZooKeeperUtils;
import org.apache.flink.util.TestLogger;
+
+import akka.actor.ActorRef;
+import akka.actor.ActorSystem;
+import akka.actor.PoisonPill;
+import akka.actor.Props;
+import akka.pattern.Patterns;
+import akka.testkit.JavaTestKit;
+import akka.util.Timeout;
+import org.apache.curator.framework.CuratorFramework;
+import org.apache.curator.test.TestingServer;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.TemporaryFolder;
+
+import java.util.concurrent.TimeUnit;
+
import scala.Option;
import scala.concurrent.Await;
import scala.concurrent.Future;
import scala.concurrent.duration.FiniteDuration;
-import java.util.concurrent.TimeUnit;
-
public class JobManagerLeaderElectionTest extends TestLogger {
@Rule
@@ -198,7 +201,7 @@ public class JobManagerLeaderElectionTest extends TestLogger {
submittedJobGraphStore,
checkpointRecoveryFactory,
AkkaUtils.getDefaultTimeoutAsFiniteDuration(),
- Option.<MetricRegistryImpl>empty(),
+ new JobManagerMetricGroup(new NoOpMetricRegistry(), "localhost"),
Option.<String>empty());
}
}
http://git-wip-us.apache.org/repos/asf/flink/blob/ad42ee27/flink-runtime/src/test/java/org/apache/flink/runtime/metrics/NoOpMetricRegistry.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/metrics/NoOpMetricRegistry.java b/flink-runtime/src/test/java/org/apache/flink/runtime/metrics/NoOpMetricRegistry.java
index 1140e3d..46d6548 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/metrics/NoOpMetricRegistry.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/metrics/NoOpMetricRegistry.java
@@ -23,6 +23,8 @@ import org.apache.flink.metrics.Metric;
import org.apache.flink.runtime.metrics.groups.AbstractMetricGroup;
import org.apache.flink.runtime.metrics.scope.ScopeFormats;
+import javax.annotation.Nullable;
+
/**
* Metric registry which does nothing and is intended for testing purposes.
*/
@@ -57,4 +59,10 @@ public class NoOpMetricRegistry implements MetricRegistry {
public ScopeFormats getScopeFormats() {
return scopeFormats;
}
+
+ @Nullable
+ @Override
+ public String getMetricQueryServicePath() {
+ return null;
+ }
}
http://git-wip-us.apache.org/repos/asf/flink/blob/ad42ee27/flink-runtime/src/test/java/org/apache/flink/runtime/metrics/TaskManagerMetricsTest.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/metrics/TaskManagerMetricsTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/metrics/TaskManagerMetricsTest.java
index 31304e5..d934ea9 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/metrics/TaskManagerMetricsTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/metrics/TaskManagerMetricsTest.java
@@ -26,6 +26,8 @@ import org.apache.flink.runtime.highavailability.nonha.embedded.EmbeddedHaServic
import org.apache.flink.runtime.jobmanager.JobManager;
import org.apache.flink.runtime.jobmanager.MemoryArchivist;
import org.apache.flink.runtime.messages.TaskManagerMessages;
+import org.apache.flink.runtime.metrics.groups.TaskManagerMetricGroup;
+import org.apache.flink.runtime.metrics.util.MetricUtils;
import org.apache.flink.runtime.taskexecutor.TaskManagerConfiguration;
import org.apache.flink.runtime.taskexecutor.TaskManagerServices;
import org.apache.flink.runtime.taskexecutor.TaskManagerServicesConfiguration;
@@ -94,8 +96,12 @@ public class TaskManagerMetricsTest extends TestLogger {
TaskManagerServices taskManagerServices = TaskManagerServices.fromConfiguration(
taskManagerServicesConfiguration,
- tmResourceID,
- metricRegistry);
+ tmResourceID);
+
+ TaskManagerMetricGroup taskManagerMetricGroup = MetricUtils.instantiateTaskManagerMetricGroup(
+ metricRegistry,
+ taskManagerServices.getTaskManagerLocation(),
+ taskManagerServices.getNetworkEnvironment());
// create the task manager
final Props tmProps = TaskManager.getTaskManagerProps(
@@ -107,7 +113,7 @@ public class TaskManagerMetricsTest extends TestLogger {
taskManagerServices.getIOManager(),
taskManagerServices.getNetworkEnvironment(),
highAvailabilityServices,
- taskManagerServices.getTaskManagerMetricGroup());
+ taskManagerMetricGroup);
final ActorRef taskManager = actorSystem.actorOf(tmProps);
http://git-wip-us.apache.org/repos/asf/flink/blob/ad42ee27/flink-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/UnregisteredTaskMetricsGroup.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/UnregisteredTaskMetricsGroup.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/UnregisteredTaskMetricsGroup.java
index 3d29815..7065e6b 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/UnregisteredTaskMetricsGroup.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/UnregisteredTaskMetricsGroup.java
@@ -22,22 +22,22 @@ import org.apache.flink.api.common.JobID;
import org.apache.flink.metrics.Metric;
import org.apache.flink.metrics.MetricGroup;
import org.apache.flink.metrics.groups.UnregisteredMetricsGroup;
+import org.apache.flink.runtime.executiongraph.ExecutionAttemptID;
+import org.apache.flink.runtime.jobgraph.JobVertexID;
import org.apache.flink.runtime.jobgraph.OperatorID;
-import org.apache.flink.runtime.metrics.MetricRegistryConfiguration;
+import org.apache.flink.runtime.metrics.MetricRegistry;
+import org.apache.flink.runtime.metrics.NoOpMetricRegistry;
import org.apache.flink.runtime.metrics.groups.OperatorMetricGroup;
import org.apache.flink.runtime.metrics.groups.TaskIOMetricGroup;
import org.apache.flink.runtime.metrics.groups.TaskManagerJobMetricGroup;
import org.apache.flink.runtime.metrics.groups.TaskManagerMetricGroup;
import org.apache.flink.runtime.metrics.groups.TaskMetricGroup;
-import org.apache.flink.runtime.metrics.MetricRegistryImpl;
-import org.apache.flink.runtime.executiongraph.ExecutionAttemptID;
-import org.apache.flink.runtime.jobgraph.JobVertexID;
import java.util.UUID;
public class UnregisteredTaskMetricsGroup extends TaskMetricGroup {
- private static final MetricRegistryImpl EMPTY_REGISTRY = new MetricRegistryImpl(MetricRegistryConfiguration.defaultMetricRegistryConfiguration());
+ private static final MetricRegistry EMPTY_REGISTRY = new NoOpMetricRegistry();
public UnregisteredTaskMetricsGroup() {
http://git-wip-us.apache.org/repos/asf/flink/blob/ad42ee27/flink-runtime/src/test/java/org/apache/flink/runtime/rest/handler/legacy/metrics/MetricFetcherTest.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/rest/handler/legacy/metrics/MetricFetcherTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/rest/handler/legacy/metrics/MetricFetcherTest.java
index 7b10db6..faa97a7 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/rest/handler/legacy/metrics/MetricFetcherTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/rest/handler/legacy/metrics/MetricFetcherTest.java
@@ -28,7 +28,6 @@ import org.apache.flink.metrics.Meter;
import org.apache.flink.metrics.SimpleCounter;
import org.apache.flink.runtime.clusterframework.types.ResourceID;
import org.apache.flink.runtime.concurrent.Executors;
-import org.apache.flink.runtime.instance.InstanceID;
import org.apache.flink.runtime.jobmaster.JobManagerGateway;
import org.apache.flink.runtime.messages.webmonitor.JobDetails;
import org.apache.flink.runtime.messages.webmonitor.MultipleJobsDetails;
@@ -72,8 +71,7 @@ public class MetricFetcherTest extends TestLogger {
// ========= setup TaskManager =================================================================================
JobID jobID = new JobID();
- InstanceID tmID = new InstanceID();
- ResourceID tmRID = new ResourceID(tmID.toString());
+ ResourceID tmRID = ResourceID.generate();
// ========= setup JobManager ==================================================================================
JobDetails details = mock(JobDetails.class);
http://git-wip-us.apache.org/repos/asf/flink/blob/ad42ee27/flink-runtime/src/test/java/org/apache/flink/runtime/taskexecutor/TaskExecutorITCase.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/taskexecutor/TaskExecutorITCase.java b/flink-runtime/src/test/java/org/apache/flink/runtime/taskexecutor/TaskExecutorITCase.java
index 7c6b7dd..1f1d09d 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/taskexecutor/TaskExecutorITCase.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/taskexecutor/TaskExecutorITCase.java
@@ -153,7 +153,6 @@ public class TaskExecutorITCase extends TestLogger {
networkEnvironment,
testingHAServices,
heartbeatServices,
- metricRegistry,
taskManagerMetricGroup,
broadcastVariableManager,
fileCache,
http://git-wip-us.apache.org/repos/asf/flink/blob/ad42ee27/flink-runtime/src/test/java/org/apache/flink/runtime/taskexecutor/TaskExecutorTest.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/taskexecutor/TaskExecutorTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/taskexecutor/TaskExecutorTest.java
index fcd6e4e..de807a6 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/taskexecutor/TaskExecutorTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/taskexecutor/TaskExecutorTest.java
@@ -45,8 +45,8 @@ import org.apache.flink.runtime.heartbeat.HeartbeatManagerImpl;
import org.apache.flink.runtime.heartbeat.HeartbeatServices;
import org.apache.flink.runtime.heartbeat.HeartbeatTarget;
import org.apache.flink.runtime.highavailability.HighAvailabilityServices;
-import org.apache.flink.runtime.highavailability.nonha.standalone.StandaloneHaServices;
import org.apache.flink.runtime.highavailability.TestingHighAvailabilityServices;
+import org.apache.flink.runtime.highavailability.nonha.standalone.StandaloneHaServices;
import org.apache.flink.runtime.instance.InstanceID;
import org.apache.flink.runtime.io.disk.iomanager.IOManager;
import org.apache.flink.runtime.io.network.NetworkEnvironment;
@@ -61,7 +61,6 @@ import org.apache.flink.runtime.leaderelection.TestingLeaderRetrievalService;
import org.apache.flink.runtime.leaderretrieval.LeaderRetrievalService;
import org.apache.flink.runtime.memory.MemoryManager;
import org.apache.flink.runtime.messages.Acknowledge;
-import org.apache.flink.runtime.metrics.MetricRegistryImpl;
import org.apache.flink.runtime.metrics.groups.TaskIOMetricGroup;
import org.apache.flink.runtime.metrics.groups.TaskManagerMetricGroup;
import org.apache.flink.runtime.metrics.groups.TaskMetricGroup;
@@ -114,7 +113,16 @@ import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.RETURNS_MOCKS;
+import static org.mockito.Mockito.any;
+import static org.mockito.Mockito.anyInt;
+import static org.mockito.Mockito.anyString;
+import static org.mockito.Mockito.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.timeout;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
public class TaskExecutorTest extends TestLogger {
@@ -205,7 +213,6 @@ public class TaskExecutorTest extends TestLogger {
mock(NetworkEnvironment.class),
haServices,
heartbeatServices,
- mock(MetricRegistryImpl.class),
mock(TaskManagerMetricGroup.class),
mock(BroadcastVariableManager.class),
mock(FileCache.class),
@@ -311,7 +318,6 @@ public class TaskExecutorTest extends TestLogger {
mock(NetworkEnvironment.class),
haServices,
heartbeatServices,
- mock(MetricRegistryImpl.class),
mock(TaskManagerMetricGroup.class),
mock(BroadcastVariableManager.class),
mock(FileCache.class),
@@ -429,7 +435,6 @@ public class TaskExecutorTest extends TestLogger {
mock(NetworkEnvironment.class),
haServices,
heartbeatServices,
- mock(MetricRegistryImpl.class),
mock(TaskManagerMetricGroup.class),
mock(BroadcastVariableManager.class),
mock(FileCache.class),
@@ -522,7 +527,6 @@ public class TaskExecutorTest extends TestLogger {
mock(NetworkEnvironment.class),
haServices,
mock(HeartbeatServices.class, RETURNS_MOCKS),
- mock(MetricRegistryImpl.class),
mock(TaskManagerMetricGroup.class),
mock(BroadcastVariableManager.class),
mock(FileCache.class),
@@ -605,7 +609,6 @@ public class TaskExecutorTest extends TestLogger {
mock(NetworkEnvironment.class),
haServices,
mock(HeartbeatServices.class, RETURNS_MOCKS),
- mock(MetricRegistryImpl.class),
mock(TaskManagerMetricGroup.class),
mock(BroadcastVariableManager.class),
mock(FileCache.class),
@@ -747,7 +750,6 @@ public class TaskExecutorTest extends TestLogger {
networkEnvironment,
haServices,
mock(HeartbeatServices.class, RETURNS_MOCKS),
- mock(MetricRegistryImpl.class),
taskManagerMetricGroup,
mock(BroadcastVariableManager.class),
mock(FileCache.class),
@@ -863,7 +865,6 @@ public class TaskExecutorTest extends TestLogger {
mock(NetworkEnvironment.class),
haServices,
mock(HeartbeatServices.class, RETURNS_MOCKS),
- mock(MetricRegistryImpl.class),
mock(TaskManagerMetricGroup.class),
mock(BroadcastVariableManager.class),
mock(FileCache.class),
@@ -981,7 +982,6 @@ public class TaskExecutorTest extends TestLogger {
mock(NetworkEnvironment.class),
haServices,
mock(HeartbeatServices.class, RETURNS_MOCKS),
- mock(MetricRegistryImpl.class),
mock(TaskManagerMetricGroup.class),
mock(BroadcastVariableManager.class),
mock(FileCache.class),
@@ -1074,7 +1074,6 @@ public class TaskExecutorTest extends TestLogger {
mock(NetworkEnvironment.class),
haServices,
mock(HeartbeatServices.class, RETURNS_MOCKS),
- mock(MetricRegistryImpl.class),
mock(TaskManagerMetricGroup.class),
mock(BroadcastVariableManager.class),
mock(FileCache.class),
@@ -1248,7 +1247,6 @@ public class TaskExecutorTest extends TestLogger {
networkMock,
haServices,
mock(HeartbeatServices.class, RETURNS_MOCKS),
- mock(MetricRegistryImpl.class),
taskManagerMetricGroup,
mock(BroadcastVariableManager.class),
mock(FileCache.class),
@@ -1371,7 +1369,6 @@ public class TaskExecutorTest extends TestLogger {
mock(NetworkEnvironment.class),
haServicesMock,
heartbeatServicesMock,
- mock(MetricRegistryImpl.class),
mock(TaskManagerMetricGroup.class),
mock(BroadcastVariableManager.class),
mock(FileCache.class),
http://git-wip-us.apache.org/repos/asf/flink/blob/ad42ee27/flink-runtime/src/test/java/org/apache/flink/runtime/taskmanager/TaskManagerComponentsStartupShutdownTest.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/taskmanager/TaskManagerComponentsStartupShutdownTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/taskmanager/TaskManagerComponentsStartupShutdownTest.java
index 8249fca..4b62770 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/taskmanager/TaskManagerComponentsStartupShutdownTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/taskmanager/TaskManagerComponentsStartupShutdownTest.java
@@ -18,14 +18,6 @@
package org.apache.flink.runtime.taskmanager;
-import static org.junit.Assert.*;
-
-import akka.actor.ActorRef;
-import akka.actor.ActorSystem;
-import akka.actor.Kill;
-import akka.actor.Props;
-import akka.testkit.JavaTestKit;
-
import org.apache.flink.api.common.time.Time;
import org.apache.flink.configuration.AkkaOptions;
import org.apache.flink.configuration.ConfigConstants;
@@ -49,21 +41,28 @@ import org.apache.flink.runtime.jobmanager.JobManager;
import org.apache.flink.runtime.jobmanager.MemoryArchivist;
import org.apache.flink.runtime.memory.MemoryManager;
import org.apache.flink.runtime.messages.TaskManagerMessages;
-import org.apache.flink.runtime.metrics.MetricRegistryImpl;
import org.apache.flink.runtime.metrics.MetricRegistryConfiguration;
import org.apache.flink.runtime.metrics.NoOpMetricRegistry;
+import org.apache.flink.runtime.metrics.groups.TaskManagerMetricGroup;
import org.apache.flink.runtime.query.KvStateRegistry;
import org.apache.flink.runtime.taskexecutor.TaskManagerConfiguration;
import org.apache.flink.runtime.testingUtils.TestingUtils;
-
import org.apache.flink.util.TestLogger;
+
+import akka.actor.ActorRef;
+import akka.actor.ActorSystem;
+import akka.actor.Kill;
+import akka.actor.Props;
+import akka.testkit.JavaTestKit;
import org.junit.Test;
+import java.net.InetAddress;
+import java.util.concurrent.TimeUnit;
+
import scala.Option;
import scala.concurrent.duration.FiniteDuration;
-import java.net.InetAddress;
-import java.util.concurrent.TimeUnit;
+import static org.junit.Assert.assertTrue;
public class TaskManagerComponentsStartupShutdownTest extends TestLogger {
@@ -169,7 +168,7 @@ public class TaskManagerComponentsStartupShutdownTest extends TestLogger {
network,
numberOfSlots,
highAvailabilityServices,
- new MetricRegistryImpl(metricRegistryConfiguration));
+ new TaskManagerMetricGroup(new NoOpMetricRegistry(), connectionInfo.getHostname(), connectionInfo.getResourceID().getResourceIdString()));
taskManager = actorSystem.actorOf(tmProps);
http://git-wip-us.apache.org/repos/asf/flink/blob/ad42ee27/flink-runtime/src/test/scala/org/apache/flink/runtime/testingUtils/TestingCluster.scala
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/scala/org/apache/flink/runtime/testingUtils/TestingCluster.scala b/flink-runtime/src/test/scala/org/apache/flink/runtime/testingUtils/TestingCluster.scala
index 2b91cd4..0369771 100644
--- a/flink-runtime/src/test/scala/org/apache/flink/runtime/testingUtils/TestingCluster.scala
+++ b/flink-runtime/src/test/scala/org/apache/flink/runtime/testingUtils/TestingCluster.scala
@@ -42,7 +42,6 @@ import org.apache.flink.runtime.jobmanager.{JobManager, MemoryArchivist, Submitt
import org.apache.flink.runtime.leaderelection.LeaderElectionService
import org.apache.flink.runtime.messages.JobManagerMessages
import org.apache.flink.runtime.messages.JobManagerMessages._
-import org.apache.flink.runtime.metrics.MetricRegistryImpl
import org.apache.flink.runtime.metrics.groups.JobManagerMetricGroup
import org.apache.flink.runtime.minicluster.LocalFlinkMiniCluster
import org.apache.flink.runtime.taskmanager.TaskManager
http://git-wip-us.apache.org/repos/asf/flink/blob/ad42ee27/flink-tests/src/test/java/org/apache/flink/test/checkpointing/SavepointITCase.java
----------------------------------------------------------------------
diff --git a/flink-tests/src/test/java/org/apache/flink/test/checkpointing/SavepointITCase.java b/flink-tests/src/test/java/org/apache/flink/test/checkpointing/SavepointITCase.java
index 75f0aa4..16e238b 100644
--- a/flink-tests/src/test/java/org/apache/flink/test/checkpointing/SavepointITCase.java
+++ b/flink-tests/src/test/java/org/apache/flink/test/checkpointing/SavepointITCase.java
@@ -80,6 +80,7 @@ import org.apache.flink.shaded.guava18.com.google.common.collect.Multimap;
import akka.actor.ActorRef;
import akka.actor.ActorSystem;
import akka.testkit.JavaTestKit;
+
import org.junit.Assert;
import org.junit.Rule;
import org.junit.Test;
http://git-wip-us.apache.org/repos/asf/flink/blob/ad42ee27/flink-yarn/src/main/java/org/apache/flink/yarn/YarnApplicationMasterRunner.java
----------------------------------------------------------------------
diff --git a/flink-yarn/src/main/java/org/apache/flink/yarn/YarnApplicationMasterRunner.java b/flink-yarn/src/main/java/org/apache/flink/yarn/YarnApplicationMasterRunner.java
index 95ba154..3bdc2ac 100644
--- a/flink-yarn/src/main/java/org/apache/flink/yarn/YarnApplicationMasterRunner.java
+++ b/flink-yarn/src/main/java/org/apache/flink/yarn/YarnApplicationMasterRunner.java
@@ -465,7 +465,11 @@ public class YarnApplicationMasterRunner {
}
if (metricRegistry != null) {
- metricRegistry.shutdown();
+ try {
+ metricRegistry.shutdown();
+ } catch (Throwable t) {
+ LOG.error("Could not properly shut down the metric registry.", t);
+ }
}
org.apache.flink.runtime.concurrent.Executors.gracefulShutdown(
http://git-wip-us.apache.org/repos/asf/flink/blob/ad42ee27/flink-yarn/src/main/java/org/apache/flink/yarn/YarnResourceManager.java
----------------------------------------------------------------------
diff --git a/flink-yarn/src/main/java/org/apache/flink/yarn/YarnResourceManager.java b/flink-yarn/src/main/java/org/apache/flink/yarn/YarnResourceManager.java
index 6feb287..b32d25c 100644
--- a/flink-yarn/src/main/java/org/apache/flink/yarn/YarnResourceManager.java
+++ b/flink-yarn/src/main/java/org/apache/flink/yarn/YarnResourceManager.java
@@ -28,7 +28,7 @@ import org.apache.flink.runtime.clusterframework.types.ResourceID;
import org.apache.flink.runtime.clusterframework.types.ResourceProfile;
import org.apache.flink.runtime.heartbeat.HeartbeatServices;
import org.apache.flink.runtime.highavailability.HighAvailabilityServices;
-import org.apache.flink.runtime.metrics.MetricRegistryImpl;
+import org.apache.flink.runtime.metrics.MetricRegistry;
import org.apache.flink.runtime.resourcemanager.JobLeaderIdService;
import org.apache.flink.runtime.resourcemanager.ResourceManager;
import org.apache.flink.runtime.resourcemanager.ResourceManagerConfiguration;
@@ -116,7 +116,7 @@ public class YarnResourceManager extends ResourceManager<ResourceID> implements
HighAvailabilityServices highAvailabilityServices,
HeartbeatServices heartbeatServices,
SlotManager slotManager,
- MetricRegistryImpl metricRegistry,
+ MetricRegistry metricRegistry,
JobLeaderIdService jobLeaderIdService,
FatalErrorHandler fatalErrorHandler) {
super(
http://git-wip-us.apache.org/repos/asf/flink/blob/ad42ee27/flink-yarn/src/main/java/org/apache/flink/yarn/entrypoint/YarnJobClusterEntrypoint.java
----------------------------------------------------------------------
diff --git a/flink-yarn/src/main/java/org/apache/flink/yarn/entrypoint/YarnJobClusterEntrypoint.java b/flink-yarn/src/main/java/org/apache/flink/yarn/entrypoint/YarnJobClusterEntrypoint.java
index 439fdf3..e1efb54 100644
--- a/flink-yarn/src/main/java/org/apache/flink/yarn/entrypoint/YarnJobClusterEntrypoint.java
+++ b/flink-yarn/src/main/java/org/apache/flink/yarn/entrypoint/YarnJobClusterEntrypoint.java
@@ -24,7 +24,7 @@ import org.apache.flink.runtime.entrypoint.JobClusterEntrypoint;
import org.apache.flink.runtime.heartbeat.HeartbeatServices;
import org.apache.flink.runtime.highavailability.HighAvailabilityServices;
import org.apache.flink.runtime.jobgraph.JobGraph;
-import org.apache.flink.runtime.metrics.MetricRegistryImpl;
+import org.apache.flink.runtime.metrics.MetricRegistry;
import org.apache.flink.runtime.resourcemanager.ResourceManager;
import org.apache.flink.runtime.resourcemanager.ResourceManagerConfiguration;
import org.apache.flink.runtime.resourcemanager.ResourceManagerRuntimeServices;
@@ -78,7 +78,7 @@ public class YarnJobClusterEntrypoint extends JobClusterEntrypoint {
RpcService rpcService,
HighAvailabilityServices highAvailabilityServices,
HeartbeatServices heartbeatServices,
- MetricRegistryImpl metricRegistry,
+ MetricRegistry metricRegistry,
FatalErrorHandler fatalErrorHandler) throws Exception {
final ResourceManagerConfiguration rmConfiguration = ResourceManagerConfiguration.fromConfiguration(configuration);
final ResourceManagerRuntimeServicesConfiguration rmServicesConfiguration = ResourceManagerRuntimeServicesConfiguration.fromConfiguration(configuration);
http://git-wip-us.apache.org/repos/asf/flink/blob/ad42ee27/flink-yarn/src/main/java/org/apache/flink/yarn/entrypoint/YarnSessionClusterEntrypoint.java
----------------------------------------------------------------------
diff --git a/flink-yarn/src/main/java/org/apache/flink/yarn/entrypoint/YarnSessionClusterEntrypoint.java b/flink-yarn/src/main/java/org/apache/flink/yarn/entrypoint/YarnSessionClusterEntrypoint.java
index a13f62c..042644b 100644
--- a/flink-yarn/src/main/java/org/apache/flink/yarn/entrypoint/YarnSessionClusterEntrypoint.java
+++ b/flink-yarn/src/main/java/org/apache/flink/yarn/entrypoint/YarnSessionClusterEntrypoint.java
@@ -23,7 +23,7 @@ import org.apache.flink.runtime.clusterframework.types.ResourceID;
import org.apache.flink.runtime.entrypoint.SessionClusterEntrypoint;
import org.apache.flink.runtime.heartbeat.HeartbeatServices;
import org.apache.flink.runtime.highavailability.HighAvailabilityServices;
-import org.apache.flink.runtime.metrics.MetricRegistryImpl;
+import org.apache.flink.runtime.metrics.MetricRegistry;
import org.apache.flink.runtime.resourcemanager.ResourceManager;
import org.apache.flink.runtime.resourcemanager.ResourceManagerConfiguration;
import org.apache.flink.runtime.resourcemanager.ResourceManagerRuntimeServices;
@@ -68,7 +68,7 @@ public class YarnSessionClusterEntrypoint extends SessionClusterEntrypoint {
RpcService rpcService,
HighAvailabilityServices highAvailabilityServices,
HeartbeatServices heartbeatServices,
- MetricRegistryImpl metricRegistry,
+ MetricRegistry metricRegistry,
FatalErrorHandler fatalErrorHandler) throws Exception {
final ResourceManagerConfiguration rmConfiguration = ResourceManagerConfiguration.fromConfiguration(configuration);
final ResourceManagerRuntimeServicesConfiguration rmServicesConfiguration = ResourceManagerRuntimeServicesConfiguration.fromConfiguration(configuration);
[4/7] flink git commit: [FLINK-7876] Register TaskManagerMetricGroup
under ResourceID
Posted by tr...@apache.org.
[FLINK-7876] Register TaskManagerMetricGroup under ResourceID
This commit changes that TaskManagerMetricGroups are now registered under the
TaskManager's ResourceID instead of the InstanceID. This allows to create the
TaskManagerMetricGroup at startup of the TaskManager.
Moreover, it pulls the MetricRegistry out of JobManager and TaskManager. This
allows to reuse the same MetricRegistry across multiple instances (e.g. in the
FlinkMiniCluster case). Moreover, it ensures proper cleanup of a potentially
started MetricyQueryServiceActor.
Change TaskManagersHandler to work with ResourceID instead of InstanceID
Adapt MetricFetcher to use ResourceID instead of InstanceID
This closes #4872.
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/d45b9412
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/d45b9412
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/d45b9412
Branch: refs/heads/master
Commit: d45b941280155a67aed3f3518b2a05eedc1dab2e
Parents: a7e0a27
Author: Till <ti...@gmail.com>
Authored: Thu Oct 19 17:22:53 2017 +0200
Committer: Till Rohrmann <tr...@apache.org>
Committed: Wed Nov 1 15:52:00 2017 +0100
----------------------------------------------------------------------
.../entrypoint/MesosJobClusterEntrypoint.java | 6 +-
.../MesosSessionClusterEntrypoint.java | 6 +-
.../MesosApplicationMasterRunner.java | 13 +
.../clusterframework/MesosResourceManager.java | 4 +-
.../clusterframework/MesosJobManager.scala | 7 +-
.../clusterframework/MesosTaskManager.scala | 6 +-
.../MesosResourceManagerTest.java | 8 +-
.../ScheduledDropwizardReporterTest.java | 4 +-
.../DropwizardFlinkHistogramWrapperTest.java | 6 +-
.../flink/metrics/jmx/JMXReporterTest.java | 14 +-
.../PrometheusReporterTaskScopeTest.java | 6 +-
.../prometheus/PrometheusReporterTest.java | 16 +-
.../flink/metrics/slf4j/Slf4jReporterTest.java | 6 +-
.../metrics/statsd/StatsDReporterTest.java | 12 +-
.../webmonitor/WebRuntimeMonitorITCase.java | 2 +
.../runtime/akka/AkkaJobManagerGateway.java | 10 +-
.../flink/runtime/dispatcher/Dispatcher.java | 11 +-
.../dispatcher/StandaloneDispatcher.java | 6 +-
.../runtime/entrypoint/ClusterEntrypoint.java | 10 +-
.../entrypoint/JobClusterEntrypoint.java | 8 +-
.../entrypoint/SessionClusterEntrypoint.java | 8 +-
.../StandaloneSessionClusterEntrypoint.java | 4 +-
.../runtime/jobmaster/JobManagerGateway.java | 6 +-
.../runtime/jobmaster/JobManagerRunner.java | 4 +-
.../flink/runtime/metrics/MetricRegistry.java | 378 +-------------
.../metrics/MetricRegistryConfiguration.java | 2 +-
.../runtime/metrics/MetricRegistryImpl.java | 412 +++++++++++++++
.../metrics/groups/AbstractMetricGroup.java | 2 +-
.../flink/runtime/minicluster/MiniCluster.java | 12 +-
.../minicluster/MiniClusterJobDispatcher.java | 8 +-
.../minicluster/StandaloneMiniCluster.java | 29 +-
.../resourcemanager/ResourceManager.java | 12 +-
.../resourcemanager/ResourceManagerGateway.java | 2 +-
.../resourcemanager/ResourceManagerRunner.java | 4 +-
.../StandaloneResourceManager.java | 4 +-
.../handler/legacy/TaskManagerLogHandler.java | 8 +-
.../handler/legacy/TaskManagersHandler.java | 21 +-
.../handler/legacy/metrics/MetricFetcher.java | 10 +-
.../runtime/taskexecutor/TaskExecutor.java | 6 +-
.../runtime/taskexecutor/TaskManagerRunner.java | 24 +-
.../taskexecutor/TaskManagerServices.java | 18 +-
.../TaskManagerServicesConfiguration.java | 13 -
.../runtime/webmonitor/RestfulGateway.java | 4 +-
.../ContaineredJobManager.scala | 7 +-
.../flink/runtime/jobmanager/JobManager.scala | 113 ++---
.../runtime/messages/JobManagerMessages.scala | 7 +-
.../runtime/minicluster/FlinkMiniCluster.scala | 8 +
.../minicluster/LocalFlinkMiniCluster.scala | 52 +-
.../flink/runtime/taskmanager/TaskManager.scala | 48 +-
.../clusterframework/ResourceManagerTest.java | 6 +-
.../runtime/dispatcher/DispatcherTest.java | 10 +-
.../jobmanager/JobManagerHARecoveryTest.java | 13 +-
.../runtime/jobmanager/JobManagerTest.java | 11 +
.../flink/runtime/jobmanager/JobSubmitTest.java | 2 +
.../jobmaster/JobManagerRunnerMockTest.java | 4 +-
.../JobManagerLeaderElectionTest.java | 5 +-
.../runtime/metrics/MetricRegistryImplTest.java | 496 +++++++++++++++++++
.../runtime/metrics/MetricRegistryTest.java | 496 -------------------
.../runtime/metrics/NoOpMetricRegistry.java | 60 +++
.../runtime/metrics/TaskManagerMetricsTest.java | 16 +-
.../metrics/dump/MetricQueryServiceTest.java | 4 +-
.../metrics/groups/AbstractMetricGroupTest.java | 8 +-
.../metrics/groups/JobManagerGroupTest.java | 12 +-
.../metrics/groups/JobManagerJobGroupTest.java | 10 +-
.../groups/MetricGroupRegistrationTest.java | 9 +-
.../runtime/metrics/groups/MetricGroupTest.java | 11 +-
.../metrics/groups/OperatorGroupTest.java | 12 +-
.../metrics/groups/TaskManagerGroupTest.java | 12 +-
.../metrics/groups/TaskManagerJobGroupTest.java | 10 +-
.../metrics/groups/TaskMetricGroupTest.java | 14 +-
.../testutils/UnregisteredTaskMetricsGroup.java | 4 +-
.../resourcemanager/ResourceManagerHATest.java | 4 +-
.../ResourceManagerJobMasterTest.java | 4 +-
.../ResourceManagerTaskExecutorTest.java | 4 +-
.../legacy/TaskManagerLogHandlerTest.java | 2 +-
.../legacy/metrics/MetricFetcherTest.java | 10 +-
.../taskexecutor/TaskExecutorITCase.java | 4 +-
.../runtime/taskexecutor/TaskExecutorTest.java | 24 +-
.../taskexecutor/TaskManagerServicesTest.java | 3 +-
...askManagerComponentsStartupShutdownTest.java | 7 +-
.../TaskManagerProcessReapingTestBase.java | 20 +-
.../taskmanager/TaskManagerStartupTest.java | 2 +
.../jobmanager/JobManagerRegistrationTest.scala | 17 +-
.../runtime/testingUtils/TestingCluster.scala | 7 +-
.../testingUtils/TestingJobManager.scala | 6 +-
.../testingUtils/TestingTaskManager.scala | 10 +-
.../runtime/testingUtils/TestingUtils.scala | 21 +-
...ctTaskManagerProcessFailureRecoveryTest.java | 2 +
.../JobManagerHACheckpointRecoveryITCase.java | 2 +
.../JobManagerHAJobGraphRecoveryITCase.java | 2 +
...agerHAProcessFailureBatchRecoveryITCase.java | 2 +
.../recovery/ProcessFailureCancelingITCase.java | 2 +
.../AbstractOperatorRestoreTestBase.java | 3 +
.../flink/yarn/TestingYarnJobManager.scala | 6 +-
.../flink/yarn/TestingYarnTaskManager.scala | 6 +-
.../flink/yarn/YarnApplicationMasterRunner.java | 13 +
.../apache/flink/yarn/YarnResourceManager.java | 4 +-
.../entrypoint/YarnJobClusterEntrypoint.java | 4 +-
.../YarnSessionClusterEntrypoint.java | 4 +-
.../org/apache/flink/yarn/YarnJobManager.scala | 7 +-
.../org/apache/flink/yarn/YarnTaskManager.scala | 6 +-
101 files changed, 1503 insertions(+), 1317 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/d45b9412/flink-mesos/src/main/java/org/apache/flink/mesos/entrypoint/MesosJobClusterEntrypoint.java
----------------------------------------------------------------------
diff --git a/flink-mesos/src/main/java/org/apache/flink/mesos/entrypoint/MesosJobClusterEntrypoint.java b/flink-mesos/src/main/java/org/apache/flink/mesos/entrypoint/MesosJobClusterEntrypoint.java
index 9a3639d..b98adff 100755
--- a/flink-mesos/src/main/java/org/apache/flink/mesos/entrypoint/MesosJobClusterEntrypoint.java
+++ b/flink-mesos/src/main/java/org/apache/flink/mesos/entrypoint/MesosJobClusterEntrypoint.java
@@ -34,7 +34,7 @@ import org.apache.flink.runtime.entrypoint.JobClusterEntrypoint;
import org.apache.flink.runtime.heartbeat.HeartbeatServices;
import org.apache.flink.runtime.highavailability.HighAvailabilityServices;
import org.apache.flink.runtime.jobgraph.JobGraph;
-import org.apache.flink.runtime.metrics.MetricRegistry;
+import org.apache.flink.runtime.metrics.MetricRegistryImpl;
import org.apache.flink.runtime.resourcemanager.ResourceManager;
import org.apache.flink.runtime.resourcemanager.ResourceManagerConfiguration;
import org.apache.flink.runtime.resourcemanager.ResourceManagerRuntimeServices;
@@ -112,7 +112,7 @@ public class MesosJobClusterEntrypoint extends JobClusterEntrypoint {
}
@Override
- protected void startClusterComponents(Configuration configuration, RpcService rpcService, HighAvailabilityServices highAvailabilityServices, BlobServer blobServer, HeartbeatServices heartbeatServices, MetricRegistry metricRegistry) throws Exception {
+ protected void startClusterComponents(Configuration configuration, RpcService rpcService, HighAvailabilityServices highAvailabilityServices, BlobServer blobServer, HeartbeatServices heartbeatServices, MetricRegistryImpl metricRegistry) throws Exception {
super.startClusterComponents(configuration, rpcService, highAvailabilityServices, blobServer, heartbeatServices, metricRegistry);
}
@@ -123,7 +123,7 @@ public class MesosJobClusterEntrypoint extends JobClusterEntrypoint {
RpcService rpcService,
HighAvailabilityServices highAvailabilityServices,
HeartbeatServices heartbeatServices,
- MetricRegistry metricRegistry,
+ MetricRegistryImpl metricRegistry,
FatalErrorHandler fatalErrorHandler) throws Exception {
final ResourceManagerConfiguration rmConfiguration = ResourceManagerConfiguration.fromConfiguration(configuration);
final ResourceManagerRuntimeServicesConfiguration rmServicesConfiguration = ResourceManagerRuntimeServicesConfiguration.fromConfiguration(configuration);
http://git-wip-us.apache.org/repos/asf/flink/blob/d45b9412/flink-mesos/src/main/java/org/apache/flink/mesos/entrypoint/MesosSessionClusterEntrypoint.java
----------------------------------------------------------------------
diff --git a/flink-mesos/src/main/java/org/apache/flink/mesos/entrypoint/MesosSessionClusterEntrypoint.java b/flink-mesos/src/main/java/org/apache/flink/mesos/entrypoint/MesosSessionClusterEntrypoint.java
index aa511b0..0cf0fce 100755
--- a/flink-mesos/src/main/java/org/apache/flink/mesos/entrypoint/MesosSessionClusterEntrypoint.java
+++ b/flink-mesos/src/main/java/org/apache/flink/mesos/entrypoint/MesosSessionClusterEntrypoint.java
@@ -33,7 +33,7 @@ import org.apache.flink.runtime.clusterframework.types.ResourceID;
import org.apache.flink.runtime.entrypoint.SessionClusterEntrypoint;
import org.apache.flink.runtime.heartbeat.HeartbeatServices;
import org.apache.flink.runtime.highavailability.HighAvailabilityServices;
-import org.apache.flink.runtime.metrics.MetricRegistry;
+import org.apache.flink.runtime.metrics.MetricRegistryImpl;
import org.apache.flink.runtime.resourcemanager.ResourceManager;
import org.apache.flink.runtime.resourcemanager.ResourceManagerConfiguration;
import org.apache.flink.runtime.resourcemanager.ResourceManagerRuntimeServices;
@@ -102,7 +102,7 @@ public class MesosSessionClusterEntrypoint extends SessionClusterEntrypoint {
}
@Override
- protected void startClusterComponents(Configuration configuration, RpcService rpcService, HighAvailabilityServices highAvailabilityServices, BlobServer blobServer, HeartbeatServices heartbeatServices, MetricRegistry metricRegistry) throws Exception {
+ protected void startClusterComponents(Configuration configuration, RpcService rpcService, HighAvailabilityServices highAvailabilityServices, BlobServer blobServer, HeartbeatServices heartbeatServices, MetricRegistryImpl metricRegistry) throws Exception {
super.startClusterComponents(configuration, rpcService, highAvailabilityServices, blobServer, heartbeatServices, metricRegistry);
}
@@ -113,7 +113,7 @@ public class MesosSessionClusterEntrypoint extends SessionClusterEntrypoint {
RpcService rpcService,
HighAvailabilityServices highAvailabilityServices,
HeartbeatServices heartbeatServices,
- MetricRegistry metricRegistry,
+ MetricRegistryImpl metricRegistry,
FatalErrorHandler fatalErrorHandler) throws Exception {
final ResourceManagerConfiguration rmConfiguration = ResourceManagerConfiguration.fromConfiguration(configuration);
final ResourceManagerRuntimeServicesConfiguration rmServicesConfiguration = ResourceManagerRuntimeServicesConfiguration.fromConfiguration(configuration);
http://git-wip-us.apache.org/repos/asf/flink/blob/d45b9412/flink-mesos/src/main/java/org/apache/flink/mesos/runtime/clusterframework/MesosApplicationMasterRunner.java
----------------------------------------------------------------------
diff --git a/flink-mesos/src/main/java/org/apache/flink/mesos/runtime/clusterframework/MesosApplicationMasterRunner.java b/flink-mesos/src/main/java/org/apache/flink/mesos/runtime/clusterframework/MesosApplicationMasterRunner.java
index a6ea133..9887d97 100755
--- a/flink-mesos/src/main/java/org/apache/flink/mesos/runtime/clusterframework/MesosApplicationMasterRunner.java
+++ b/flink-mesos/src/main/java/org/apache/flink/mesos/runtime/clusterframework/MesosApplicationMasterRunner.java
@@ -39,6 +39,8 @@ import org.apache.flink.runtime.highavailability.HighAvailabilityServicesUtils;
import org.apache.flink.runtime.jobmanager.JobManager;
import org.apache.flink.runtime.jobmanager.MemoryArchivist;
import org.apache.flink.runtime.jobmaster.JobMaster;
+import org.apache.flink.runtime.metrics.MetricRegistryConfiguration;
+import org.apache.flink.runtime.metrics.MetricRegistryImpl;
import org.apache.flink.runtime.process.ProcessReaper;
import org.apache.flink.runtime.security.SecurityConfiguration;
import org.apache.flink.runtime.security.SecurityUtils;
@@ -200,6 +202,7 @@ public class MesosApplicationMasterRunner {
ExecutorService ioExecutor = null;
MesosServices mesosServices = null;
HighAvailabilityServices highAvailabilityServices = null;
+ MetricRegistryImpl metricRegistry = null;
try {
// ------- (1) load and parse / validate all configurations -------
@@ -304,6 +307,11 @@ public class MesosApplicationMasterRunner {
// 2: the JobManager
LOG.debug("Starting JobManager actor");
+ metricRegistry = new MetricRegistryImpl(
+ MetricRegistryConfiguration.fromConfiguration(config));
+
+ metricRegistry.startQueryService(actorSystem, null);
+
// we start the JobManager with its standard name
ActorRef jobManager = JobManager.startJobManagerActors(
config,
@@ -311,6 +319,7 @@ public class MesosApplicationMasterRunner {
futureExecutor,
ioExecutor,
highAvailabilityServices,
+ metricRegistry,
webMonitor != null ? Option.apply(webMonitor.getRestAddress()) : Option.empty(),
Option.apply(JobMaster.JOB_MANAGER_NAME),
Option.apply(JobMaster.ARCHIVE_NAME),
@@ -422,6 +431,10 @@ public class MesosApplicationMasterRunner {
}
}
+ if (metricRegistry != null) {
+ metricRegistry.shutdown();
+ }
+
org.apache.flink.runtime.concurrent.Executors.gracefulShutdown(
AkkaUtils.getTimeout(config).toMillis(),
TimeUnit.MILLISECONDS,
http://git-wip-us.apache.org/repos/asf/flink/blob/d45b9412/flink-mesos/src/main/java/org/apache/flink/mesos/runtime/clusterframework/MesosResourceManager.java
----------------------------------------------------------------------
diff --git a/flink-mesos/src/main/java/org/apache/flink/mesos/runtime/clusterframework/MesosResourceManager.java b/flink-mesos/src/main/java/org/apache/flink/mesos/runtime/clusterframework/MesosResourceManager.java
index 1e32b2c..7ea4908 100644
--- a/flink-mesos/src/main/java/org/apache/flink/mesos/runtime/clusterframework/MesosResourceManager.java
+++ b/flink-mesos/src/main/java/org/apache/flink/mesos/runtime/clusterframework/MesosResourceManager.java
@@ -49,7 +49,7 @@ import org.apache.flink.runtime.clusterframework.types.ResourceProfile;
import org.apache.flink.runtime.concurrent.FutureUtils;
import org.apache.flink.runtime.heartbeat.HeartbeatServices;
import org.apache.flink.runtime.highavailability.HighAvailabilityServices;
-import org.apache.flink.runtime.metrics.MetricRegistry;
+import org.apache.flink.runtime.metrics.MetricRegistryImpl;
import org.apache.flink.runtime.resourcemanager.JobLeaderIdService;
import org.apache.flink.runtime.resourcemanager.ResourceManager;
import org.apache.flink.runtime.resourcemanager.ResourceManagerConfiguration;
@@ -145,7 +145,7 @@ public class MesosResourceManager extends ResourceManager<RegisteredMesosWorkerN
HighAvailabilityServices highAvailabilityServices,
HeartbeatServices heartbeatServices,
SlotManager slotManager,
- MetricRegistry metricRegistry,
+ MetricRegistryImpl metricRegistry,
JobLeaderIdService jobLeaderIdService,
FatalErrorHandler fatalErrorHandler,
// Mesos specifics
http://git-wip-us.apache.org/repos/asf/flink/blob/d45b9412/flink-mesos/src/main/scala/org/apache/flink/mesos/runtime/clusterframework/MesosJobManager.scala
----------------------------------------------------------------------
diff --git a/flink-mesos/src/main/scala/org/apache/flink/mesos/runtime/clusterframework/MesosJobManager.scala b/flink-mesos/src/main/scala/org/apache/flink/mesos/runtime/clusterframework/MesosJobManager.scala
index 9ad8eb2..c6230e7 100644
--- a/flink-mesos/src/main/scala/org/apache/flink/mesos/runtime/clusterframework/MesosJobManager.scala
+++ b/flink-mesos/src/main/scala/org/apache/flink/mesos/runtime/clusterframework/MesosJobManager.scala
@@ -31,7 +31,8 @@ import org.apache.flink.runtime.instance.InstanceManager
import org.apache.flink.runtime.jobmanager.SubmittedJobGraphStore
import org.apache.flink.runtime.jobmanager.scheduler.{Scheduler => FlinkScheduler}
import org.apache.flink.runtime.leaderelection.LeaderElectionService
-import org.apache.flink.runtime.metrics.{MetricRegistry => FlinkMetricRegistry}
+import org.apache.flink.runtime.metrics.groups.JobManagerMetricGroup
+import org.apache.flink.runtime.metrics.{MetricRegistryImpl => FlinkMetricRegistry}
import scala.concurrent.duration._
@@ -66,7 +67,7 @@ class MesosJobManager(
submittedJobGraphs : SubmittedJobGraphStore,
checkpointRecoveryFactory : CheckpointRecoveryFactory,
jobRecoveryTimeout: FiniteDuration,
- metricsRegistry: Option[FlinkMetricRegistry],
+ jobManagerMetricGroup: JobManagerMetricGroup,
optRestAddress: Option[String])
extends ContaineredJobManager(
flinkConfiguration,
@@ -83,7 +84,7 @@ class MesosJobManager(
submittedJobGraphs,
checkpointRecoveryFactory,
jobRecoveryTimeout,
- metricsRegistry,
+ jobManagerMetricGroup,
optRestAddress) {
val jobPollingInterval: FiniteDuration = 5 seconds
http://git-wip-us.apache.org/repos/asf/flink/blob/d45b9412/flink-mesos/src/main/scala/org/apache/flink/mesos/runtime/clusterframework/MesosTaskManager.scala
----------------------------------------------------------------------
diff --git a/flink-mesos/src/main/scala/org/apache/flink/mesos/runtime/clusterframework/MesosTaskManager.scala b/flink-mesos/src/main/scala/org/apache/flink/mesos/runtime/clusterframework/MesosTaskManager.scala
index 7834639..e69472e 100644
--- a/flink-mesos/src/main/scala/org/apache/flink/mesos/runtime/clusterframework/MesosTaskManager.scala
+++ b/flink-mesos/src/main/scala/org/apache/flink/mesos/runtime/clusterframework/MesosTaskManager.scala
@@ -23,7 +23,7 @@ import org.apache.flink.runtime.highavailability.HighAvailabilityServices
import org.apache.flink.runtime.io.disk.iomanager.IOManager
import org.apache.flink.runtime.io.network.NetworkEnvironment
import org.apache.flink.runtime.memory.MemoryManager
-import org.apache.flink.runtime.metrics.MetricRegistry
+import org.apache.flink.runtime.metrics.groups.TaskManagerMetricGroup
import org.apache.flink.runtime.taskexecutor.TaskManagerConfiguration
import org.apache.flink.runtime.taskmanager.{TaskManager, TaskManagerLocation}
@@ -39,7 +39,7 @@ class MesosTaskManager(
network: NetworkEnvironment,
numberOfSlots: Int,
highAvailabilityServices: HighAvailabilityServices,
- metricRegistry : MetricRegistry)
+ taskManagerMetricGroup : TaskManagerMetricGroup)
extends TaskManager(
config,
resourceID,
@@ -49,7 +49,7 @@ class MesosTaskManager(
network,
numberOfSlots,
highAvailabilityServices,
- metricRegistry) {
+ taskManagerMetricGroup) {
override def handleMessage: Receive = {
super.handleMessage
http://git-wip-us.apache.org/repos/asf/flink/blob/d45b9412/flink-mesos/src/test/java/org/apache/flink/mesos/runtime/clusterframework/MesosResourceManagerTest.java
----------------------------------------------------------------------
diff --git a/flink-mesos/src/test/java/org/apache/flink/mesos/runtime/clusterframework/MesosResourceManagerTest.java b/flink-mesos/src/test/java/org/apache/flink/mesos/runtime/clusterframework/MesosResourceManagerTest.java
index 4bdd9a3..1cdd087 100644
--- a/flink-mesos/src/test/java/org/apache/flink/mesos/runtime/clusterframework/MesosResourceManagerTest.java
+++ b/flink-mesos/src/test/java/org/apache/flink/mesos/runtime/clusterframework/MesosResourceManagerTest.java
@@ -52,7 +52,7 @@ import org.apache.flink.runtime.jobmaster.JobMasterId;
import org.apache.flink.runtime.jobmaster.JobMasterRegistrationSuccess;
import org.apache.flink.runtime.leaderelection.TestingLeaderElectionService;
import org.apache.flink.runtime.leaderelection.TestingLeaderRetrievalService;
-import org.apache.flink.runtime.metrics.MetricRegistry;
+import org.apache.flink.runtime.metrics.MetricRegistryImpl;
import org.apache.flink.runtime.registration.RegistrationResponse;
import org.apache.flink.runtime.resourcemanager.JobLeaderIdService;
import org.apache.flink.runtime.resourcemanager.ResourceManagerConfiguration;
@@ -160,7 +160,7 @@ public class MesosResourceManagerTest extends TestLogger {
HighAvailabilityServices highAvailabilityServices,
HeartbeatServices heartbeatServices,
SlotManager slotManager,
- MetricRegistry metricRegistry,
+ MetricRegistryImpl metricRegistry,
JobLeaderIdService jobLeaderIdService,
FatalErrorHandler fatalErrorHandler,
@@ -306,7 +306,7 @@ public class MesosResourceManagerTest extends TestLogger {
public final ScheduledExecutor scheduledExecutor;
public final TestingHighAvailabilityServices highAvailabilityServices;
public final HeartbeatServices heartbeatServices;
- public final MetricRegistry metricRegistry;
+ public final MetricRegistryImpl metricRegistry;
public final TestingLeaderElectionService rmLeaderElectionService;
public final JobLeaderIdService jobLeaderIdService;
public final SlotManager slotManager;
@@ -321,7 +321,7 @@ public class MesosResourceManagerTest extends TestLogger {
rmLeaderElectionService = new TestingLeaderElectionService();
highAvailabilityServices.setResourceManagerLeaderElectionService(rmLeaderElectionService);
heartbeatServices = new TestingHeartbeatServices(5L, 5L, scheduledExecutor);
- metricRegistry = mock(MetricRegistry.class);
+ metricRegistry = mock(MetricRegistryImpl.class);
slotManager = mock(SlotManager.class);
slotManagerStarted = new CompletableFuture<>();
jobLeaderIdService = new JobLeaderIdService(
http://git-wip-us.apache.org/repos/asf/flink/blob/d45b9412/flink-metrics/flink-metrics-dropwizard/src/test/java/org/apache/flink/dropwizard/ScheduledDropwizardReporterTest.java
----------------------------------------------------------------------
diff --git a/flink-metrics/flink-metrics-dropwizard/src/test/java/org/apache/flink/dropwizard/ScheduledDropwizardReporterTest.java b/flink-metrics/flink-metrics-dropwizard/src/test/java/org/apache/flink/dropwizard/ScheduledDropwizardReporterTest.java
index 5ed6de2..e6d5e27 100644
--- a/flink-metrics/flink-metrics-dropwizard/src/test/java/org/apache/flink/dropwizard/ScheduledDropwizardReporterTest.java
+++ b/flink-metrics/flink-metrics-dropwizard/src/test/java/org/apache/flink/dropwizard/ScheduledDropwizardReporterTest.java
@@ -34,7 +34,7 @@ import org.apache.flink.metrics.SimpleCounter;
import org.apache.flink.metrics.groups.UnregisteredMetricsGroup;
import org.apache.flink.metrics.reporter.MetricReporter;
import org.apache.flink.runtime.jobgraph.JobVertexID;
-import org.apache.flink.runtime.metrics.MetricRegistry;
+import org.apache.flink.runtime.metrics.MetricRegistryImpl;
import org.apache.flink.runtime.metrics.MetricRegistryConfiguration;
import org.apache.flink.runtime.metrics.groups.TaskManagerJobMetricGroup;
import org.apache.flink.runtime.metrics.groups.TaskManagerMetricGroup;
@@ -92,7 +92,7 @@ public class ScheduledDropwizardReporterTest {
MetricRegistryConfiguration metricRegistryConfiguration = MetricRegistryConfiguration.fromConfiguration(configuration);
- MetricRegistry metricRegistry = new MetricRegistry(metricRegistryConfiguration);
+ MetricRegistryImpl metricRegistry = new MetricRegistryImpl(metricRegistryConfiguration);
char delimiter = metricRegistry.getDelimiter();
http://git-wip-us.apache.org/repos/asf/flink/blob/d45b9412/flink-metrics/flink-metrics-dropwizard/src/test/java/org/apache/flink/dropwizard/metrics/DropwizardFlinkHistogramWrapperTest.java
----------------------------------------------------------------------
diff --git a/flink-metrics/flink-metrics-dropwizard/src/test/java/org/apache/flink/dropwizard/metrics/DropwizardFlinkHistogramWrapperTest.java b/flink-metrics/flink-metrics-dropwizard/src/test/java/org/apache/flink/dropwizard/metrics/DropwizardFlinkHistogramWrapperTest.java
index 63765ae..a927a30 100644
--- a/flink-metrics/flink-metrics-dropwizard/src/test/java/org/apache/flink/dropwizard/metrics/DropwizardFlinkHistogramWrapperTest.java
+++ b/flink-metrics/flink-metrics-dropwizard/src/test/java/org/apache/flink/dropwizard/metrics/DropwizardFlinkHistogramWrapperTest.java
@@ -24,7 +24,7 @@ import org.apache.flink.configuration.MetricOptions;
import org.apache.flink.dropwizard.ScheduledDropwizardReporter;
import org.apache.flink.metrics.MetricConfig;
import org.apache.flink.metrics.reporter.MetricReporter;
-import org.apache.flink.runtime.metrics.MetricRegistry;
+import org.apache.flink.runtime.metrics.MetricRegistryImpl;
import org.apache.flink.runtime.metrics.MetricRegistryConfiguration;
import org.apache.flink.runtime.metrics.groups.TaskManagerMetricGroup;
import org.apache.flink.util.TestLogger;
@@ -105,12 +105,12 @@ public class DropwizardFlinkHistogramWrapperTest extends TestLogger {
config.setString(ConfigConstants.METRICS_REPORTER_PREFIX + "my_reporter." + ConfigConstants.METRICS_REPORTER_CLASS_SUFFIX, TestingReporter.class.getName());
config.setString(ConfigConstants.METRICS_REPORTER_PREFIX + "my_reporter." + ConfigConstants.METRICS_REPORTER_INTERVAL_SUFFIX, reportingInterval + " MILLISECONDS");
- MetricRegistry registry = null;
+ MetricRegistryImpl registry = null;
MetricRegistryConfiguration metricRegistryConfiguration = MetricRegistryConfiguration.fromConfiguration(config);
try {
- registry = new MetricRegistry(metricRegistryConfiguration);
+ registry = new MetricRegistryImpl(metricRegistryConfiguration);
DropwizardHistogramWrapper histogramWrapper = new DropwizardHistogramWrapper(
new com.codahale.metrics.Histogram(new SlidingWindowReservoir(size)));
http://git-wip-us.apache.org/repos/asf/flink/blob/d45b9412/flink-metrics/flink-metrics-jmx/src/test/java/org/apache/flink/metrics/jmx/JMXReporterTest.java
----------------------------------------------------------------------
diff --git a/flink-metrics/flink-metrics-jmx/src/test/java/org/apache/flink/metrics/jmx/JMXReporterTest.java b/flink-metrics/flink-metrics-jmx/src/test/java/org/apache/flink/metrics/jmx/JMXReporterTest.java
index f10769a..4c97055 100644
--- a/flink-metrics/flink-metrics-jmx/src/test/java/org/apache/flink/metrics/jmx/JMXReporterTest.java
+++ b/flink-metrics/flink-metrics-jmx/src/test/java/org/apache/flink/metrics/jmx/JMXReporterTest.java
@@ -24,7 +24,7 @@ import org.apache.flink.configuration.MetricOptions;
import org.apache.flink.metrics.Gauge;
import org.apache.flink.metrics.reporter.MetricReporter;
import org.apache.flink.metrics.util.TestMeter;
-import org.apache.flink.runtime.metrics.MetricRegistry;
+import org.apache.flink.runtime.metrics.MetricRegistryImpl;
import org.apache.flink.runtime.metrics.MetricRegistryConfiguration;
import org.apache.flink.runtime.metrics.groups.FrontMetricGroup;
import org.apache.flink.runtime.metrics.groups.TaskManagerMetricGroup;
@@ -108,7 +108,7 @@ public class JMXReporterTest extends TestLogger {
cfg.setString(ConfigConstants.METRICS_REPORTER_PREFIX + "test2." + ConfigConstants.METRICS_REPORTER_CLASS_SUFFIX, JMXReporter.class.getName());
cfg.setString(ConfigConstants.METRICS_REPORTER_PREFIX + "test2.port", "9020-9035");
- MetricRegistry reg = new MetricRegistry(MetricRegistryConfiguration.fromConfiguration(cfg));
+ MetricRegistryImpl reg = new MetricRegistryImpl(MetricRegistryConfiguration.fromConfiguration(cfg));
TaskManagerMetricGroup mg = new TaskManagerMetricGroup(reg, "host", "tm");
@@ -168,7 +168,7 @@ public class JMXReporterTest extends TestLogger {
cfg.setString(ConfigConstants.METRICS_REPORTER_PREFIX + "test2." + ConfigConstants.METRICS_REPORTER_CLASS_SUFFIX, JMXReporter.class.getName());
cfg.setString(ConfigConstants.METRICS_REPORTER_PREFIX + "test2.port", "9040-9055");
- MetricRegistry reg = new MetricRegistry(MetricRegistryConfiguration.fromConfiguration(cfg));
+ MetricRegistryImpl reg = new MetricRegistryImpl(MetricRegistryConfiguration.fromConfiguration(cfg));
TaskManagerMetricGroup mg = new TaskManagerMetricGroup(reg, "host", "tm");
@@ -231,7 +231,7 @@ public class JMXReporterTest extends TestLogger {
*/
@Test
public void testHistogramReporting() throws Exception {
- MetricRegistry registry = null;
+ MetricRegistryImpl registry = null;
String histogramName = "histogram";
try {
@@ -239,7 +239,7 @@ public class JMXReporterTest extends TestLogger {
config.setString(MetricOptions.REPORTERS_LIST, "jmx_test");
config.setString(ConfigConstants.METRICS_REPORTER_PREFIX + "jmx_test." + ConfigConstants.METRICS_REPORTER_CLASS_SUFFIX, JMXReporter.class.getName());
- registry = new MetricRegistry(MetricRegistryConfiguration.fromConfiguration(config));
+ registry = new MetricRegistryImpl(MetricRegistryConfiguration.fromConfiguration(config));
TaskManagerMetricGroup metricGroup = new TaskManagerMetricGroup(registry, "localhost", "tmId");
@@ -281,7 +281,7 @@ public class JMXReporterTest extends TestLogger {
*/
@Test
public void testMeterReporting() throws Exception {
- MetricRegistry registry = null;
+ MetricRegistryImpl registry = null;
String meterName = "meter";
try {
@@ -289,7 +289,7 @@ public class JMXReporterTest extends TestLogger {
config.setString(MetricOptions.REPORTERS_LIST, "jmx_test");
config.setString(ConfigConstants.METRICS_REPORTER_PREFIX + "jmx_test." + ConfigConstants.METRICS_REPORTER_CLASS_SUFFIX, JMXReporter.class.getName());
- registry = new MetricRegistry(MetricRegistryConfiguration.fromConfiguration(config));
+ registry = new MetricRegistryImpl(MetricRegistryConfiguration.fromConfiguration(config));
TaskManagerMetricGroup metricGroup = new TaskManagerMetricGroup(registry, "localhost", "tmId");
http://git-wip-us.apache.org/repos/asf/flink/blob/d45b9412/flink-metrics/flink-metrics-prometheus/src/test/java/org/apache/flink/metrics/prometheus/PrometheusReporterTaskScopeTest.java
----------------------------------------------------------------------
diff --git a/flink-metrics/flink-metrics-prometheus/src/test/java/org/apache/flink/metrics/prometheus/PrometheusReporterTaskScopeTest.java b/flink-metrics/flink-metrics-prometheus/src/test/java/org/apache/flink/metrics/prometheus/PrometheusReporterTaskScopeTest.java
index 0ae8fc7..55ddc00 100644
--- a/flink-metrics/flink-metrics-prometheus/src/test/java/org/apache/flink/metrics/prometheus/PrometheusReporterTaskScopeTest.java
+++ b/flink-metrics/flink-metrics-prometheus/src/test/java/org/apache/flink/metrics/prometheus/PrometheusReporterTaskScopeTest.java
@@ -26,8 +26,8 @@ import org.apache.flink.metrics.Meter;
import org.apache.flink.metrics.SimpleCounter;
import org.apache.flink.metrics.util.TestMeter;
import org.apache.flink.runtime.jobgraph.JobVertexID;
-import org.apache.flink.runtime.metrics.MetricRegistry;
import org.apache.flink.runtime.metrics.MetricRegistryConfiguration;
+import org.apache.flink.runtime.metrics.MetricRegistryImpl;
import org.apache.flink.runtime.metrics.groups.TaskManagerJobMetricGroup;
import org.apache.flink.runtime.metrics.groups.TaskManagerMetricGroup;
import org.apache.flink.runtime.metrics.groups.TaskMetricGroup;
@@ -75,12 +75,12 @@ public class PrometheusReporterTaskScopeTest {
private TaskMetricGroup taskMetricGroup1;
private TaskMetricGroup taskMetricGroup2;
- private MetricRegistry registry;
+ private MetricRegistryImpl registry;
private PrometheusReporter reporter;
@Before
public void setupReporter() {
- registry = new MetricRegistry(MetricRegistryConfiguration.fromConfiguration(createConfigWithOneReporter("test1", "9400-9500")));
+ registry = new MetricRegistryImpl(MetricRegistryConfiguration.fromConfiguration(createConfigWithOneReporter("test1", "9400-9500")));
reporter = (PrometheusReporter) registry.getReporters().get(0);
TaskManagerMetricGroup tmMetricGroup = new TaskManagerMetricGroup(registry, TASK_MANAGER_HOST, TASK_MANAGER_ID);
http://git-wip-us.apache.org/repos/asf/flink/blob/d45b9412/flink-metrics/flink-metrics-prometheus/src/test/java/org/apache/flink/metrics/prometheus/PrometheusReporterTest.java
----------------------------------------------------------------------
diff --git a/flink-metrics/flink-metrics-prometheus/src/test/java/org/apache/flink/metrics/prometheus/PrometheusReporterTest.java b/flink-metrics/flink-metrics-prometheus/src/test/java/org/apache/flink/metrics/prometheus/PrometheusReporterTest.java
index 0d7be6d..6704189 100644
--- a/flink-metrics/flink-metrics-prometheus/src/test/java/org/apache/flink/metrics/prometheus/PrometheusReporterTest.java
+++ b/flink-metrics/flink-metrics-prometheus/src/test/java/org/apache/flink/metrics/prometheus/PrometheusReporterTest.java
@@ -28,8 +28,8 @@ import org.apache.flink.metrics.Meter;
import org.apache.flink.metrics.Metric;
import org.apache.flink.metrics.SimpleCounter;
import org.apache.flink.metrics.util.TestMeter;
-import org.apache.flink.runtime.metrics.MetricRegistry;
import org.apache.flink.runtime.metrics.MetricRegistryConfiguration;
+import org.apache.flink.runtime.metrics.MetricRegistryImpl;
import org.apache.flink.runtime.metrics.groups.FrontMetricGroup;
import org.apache.flink.runtime.metrics.groups.TaskManagerMetricGroup;
import org.apache.flink.runtime.metrics.util.TestingHistogram;
@@ -69,13 +69,13 @@ public class PrometheusReporterTest extends TestLogger {
@Rule
public ExpectedException thrown = ExpectedException.none();
- private MetricRegistry registry;
+ private MetricRegistryImpl registry;
private FrontMetricGroup<TaskManagerMetricGroup> metricGroup;
private PrometheusReporter reporter;
@Before
public void setupReporter() {
- registry = new MetricRegistry(MetricRegistryConfiguration.fromConfiguration(createConfigWithOneReporter("test1", "9400-9500")));
+ registry = new MetricRegistryImpl(MetricRegistryConfiguration.fromConfiguration(createConfigWithOneReporter("test1", "9400-9500")));
metricGroup = new FrontMetricGroup<>(0, new TaskManagerMetricGroup(registry, HOST_NAME, TASK_MANAGER));
reporter = (PrometheusReporter) registry.getReporters().get(0);
}
@@ -158,7 +158,7 @@ public class PrometheusReporterTest extends TestLogger {
@Test
public void endpointIsUnavailableAfterReporterIsClosed() throws UnirestException {
- MetricRegistry registry = new MetricRegistry(MetricRegistryConfiguration.fromConfiguration(createConfigWithOneReporter("test1", "9400-9500")));
+ MetricRegistryImpl registry = new MetricRegistryImpl(MetricRegistryConfiguration.fromConfiguration(createConfigWithOneReporter("test1", "9400-9500")));
PrometheusReporter reporter = (PrometheusReporter) registry.getReporters().get(0);
reporter.close();
thrown.expect(UnirestException.class);
@@ -244,12 +244,12 @@ public class PrometheusReporterTest extends TestLogger {
@Test
public void cannotStartTwoReportersOnSamePort() {
- final MetricRegistry fixedPort1 = new MetricRegistry(MetricRegistryConfiguration.fromConfiguration(createConfigWithOneReporter("test1", "9400-9500")));
+ final MetricRegistryImpl fixedPort1 = new MetricRegistryImpl(MetricRegistryConfiguration.fromConfiguration(createConfigWithOneReporter("test1", "9400-9500")));
assertThat(fixedPort1.getReporters(), hasSize(1));
PrometheusReporter firstReporter = (PrometheusReporter) fixedPort1.getReporters().get(0);
- final MetricRegistry fixedPort2 = new MetricRegistry(MetricRegistryConfiguration.fromConfiguration(createConfigWithOneReporter("test2", String.valueOf(firstReporter.getPort()))));
+ final MetricRegistryImpl fixedPort2 = new MetricRegistryImpl(MetricRegistryConfiguration.fromConfiguration(createConfigWithOneReporter("test2", String.valueOf(firstReporter.getPort()))));
assertThat(fixedPort2.getReporters(), hasSize(0));
fixedPort1.shutdown();
@@ -258,8 +258,8 @@ public class PrometheusReporterTest extends TestLogger {
@Test
public void canStartTwoReportersWhenUsingPortRange() {
- final MetricRegistry portRange1 = new MetricRegistry(MetricRegistryConfiguration.fromConfiguration(createConfigWithOneReporter("test1", "9200-9300")));
- final MetricRegistry portRange2 = new MetricRegistry(MetricRegistryConfiguration.fromConfiguration(createConfigWithOneReporter("test2", "9200-9300")));
+ final MetricRegistryImpl portRange1 = new MetricRegistryImpl(MetricRegistryConfiguration.fromConfiguration(createConfigWithOneReporter("test1", "9200-9300")));
+ final MetricRegistryImpl portRange2 = new MetricRegistryImpl(MetricRegistryConfiguration.fromConfiguration(createConfigWithOneReporter("test2", "9200-9300")));
assertThat(portRange1.getReporters(), hasSize(1));
assertThat(portRange2.getReporters(), hasSize(1));
http://git-wip-us.apache.org/repos/asf/flink/blob/d45b9412/flink-metrics/flink-metrics-slf4j/src/test/java/org/apache/flink/metrics/slf4j/Slf4jReporterTest.java
----------------------------------------------------------------------
diff --git a/flink-metrics/flink-metrics-slf4j/src/test/java/org/apache/flink/metrics/slf4j/Slf4jReporterTest.java b/flink-metrics/flink-metrics-slf4j/src/test/java/org/apache/flink/metrics/slf4j/Slf4jReporterTest.java
index 51724bd..ba7c5a1 100644
--- a/flink-metrics/flink-metrics-slf4j/src/test/java/org/apache/flink/metrics/slf4j/Slf4jReporterTest.java
+++ b/flink-metrics/flink-metrics-slf4j/src/test/java/org/apache/flink/metrics/slf4j/Slf4jReporterTest.java
@@ -29,8 +29,8 @@ import org.apache.flink.metrics.MeterView;
import org.apache.flink.metrics.SimpleCounter;
import org.apache.flink.runtime.executiongraph.ExecutionAttemptID;
import org.apache.flink.runtime.jobgraph.JobVertexID;
-import org.apache.flink.runtime.metrics.MetricRegistry;
import org.apache.flink.runtime.metrics.MetricRegistryConfiguration;
+import org.apache.flink.runtime.metrics.MetricRegistryImpl;
import org.apache.flink.runtime.metrics.groups.TaskManagerMetricGroup;
import org.apache.flink.runtime.metrics.groups.TaskMetricGroup;
import org.apache.flink.runtime.metrics.util.TestingHistogram;
@@ -53,7 +53,7 @@ public class Slf4jReporterTest extends TestLogger {
private static final String TASK_MANAGER_ID = "tm01";
private static final String JOB_NAME = "jn01";
private static final String TASK_NAME = "tn01";
- private static MetricRegistry registry;
+ private static MetricRegistryImpl registry;
private static char delimiter;
private static TaskMetricGroup taskMetricGroup;
private static Slf4jReporter reporter;
@@ -68,7 +68,7 @@ public class Slf4jReporterTest extends TestLogger {
ConfigConstants.METRICS_REPORTER_CLASS_SUFFIX, Slf4jReporter.class.getName());
configuration.setString(MetricOptions.SCOPE_NAMING_TASK, "<host>.<tm_id>.<job_name>");
- registry = new MetricRegistry(MetricRegistryConfiguration.fromConfiguration(configuration));
+ registry = new MetricRegistryImpl(MetricRegistryConfiguration.fromConfiguration(configuration));
delimiter = registry.getDelimiter();
taskMetricGroup = new TaskManagerMetricGroup(registry, HOST_NAME, TASK_MANAGER_ID)
http://git-wip-us.apache.org/repos/asf/flink/blob/d45b9412/flink-metrics/flink-metrics-statsd/src/test/java/org/apache/flink/metrics/statsd/StatsDReporterTest.java
----------------------------------------------------------------------
diff --git a/flink-metrics/flink-metrics-statsd/src/test/java/org/apache/flink/metrics/statsd/StatsDReporterTest.java b/flink-metrics/flink-metrics-statsd/src/test/java/org/apache/flink/metrics/statsd/StatsDReporterTest.java
index 94de9a9..f460abd 100644
--- a/flink-metrics/flink-metrics-statsd/src/test/java/org/apache/flink/metrics/statsd/StatsDReporterTest.java
+++ b/flink-metrics/flink-metrics-statsd/src/test/java/org/apache/flink/metrics/statsd/StatsDReporterTest.java
@@ -30,7 +30,7 @@ import org.apache.flink.metrics.SimpleCounter;
import org.apache.flink.metrics.reporter.MetricReporter;
import org.apache.flink.metrics.util.TestMeter;
import org.apache.flink.runtime.jobgraph.JobVertexID;
-import org.apache.flink.runtime.metrics.MetricRegistry;
+import org.apache.flink.runtime.metrics.MetricRegistryImpl;
import org.apache.flink.runtime.metrics.MetricRegistryConfiguration;
import org.apache.flink.runtime.metrics.groups.TaskManagerJobMetricGroup;
import org.apache.flink.runtime.metrics.groups.TaskManagerMetricGroup;
@@ -89,7 +89,7 @@ public class StatsDReporterTest extends TestLogger {
configuration.setString(MetricOptions.SCOPE_NAMING_TASK, "<host>.<tm_id>.<job_name>");
configuration.setString(MetricOptions.SCOPE_DELIMITER, "_");
- MetricRegistry metricRegistry = new MetricRegistry(MetricRegistryConfiguration.fromConfiguration(configuration));
+ MetricRegistryImpl metricRegistry = new MetricRegistryImpl(MetricRegistryConfiguration.fromConfiguration(configuration));
char delimiter = metricRegistry.getDelimiter();
@@ -133,7 +133,7 @@ public class StatsDReporterTest extends TestLogger {
*/
@Test
public void testStatsDHistogramReporting() throws Exception {
- MetricRegistry registry = null;
+ MetricRegistryImpl registry = null;
DatagramSocketReceiver receiver = null;
Thread receiverThread = null;
long timeout = 5000;
@@ -157,7 +157,7 @@ public class StatsDReporterTest extends TestLogger {
config.setString(ConfigConstants.METRICS_REPORTER_PREFIX + "test.host", "localhost");
config.setString(ConfigConstants.METRICS_REPORTER_PREFIX + "test.port", "" + port);
- registry = new MetricRegistry(MetricRegistryConfiguration.fromConfiguration(config));
+ registry = new MetricRegistryImpl(MetricRegistryConfiguration.fromConfiguration(config));
TaskManagerMetricGroup metricGroup = new TaskManagerMetricGroup(registry, "localhost", "tmId");
@@ -207,7 +207,7 @@ public class StatsDReporterTest extends TestLogger {
*/
@Test
public void testStatsDMetersReporting() throws Exception {
- MetricRegistry registry = null;
+ MetricRegistryImpl registry = null;
DatagramSocketReceiver receiver = null;
Thread receiverThread = null;
long timeout = 5000;
@@ -231,7 +231,7 @@ public class StatsDReporterTest extends TestLogger {
config.setString(ConfigConstants.METRICS_REPORTER_PREFIX + "test.host", "localhost");
config.setString(ConfigConstants.METRICS_REPORTER_PREFIX + "test.port", "" + port);
- registry = new MetricRegistry(MetricRegistryConfiguration.fromConfiguration(config));
+ registry = new MetricRegistryImpl(MetricRegistryConfiguration.fromConfiguration(config));
TaskManagerMetricGroup metricGroup = new TaskManagerMetricGroup(registry, "localhost", "tmId");
TestMeter meter = new TestMeter();
metricGroup.meter(meterName, meter);
http://git-wip-us.apache.org/repos/asf/flink/blob/d45b9412/flink-runtime-web/src/test/java/org/apache/flink/runtime/webmonitor/WebRuntimeMonitorITCase.java
----------------------------------------------------------------------
diff --git a/flink-runtime-web/src/test/java/org/apache/flink/runtime/webmonitor/WebRuntimeMonitorITCase.java b/flink-runtime-web/src/test/java/org/apache/flink/runtime/webmonitor/WebRuntimeMonitorITCase.java
index f9dd98e..75a844c 100644
--- a/flink-runtime-web/src/test/java/org/apache/flink/runtime/webmonitor/WebRuntimeMonitorITCase.java
+++ b/flink-runtime-web/src/test/java/org/apache/flink/runtime/webmonitor/WebRuntimeMonitorITCase.java
@@ -30,6 +30,7 @@ import org.apache.flink.runtime.jobmanager.MemoryArchivist;
import org.apache.flink.runtime.jobmaster.JobManagerGateway;
import org.apache.flink.runtime.leaderelection.TestingListener;
import org.apache.flink.runtime.leaderretrieval.LeaderRetrievalService;
+import org.apache.flink.runtime.metrics.NoOpMetricRegistry;
import org.apache.flink.runtime.rest.handler.util.MimeTypes;
import org.apache.flink.runtime.testingUtils.TestingCluster;
import org.apache.flink.runtime.testingUtils.TestingUtils;
@@ -193,6 +194,7 @@ public class WebRuntimeMonitorITCase extends TestLogger {
TestingUtils.defaultExecutor(),
TestingUtils.defaultExecutor(),
highAvailabilityServices,
+ new NoOpMetricRegistry(),
Option.apply(webMonitor[i].getRestAddress()),
JobManager.class,
MemoryArchivist.class)._1();
http://git-wip-us.apache.org/repos/asf/flink/blob/d45b9412/flink-runtime/src/main/java/org/apache/flink/runtime/akka/AkkaJobManagerGateway.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/akka/AkkaJobManagerGateway.java b/flink-runtime/src/main/java/org/apache/flink/runtime/akka/AkkaJobManagerGateway.java
index 6896852..08946ed 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/akka/AkkaJobManagerGateway.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/akka/AkkaJobManagerGateway.java
@@ -21,11 +21,11 @@ package org.apache.flink.runtime.akka;
import org.apache.flink.api.common.JobID;
import org.apache.flink.api.common.time.Time;
import org.apache.flink.api.java.tuple.Tuple2;
+import org.apache.flink.runtime.clusterframework.types.ResourceID;
import org.apache.flink.runtime.concurrent.FutureUtils;
import org.apache.flink.runtime.executiongraph.AccessExecutionGraph;
import org.apache.flink.runtime.instance.ActorGateway;
import org.apache.flink.runtime.instance.Instance;
-import org.apache.flink.runtime.instance.InstanceID;
import org.apache.flink.runtime.jobgraph.JobGraph;
import org.apache.flink.runtime.jobmaster.JobManagerGateway;
import org.apache.flink.runtime.messages.Acknowledge;
@@ -177,10 +177,10 @@ public class AkkaJobManagerGateway implements JobManagerGateway {
//--------------------------------------------------------------------------------
@Override
- public CompletableFuture<Optional<Instance>> requestTaskManagerInstance(InstanceID instanceId, Time timeout) {
+ public CompletableFuture<Optional<Instance>> requestTaskManagerInstance(ResourceID resourceId, Time timeout) {
return FutureUtils.toJava(
jobManagerGateway
- .ask(new JobManagerMessages.RequestTaskManagerInstance(instanceId), FutureUtils.toFiniteDuration(timeout))
+ .ask(new JobManagerMessages.RequestTaskManagerInstance(resourceId), FutureUtils.toFiniteDuration(timeout))
.mapTo(ClassTag$.MODULE$.<JobManagerMessages.TaskManagerInstance>apply(JobManagerMessages.TaskManagerInstance.class)))
.thenApply(
(JobManagerMessages.TaskManagerInstance taskManagerResponse) -> {
@@ -265,7 +265,7 @@ public class AkkaJobManagerGateway implements JobManagerGateway {
}
@Override
- public CompletableFuture<Collection<Tuple2<InstanceID, String>>> requestTaskManagerMetricQueryServicePaths(Time timeout) {
+ public CompletableFuture<Collection<Tuple2<ResourceID, String>>> requestTaskManagerMetricQueryServicePaths(Time timeout) {
return requestTaskManagerInstances(timeout)
.thenApply(
(Collection<Instance> instances) ->
@@ -277,7 +277,7 @@ public class AkkaJobManagerGateway implements JobManagerGateway {
final String taskManagerMetricQuerServicePath = taskManagerAddress.substring(0, taskManagerAddress.lastIndexOf('/') + 1) +
MetricQueryService.METRIC_QUERY_SERVICE_NAME + '_' + instance.getTaskManagerID().getResourceIdString();
- return Tuple2.of(instance.getId(), taskManagerMetricQuerServicePath);
+ return Tuple2.of(instance.getTaskManagerID(), taskManagerMetricQuerServicePath);
})
.collect(Collectors.toList()));
}
http://git-wip-us.apache.org/repos/asf/flink/blob/d45b9412/flink-runtime/src/main/java/org/apache/flink/runtime/dispatcher/Dispatcher.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/dispatcher/Dispatcher.java b/flink-runtime/src/main/java/org/apache/flink/runtime/dispatcher/Dispatcher.java
index dda0275..c2f8539 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/dispatcher/Dispatcher.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/dispatcher/Dispatcher.java
@@ -31,7 +31,6 @@ import org.apache.flink.runtime.executiongraph.AccessExecutionGraph;
import org.apache.flink.runtime.heartbeat.HeartbeatServices;
import org.apache.flink.runtime.highavailability.HighAvailabilityServices;
import org.apache.flink.runtime.highavailability.RunningJobsRegistry;
-import org.apache.flink.runtime.instance.InstanceID;
import org.apache.flink.runtime.jobgraph.JobGraph;
import org.apache.flink.runtime.jobgraph.JobStatus;
import org.apache.flink.runtime.jobmanager.OnCompletionActions;
@@ -46,7 +45,7 @@ import org.apache.flink.runtime.messages.FlinkJobNotFoundException;
import org.apache.flink.runtime.messages.webmonitor.ClusterOverview;
import org.apache.flink.runtime.messages.webmonitor.JobDetails;
import org.apache.flink.runtime.messages.webmonitor.MultipleJobsDetails;
-import org.apache.flink.runtime.metrics.MetricRegistry;
+import org.apache.flink.runtime.metrics.MetricRegistryImpl;
import org.apache.flink.runtime.resourcemanager.ResourceManagerGateway;
import org.apache.flink.runtime.resourcemanager.ResourceOverview;
import org.apache.flink.runtime.rpc.FatalErrorHandler;
@@ -89,7 +88,7 @@ public abstract class Dispatcher extends FencedRpcEndpoint<DispatcherId> impleme
private final ResourceManagerGateway resourceManagerGateway;
private final JobManagerServices jobManagerServices;
private final HeartbeatServices heartbeatServices;
- private final MetricRegistry metricRegistry;
+ private final MetricRegistryImpl metricRegistry;
private final FatalErrorHandler fatalErrorHandler;
@@ -107,7 +106,7 @@ public abstract class Dispatcher extends FencedRpcEndpoint<DispatcherId> impleme
ResourceManagerGateway resourceManagerGateway,
BlobServer blobServer,
HeartbeatServices heartbeatServices,
- MetricRegistry metricRegistry,
+ MetricRegistryImpl metricRegistry,
FatalErrorHandler fatalErrorHandler,
Optional<String> restAddress) throws Exception {
super(rpcService, endpointId);
@@ -384,7 +383,7 @@ public abstract class Dispatcher extends FencedRpcEndpoint<DispatcherId> impleme
}
@Override
- public CompletableFuture<Collection<Tuple2<InstanceID, String>>> requestTaskManagerMetricQueryServicePaths(Time timeout) {
+ public CompletableFuture<Collection<Tuple2<ResourceID, String>>> requestTaskManagerMetricQueryServicePaths(Time timeout) {
return resourceManagerGateway.requestTaskManagerMetricQueryServicePaths(timeout);
}
@@ -480,7 +479,7 @@ public abstract class Dispatcher extends FencedRpcEndpoint<DispatcherId> impleme
HighAvailabilityServices highAvailabilityServices,
HeartbeatServices heartbeatServices,
JobManagerServices jobManagerServices,
- MetricRegistry metricRegistry,
+ MetricRegistryImpl metricRegistry,
OnCompletionActions onCompleteActions,
FatalErrorHandler fatalErrorHandler) throws Exception;
http://git-wip-us.apache.org/repos/asf/flink/blob/d45b9412/flink-runtime/src/main/java/org/apache/flink/runtime/dispatcher/StandaloneDispatcher.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/dispatcher/StandaloneDispatcher.java b/flink-runtime/src/main/java/org/apache/flink/runtime/dispatcher/StandaloneDispatcher.java
index 5a6889e..ee92663 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/dispatcher/StandaloneDispatcher.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/dispatcher/StandaloneDispatcher.java
@@ -28,7 +28,7 @@ import org.apache.flink.runtime.jobmanager.OnCompletionActions;
import org.apache.flink.runtime.jobmaster.JobManagerRunner;
import org.apache.flink.runtime.jobmaster.JobManagerServices;
import org.apache.flink.runtime.jobmaster.JobMaster;
-import org.apache.flink.runtime.metrics.MetricRegistry;
+import org.apache.flink.runtime.metrics.MetricRegistryImpl;
import org.apache.flink.runtime.resourcemanager.ResourceManagerGateway;
import org.apache.flink.runtime.rpc.FatalErrorHandler;
import org.apache.flink.runtime.rpc.RpcService;
@@ -49,7 +49,7 @@ public class StandaloneDispatcher extends Dispatcher {
ResourceManagerGateway resourceManagerGateway,
BlobServer blobServer,
HeartbeatServices heartbeatServices,
- MetricRegistry metricRegistry,
+ MetricRegistryImpl metricRegistry,
FatalErrorHandler fatalErrorHandler,
Optional<String> restAddress) throws Exception {
super(
@@ -74,7 +74,7 @@ public class StandaloneDispatcher extends Dispatcher {
HighAvailabilityServices highAvailabilityServices,
HeartbeatServices heartbeatServices,
JobManagerServices jobManagerServices,
- MetricRegistry metricRegistry,
+ MetricRegistryImpl metricRegistry,
OnCompletionActions onCompleteActions,
FatalErrorHandler fatalErrorHandler) throws Exception {
// create the standard job manager runner
http://git-wip-us.apache.org/repos/asf/flink/blob/d45b9412/flink-runtime/src/main/java/org/apache/flink/runtime/entrypoint/ClusterEntrypoint.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/entrypoint/ClusterEntrypoint.java b/flink-runtime/src/main/java/org/apache/flink/runtime/entrypoint/ClusterEntrypoint.java
index b2ddf1d..1a0e2ae 100755
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/entrypoint/ClusterEntrypoint.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/entrypoint/ClusterEntrypoint.java
@@ -30,8 +30,8 @@ import org.apache.flink.runtime.clusterframework.BootstrapTools;
import org.apache.flink.runtime.heartbeat.HeartbeatServices;
import org.apache.flink.runtime.highavailability.HighAvailabilityServices;
import org.apache.flink.runtime.highavailability.HighAvailabilityServicesUtils;
-import org.apache.flink.runtime.metrics.MetricRegistry;
import org.apache.flink.runtime.metrics.MetricRegistryConfiguration;
+import org.apache.flink.runtime.metrics.MetricRegistryImpl;
import org.apache.flink.runtime.rpc.FatalErrorHandler;
import org.apache.flink.runtime.rpc.RpcService;
import org.apache.flink.runtime.rpc.akka.AkkaRpcService;
@@ -76,7 +76,7 @@ public abstract class ClusterEntrypoint implements FatalErrorHandler {
private final CompletableFuture<Boolean> terminationFuture;
@GuardedBy("lock")
- private MetricRegistry metricRegistry = null;
+ private MetricRegistryImpl metricRegistry = null;
@GuardedBy("lock")
private HighAvailabilityServices haServices = null;
@@ -204,8 +204,8 @@ public abstract class ClusterEntrypoint implements FatalErrorHandler {
return HeartbeatServices.fromConfiguration(configuration);
}
- protected MetricRegistry createMetricRegistry(Configuration configuration) {
- return new MetricRegistry(MetricRegistryConfiguration.fromConfiguration(configuration));
+ protected MetricRegistryImpl createMetricRegistry(Configuration configuration) {
+ return new MetricRegistryImpl(MetricRegistryConfiguration.fromConfiguration(configuration));
}
protected void shutDown(boolean cleanupHaData) throws FlinkException {
@@ -278,7 +278,7 @@ public abstract class ClusterEntrypoint implements FatalErrorHandler {
HighAvailabilityServices highAvailabilityServices,
BlobServer blobServer,
HeartbeatServices heartbeatServices,
- MetricRegistry metricRegistry) throws Exception;
+ MetricRegistryImpl metricRegistry) throws Exception;
protected void stopClusterComponents(boolean cleanupHaData) throws Exception {
}
http://git-wip-us.apache.org/repos/asf/flink/blob/d45b9412/flink-runtime/src/main/java/org/apache/flink/runtime/entrypoint/JobClusterEntrypoint.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/entrypoint/JobClusterEntrypoint.java b/flink-runtime/src/main/java/org/apache/flink/runtime/entrypoint/JobClusterEntrypoint.java
index 124c6c6..50d29da 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/entrypoint/JobClusterEntrypoint.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/entrypoint/JobClusterEntrypoint.java
@@ -29,7 +29,7 @@ import org.apache.flink.runtime.jobgraph.JobGraph;
import org.apache.flink.runtime.jobmanager.OnCompletionActions;
import org.apache.flink.runtime.jobmaster.JobManagerRunner;
import org.apache.flink.runtime.jobmaster.JobManagerServices;
-import org.apache.flink.runtime.metrics.MetricRegistry;
+import org.apache.flink.runtime.metrics.MetricRegistryImpl;
import org.apache.flink.runtime.resourcemanager.ResourceManager;
import org.apache.flink.runtime.rpc.FatalErrorHandler;
import org.apache.flink.runtime.rpc.RpcService;
@@ -59,7 +59,7 @@ public abstract class JobClusterEntrypoint extends ClusterEntrypoint {
HighAvailabilityServices highAvailabilityServices,
BlobServer blobServer,
HeartbeatServices heartbeatServices,
- MetricRegistry metricRegistry) throws Exception {
+ MetricRegistryImpl metricRegistry) throws Exception {
resourceManager = createResourceManager(
configuration,
@@ -96,7 +96,7 @@ public abstract class JobClusterEntrypoint extends ClusterEntrypoint {
HighAvailabilityServices highAvailabilityServices,
JobManagerServices jobManagerServices,
HeartbeatServices heartbeatServices,
- MetricRegistry metricRegistry,
+ MetricRegistryImpl metricRegistry,
FatalErrorHandler fatalErrorHandler) throws Exception {
JobGraph jobGraph = retrieveJobGraph(configuration);
@@ -163,7 +163,7 @@ public abstract class JobClusterEntrypoint extends ClusterEntrypoint {
RpcService rpcService,
HighAvailabilityServices highAvailabilityServices,
HeartbeatServices heartbeatServices,
- MetricRegistry metricRegistry,
+ MetricRegistryImpl metricRegistry,
FatalErrorHandler fatalErrorHandler) throws Exception;
protected abstract JobGraph retrieveJobGraph(Configuration configuration) throws FlinkException;
http://git-wip-us.apache.org/repos/asf/flink/blob/d45b9412/flink-runtime/src/main/java/org/apache/flink/runtime/entrypoint/SessionClusterEntrypoint.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/entrypoint/SessionClusterEntrypoint.java b/flink-runtime/src/main/java/org/apache/flink/runtime/entrypoint/SessionClusterEntrypoint.java
index e24e01a..8a48864 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/entrypoint/SessionClusterEntrypoint.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/entrypoint/SessionClusterEntrypoint.java
@@ -30,7 +30,7 @@ import org.apache.flink.runtime.dispatcher.StandaloneDispatcher;
import org.apache.flink.runtime.heartbeat.HeartbeatServices;
import org.apache.flink.runtime.highavailability.HighAvailabilityServices;
import org.apache.flink.runtime.leaderretrieval.LeaderRetrievalService;
-import org.apache.flink.runtime.metrics.MetricRegistry;
+import org.apache.flink.runtime.metrics.MetricRegistryImpl;
import org.apache.flink.runtime.resourcemanager.ResourceManager;
import org.apache.flink.runtime.resourcemanager.ResourceManagerGateway;
import org.apache.flink.runtime.rest.RestServerEndpointConfiguration;
@@ -69,7 +69,7 @@ public abstract class SessionClusterEntrypoint extends ClusterEntrypoint {
HighAvailabilityServices highAvailabilityServices,
BlobServer blobServer,
HeartbeatServices heartbeatServices,
- MetricRegistry metricRegistry) throws Exception {
+ MetricRegistryImpl metricRegistry) throws Exception {
dispatcherLeaderRetrievalService = highAvailabilityServices.getDispatcherLeaderRetriever();
@@ -173,7 +173,7 @@ public abstract class SessionClusterEntrypoint extends ClusterEntrypoint {
ResourceManagerGateway resourceManagerGateway,
BlobServer blobServer,
HeartbeatServices heartbeatServices,
- MetricRegistry metricRegistry,
+ MetricRegistryImpl metricRegistry,
FatalErrorHandler fatalErrorHandler,
Optional<String> restAddress) throws Exception {
@@ -197,6 +197,6 @@ public abstract class SessionClusterEntrypoint extends ClusterEntrypoint {
RpcService rpcService,
HighAvailabilityServices highAvailabilityServices,
HeartbeatServices heartbeatServices,
- MetricRegistry metricRegistry,
+ MetricRegistryImpl metricRegistry,
FatalErrorHandler fatalErrorHandler) throws Exception;
}
http://git-wip-us.apache.org/repos/asf/flink/blob/d45b9412/flink-runtime/src/main/java/org/apache/flink/runtime/entrypoint/StandaloneSessionClusterEntrypoint.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/entrypoint/StandaloneSessionClusterEntrypoint.java b/flink-runtime/src/main/java/org/apache/flink/runtime/entrypoint/StandaloneSessionClusterEntrypoint.java
index e7c9816..7d4373d 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/entrypoint/StandaloneSessionClusterEntrypoint.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/entrypoint/StandaloneSessionClusterEntrypoint.java
@@ -23,7 +23,7 @@ import org.apache.flink.runtime.clusterframework.FlinkResourceManager;
import org.apache.flink.runtime.clusterframework.types.ResourceID;
import org.apache.flink.runtime.heartbeat.HeartbeatServices;
import org.apache.flink.runtime.highavailability.HighAvailabilityServices;
-import org.apache.flink.runtime.metrics.MetricRegistry;
+import org.apache.flink.runtime.metrics.MetricRegistryImpl;
import org.apache.flink.runtime.resourcemanager.ResourceManager;
import org.apache.flink.runtime.resourcemanager.ResourceManagerConfiguration;
import org.apache.flink.runtime.resourcemanager.ResourceManagerRuntimeServices;
@@ -51,7 +51,7 @@ public class StandaloneSessionClusterEntrypoint extends SessionClusterEntrypoint
RpcService rpcService,
HighAvailabilityServices highAvailabilityServices,
HeartbeatServices heartbeatServices,
- MetricRegistry metricRegistry,
+ MetricRegistryImpl metricRegistry,
FatalErrorHandler fatalErrorHandler) throws Exception {
final ResourceManagerConfiguration resourceManagerConfiguration = ResourceManagerConfiguration.fromConfiguration(configuration);
final ResourceManagerRuntimeServicesConfiguration resourceManagerRuntimeServicesConfiguration = ResourceManagerRuntimeServicesConfiguration.fromConfiguration(configuration);
http://git-wip-us.apache.org/repos/asf/flink/blob/d45b9412/flink-runtime/src/main/java/org/apache/flink/runtime/jobmaster/JobManagerGateway.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/jobmaster/JobManagerGateway.java b/flink-runtime/src/main/java/org/apache/flink/runtime/jobmaster/JobManagerGateway.java
index 782d6d0..2527e46 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/jobmaster/JobManagerGateway.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/jobmaster/JobManagerGateway.java
@@ -21,8 +21,8 @@ package org.apache.flink.runtime.jobmaster;
import org.apache.flink.api.common.JobID;
import org.apache.flink.api.common.time.Time;
import org.apache.flink.runtime.akka.ListeningBehaviour;
+import org.apache.flink.runtime.clusterframework.types.ResourceID;
import org.apache.flink.runtime.instance.Instance;
-import org.apache.flink.runtime.instance.InstanceID;
import org.apache.flink.runtime.jobgraph.JobGraph;
import org.apache.flink.runtime.messages.Acknowledge;
import org.apache.flink.runtime.messages.JobManagerMessages;
@@ -107,11 +107,11 @@ public interface JobManagerGateway extends RestfulGateway {
* Requests the TaskManager instance registered under the given instanceId from the JobManager.
* If there is no Instance registered, then {@link Optional#empty()} is returned.
*
- * @param instanceId for which to retrieve the Instance
+ * @param resourceId identifying the TaskManager which shall be retrieved
* @param timeout for the asynchronous operation
* @return Future containing the TaskManager instance registered under instanceId, otherwise {@link Optional#empty()}
*/
- CompletableFuture<Optional<Instance>> requestTaskManagerInstance(InstanceID instanceId, Time timeout);
+ CompletableFuture<Optional<Instance>> requestTaskManagerInstance(ResourceID resourceId, Time timeout);
/**
* Requests all currently registered TaskManager instances from the JobManager.
http://git-wip-us.apache.org/repos/asf/flink/blob/d45b9412/flink-runtime/src/main/java/org/apache/flink/runtime/jobmaster/JobManagerRunner.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/jobmaster/JobManagerRunner.java b/flink-runtime/src/main/java/org/apache/flink/runtime/jobmaster/JobManagerRunner.java
index 14baa6f..0a85bbe 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/jobmaster/JobManagerRunner.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/jobmaster/JobManagerRunner.java
@@ -34,7 +34,7 @@ import org.apache.flink.runtime.jobmanager.OnCompletionActions;
import org.apache.flink.runtime.leaderelection.LeaderContender;
import org.apache.flink.runtime.leaderelection.LeaderElectionService;
import org.apache.flink.runtime.messages.Acknowledge;
-import org.apache.flink.runtime.metrics.MetricRegistry;
+import org.apache.flink.runtime.metrics.MetricRegistryImpl;
import org.apache.flink.runtime.metrics.groups.JobManagerMetricGroup;
import org.apache.flink.runtime.rpc.FatalErrorHandler;
import org.apache.flink.runtime.rpc.RpcService;
@@ -111,7 +111,7 @@ public class JobManagerRunner implements LeaderContender, OnCompletionActions, F
final HighAvailabilityServices haServices,
final HeartbeatServices heartbeatServices,
final JobManagerServices jobManagerServices,
- final MetricRegistry metricRegistry,
+ final MetricRegistryImpl metricRegistry,
final OnCompletionActions toNotifyOnComplete,
final FatalErrorHandler errorHandler) throws Exception {
http://git-wip-us.apache.org/repos/asf/flink/blob/d45b9412/flink-runtime/src/main/java/org/apache/flink/runtime/metrics/MetricRegistry.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/metrics/MetricRegistry.java b/flink-runtime/src/main/java/org/apache/flink/runtime/metrics/MetricRegistry.java
index 278292d..9aa97cb 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/metrics/MetricRegistry.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/metrics/MetricRegistry.java
@@ -18,283 +18,34 @@
package org.apache.flink.runtime.metrics;
-import org.apache.flink.annotation.VisibleForTesting;
-import org.apache.flink.api.java.tuple.Tuple2;
-import org.apache.flink.configuration.ConfigConstants;
-import org.apache.flink.configuration.Configuration;
import org.apache.flink.metrics.Metric;
-import org.apache.flink.metrics.MetricConfig;
-import org.apache.flink.metrics.MetricGroup;
-import org.apache.flink.metrics.View;
-import org.apache.flink.metrics.reporter.MetricReporter;
-import org.apache.flink.metrics.reporter.Scheduled;
-import org.apache.flink.runtime.akka.AkkaUtils;
-import org.apache.flink.runtime.clusterframework.types.ResourceID;
-import org.apache.flink.runtime.metrics.dump.MetricQueryService;
import org.apache.flink.runtime.metrics.groups.AbstractMetricGroup;
-import org.apache.flink.runtime.metrics.groups.FrontMetricGroup;
import org.apache.flink.runtime.metrics.scope.ScopeFormats;
-import org.apache.flink.runtime.util.ExecutorThreadFactory;
-import org.apache.flink.util.Preconditions;
-
-import akka.actor.ActorRef;
-import akka.actor.ActorSystem;
-import akka.actor.Kill;
-import akka.pattern.Patterns;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.annotation.Nullable;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.TimerTask;
-import java.util.concurrent.Executors;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.TimeUnit;
-
-import scala.concurrent.Await;
-import scala.concurrent.Future;
-import scala.concurrent.duration.FiniteDuration;
/**
- * A MetricRegistry keeps track of all registered {@link Metric Metrics}. It serves as the
- * connection between {@link MetricGroup MetricGroups} and {@link MetricReporter MetricReporters}.
+ * Interface for a metric registry.
*/
-public class MetricRegistry {
- static final Logger LOG = LoggerFactory.getLogger(MetricRegistry.class);
-
- private final Object lock = new Object();
-
- private List<MetricReporter> reporters;
- private ScheduledExecutorService executor;
-
- @Nullable
- private ActorRef queryService;
-
- @Nullable
- private String metricQueryServicePath;
-
- private ViewUpdater viewUpdater;
-
- private final ScopeFormats scopeFormats;
- private final char globalDelimiter;
- private final List<Character> delimiters = new ArrayList<>();
-
- /**
- * Creates a new MetricRegistry and starts the configured reporter.
- */
- public MetricRegistry(MetricRegistryConfiguration config) {
- this.scopeFormats = config.getScopeFormats();
- this.globalDelimiter = config.getDelimiter();
-
- // second, instantiate any custom configured reporters
- this.reporters = new ArrayList<>();
-
- List<Tuple2<String, Configuration>> reporterConfigurations = config.getReporterConfigurations();
-
- this.executor = Executors.newSingleThreadScheduledExecutor(new ExecutorThreadFactory("Flink-MetricRegistry"));
-
- this.queryService = null;
- this.metricQueryServicePath = null;
-
- if (reporterConfigurations.isEmpty()) {
- // no reporters defined
- // by default, don't report anything
- LOG.info("No metrics reporter configured, no metrics will be exposed/reported.");
- } else {
- // we have some reporters so
- for (Tuple2<String, Configuration> reporterConfiguration: reporterConfigurations) {
- String namedReporter = reporterConfiguration.f0;
- Configuration reporterConfig = reporterConfiguration.f1;
-
- final String className = reporterConfig.getString(ConfigConstants.METRICS_REPORTER_CLASS_SUFFIX, null);
- if (className == null) {
- LOG.error("No reporter class set for reporter " + namedReporter + ". Metrics might not be exposed/reported.");
- continue;
- }
-
- try {
- String configuredPeriod = reporterConfig.getString(ConfigConstants.METRICS_REPORTER_INTERVAL_SUFFIX, null);
- TimeUnit timeunit = TimeUnit.SECONDS;
- long period = 10;
-
- if (configuredPeriod != null) {
- try {
- String[] interval = configuredPeriod.split(" ");
- period = Long.parseLong(interval[0]);
- timeunit = TimeUnit.valueOf(interval[1]);
- }
- catch (Exception e) {
- LOG.error("Cannot parse report interval from config: " + configuredPeriod +
- " - please use values like '10 SECONDS' or '500 MILLISECONDS'. " +
- "Using default reporting interval.");
- }
- }
-
- Class<?> reporterClass = Class.forName(className);
- MetricReporter reporterInstance = (MetricReporter) reporterClass.newInstance();
-
- MetricConfig metricConfig = new MetricConfig();
- reporterConfig.addAllToProperties(metricConfig);
- LOG.info("Configuring {} with {}.", reporterClass.getSimpleName(), metricConfig);
- reporterInstance.open(metricConfig);
-
- if (reporterInstance instanceof Scheduled) {
- LOG.info("Periodically reporting metrics in intervals of {} {} for reporter {} of type {}.", period, timeunit.name(), namedReporter, className);
-
- executor.scheduleWithFixedDelay(
- new MetricRegistry.ReporterTask((Scheduled) reporterInstance), period, period, timeunit);
- } else {
- LOG.info("Reporting metrics for reporter {} of type {}.", namedReporter, className);
- }
- reporters.add(reporterInstance);
-
- String delimiterForReporter = reporterConfig.getString(ConfigConstants.METRICS_REPORTER_SCOPE_DELIMITER, String.valueOf(globalDelimiter));
- if (delimiterForReporter.length() != 1) {
- LOG.warn("Failed to parse delimiter '{}' for reporter '{}', using global delimiter '{}'.", delimiterForReporter, namedReporter, globalDelimiter);
- delimiterForReporter = String.valueOf(globalDelimiter);
- }
- this.delimiters.add(delimiterForReporter.charAt(0));
- }
- catch (Throwable t) {
- LOG.error("Could not instantiate metrics reporter {}. Metrics might not be exposed/reported.", namedReporter, t);
- }
- }
- }
- }
-
- /**
- * Initializes the MetricQueryService.
- *
- * @param actorSystem ActorSystem to create the MetricQueryService on
- * @param resourceID resource ID used to disambiguate the actor name
- */
- public void startQueryService(ActorSystem actorSystem, ResourceID resourceID) {
- synchronized (lock) {
- Preconditions.checkState(!isShutdown(), "The metric registry has already been shut down.");
-
- try {
- queryService = MetricQueryService.startMetricQueryService(actorSystem, resourceID);
- metricQueryServicePath = AkkaUtils.getAkkaURL(actorSystem, queryService);
- } catch (Exception e) {
- LOG.warn("Could not start MetricDumpActor. No metrics will be submitted to the WebInterface.", e);
- }
- }
- }
-
- /**
- * Returns the address under which the {@link MetricQueryService} is reachable.
- *
- * @return address of the metric query service
- */
- @Nullable
- public String getMetricQueryServicePath() {
- return metricQueryServicePath;
- }
+public interface MetricRegistry {
/**
* Returns the global delimiter.
*
* @return global delimiter
*/
- public char getDelimiter() {
- return this.globalDelimiter;
- }
+ char getDelimiter();
/**
* Returns the configured delimiter for the reporter with the given index.
*
- * @param reporterIndex index of the reporter whose delimiter should be used
+ * @param index index of the reporter whose delimiter should be used
* @return configured reporter delimiter, or global delimiter if index is invalid
*/
- public char getDelimiter(int reporterIndex) {
- try {
- return delimiters.get(reporterIndex);
- } catch (IndexOutOfBoundsException e) {
- LOG.warn("Delimiter for reporter index {} not found, returning global delimiter.", reporterIndex);
- return this.globalDelimiter;
- }
- }
-
- public List<MetricReporter> getReporters() {
- return reporters;
- }
-
- /**
- * Returns whether this registry has been shutdown.
- *
- * @return true, if this registry was shutdown, otherwise false
- */
- public boolean isShutdown() {
- synchronized (lock) {
- return reporters == null && executor.isShutdown();
- }
- }
+ char getDelimiter(int index);
/**
- * Shuts down this registry and the associated {@link MetricReporter}.
+ * Returns the number of registered reporters.
*/
- public void shutdown() {
- synchronized (lock) {
- Future<Boolean> stopFuture = null;
- FiniteDuration stopTimeout = null;
-
- if (queryService != null) {
- stopTimeout = new FiniteDuration(1L, TimeUnit.SECONDS);
- stopFuture = Patterns.gracefulStop(queryService, stopTimeout);
- }
-
- if (reporters != null) {
- for (MetricReporter reporter : reporters) {
- try {
- reporter.close();
- } catch (Throwable t) {
- LOG.warn("Metrics reporter did not shut down cleanly", t);
- }
- }
- reporters = null;
- }
- shutdownExecutor();
-
- if (stopFuture != null) {
- boolean stopped = false;
-
- try {
- stopped = Await.result(stopFuture, stopTimeout);
- } catch (Exception e) {
- LOG.warn("Query actor did not properly stop.", e);
- }
-
- if (!stopped) {
- // the query actor did not stop in time, let's kill him
- queryService.tell(Kill.getInstance(), ActorRef.noSender());
- }
- }
- }
- }
-
- private void shutdownExecutor() {
- if (executor != null) {
- executor.shutdown();
-
- try {
- if (!executor.awaitTermination(1L, TimeUnit.SECONDS)) {
- executor.shutdownNow();
- }
- } catch (InterruptedException e) {
- executor.shutdownNow();
- }
- }
- }
-
- public ScopeFormats getScopeFormats() {
- return scopeFormats;
- }
-
- // ------------------------------------------------------------------------
- // Metrics (de)registration
- // ------------------------------------------------------------------------
+ int getNumberReporters();
/**
* Registers a new {@link Metric} with this registry.
@@ -303,44 +54,7 @@ public class MetricRegistry {
* @param metricName the name of the metric
* @param group the group that contains the metric
*/
- public void register(Metric metric, String metricName, AbstractMetricGroup group) {
- synchronized (lock) {
- if (isShutdown()) {
- LOG.warn("Cannot register metric, because the MetricRegistry has already been shut down.");
- } else {
- if (reporters != null) {
- for (int i = 0; i < reporters.size(); i++) {
- MetricReporter reporter = reporters.get(i);
- try {
- if (reporter != null) {
- FrontMetricGroup front = new FrontMetricGroup<AbstractMetricGroup<?>>(i, group);
- reporter.notifyOfAddedMetric(metric, metricName, front);
- }
- } catch (Exception e) {
- LOG.warn("Error while registering metric.", e);
- }
- }
- }
- try {
- if (queryService != null) {
- MetricQueryService.notifyOfAddedMetric(queryService, metric, metricName, group);
- }
- } catch (Exception e) {
- LOG.warn("Error while registering metric.", e);
- }
- try {
- if (metric instanceof View) {
- if (viewUpdater == null) {
- viewUpdater = new ViewUpdater(executor);
- }
- viewUpdater.notifyOfAddedView((View) metric);
- }
- } catch (Exception e) {
- LOG.warn("Error while registering metric.", e);
- }
- }
- }
- }
+ void register(Metric metric, String metricName, AbstractMetricGroup group);
/**
* Un-registers the given {@link Metric} with this registry.
@@ -349,79 +63,7 @@ public class MetricRegistry {
* @param metricName the name of the metric
* @param group the group that contains the metric
*/
- public void unregister(Metric metric, String metricName, AbstractMetricGroup group) {
- synchronized (lock) {
- if (isShutdown()) {
- LOG.warn("Cannot unregister metric, because the MetricRegistry has already been shut down.");
- } else {
- if (reporters != null) {
- for (int i = 0; i < reporters.size(); i++) {
- try {
- MetricReporter reporter = reporters.get(i);
- if (reporter != null) {
- FrontMetricGroup front = new FrontMetricGroup<AbstractMetricGroup<?>>(i, group);
- reporter.notifyOfRemovedMetric(metric, metricName, front);
- }
- } catch (Exception e) {
- LOG.warn("Error while registering metric.", e);
- }
- }
- }
- try {
- if (queryService != null) {
- MetricQueryService.notifyOfRemovedMetric(queryService, metric);
- }
- } catch (Exception e) {
- LOG.warn("Error while registering metric.", e);
- }
- try {
- if (metric instanceof View) {
- if (viewUpdater != null) {
- viewUpdater.notifyOfRemovedView((View) metric);
- }
- }
- } catch (Exception e) {
- LOG.warn("Error while registering metric.", e);
- }
- }
- }
- }
-
- // ------------------------------------------------------------------------
-
- @VisibleForTesting
- @Nullable
- public ActorRef getQueryService() {
- return queryService;
- }
-
- // ------------------------------------------------------------------------
-
- /**
- * This task is explicitly a static class, so that it does not hold any references to the enclosing
- * MetricsRegistry instance.
- *
- * <p>This is a subtle difference, but very important: With this static class, the enclosing class instance
- * may become garbage-collectible, whereas with an anonymous inner class, the timer thread
- * (which is a GC root) will hold a reference via the timer task and its enclosing instance pointer.
- * Making the MetricsRegistry garbage collectible makes the java.util.Timer garbage collectible,
- * which acts as a fail-safe to stop the timer thread and prevents resource leaks.
- */
- private static final class ReporterTask extends TimerTask {
-
- private final Scheduled reporter;
-
- private ReporterTask(Scheduled reporter) {
- this.reporter = reporter;
- }
+ void unregister(Metric metric, String metricName, AbstractMetricGroup group);
- @Override
- public void run() {
- try {
- reporter.report();
- } catch (Throwable t) {
- LOG.warn("Error while reporting metrics", t);
- }
- }
- }
+ ScopeFormats getScopeFormats();
}
http://git-wip-us.apache.org/repos/asf/flink/blob/d45b9412/flink-runtime/src/main/java/org/apache/flink/runtime/metrics/MetricRegistryConfiguration.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/metrics/MetricRegistryConfiguration.java b/flink-runtime/src/main/java/org/apache/flink/runtime/metrics/MetricRegistryConfiguration.java
index e72a980..d07cb65 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/metrics/MetricRegistryConfiguration.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/metrics/MetricRegistryConfiguration.java
@@ -35,7 +35,7 @@ import java.util.List;
import java.util.regex.Pattern;
/**
- * Configuration object for {@link MetricRegistry}.
+ * Configuration object for {@link MetricRegistryImpl}.
*/
public class MetricRegistryConfiguration {
[7/7] flink git commit: [FLINK-7876] Merge
TaskExecutorMetricsInitializer and MetricUtils
Posted by tr...@apache.org.
[FLINK-7876] Merge TaskExecutorMetricsInitializer and MetricUtils
This commit removes the TaskExecutorMetricsInitializer and moves its methods
to MetricUtils.
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/7fb7e0b9
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/7fb7e0b9
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/7fb7e0b9
Branch: refs/heads/master
Commit: 7fb7e0b9775d1773d20e63732130ae140781a6f2
Parents: ad42ee2
Author: Till Rohrmann <tr...@apache.org>
Authored: Wed Nov 1 12:31:52 2017 +0100
Committer: Till Rohrmann <tr...@apache.org>
Committed: Wed Nov 1 15:52:01 2017 +0100
----------------------------------------------------------------------
.../runtime/jobmaster/JobManagerRunner.java | 3 +-
.../flink/runtime/metrics/util/MetricUtils.java | 230 +++++++++--------
.../utils/TaskExecutorMetricsInitializer.java | 257 -------------------
.../flink/runtime/jobmanager/JobManager.scala | 3 +-
4 files changed, 128 insertions(+), 365 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/7fb7e0b9/flink-runtime/src/main/java/org/apache/flink/runtime/jobmaster/JobManagerRunner.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/jobmaster/JobManagerRunner.java b/flink-runtime/src/main/java/org/apache/flink/runtime/jobmaster/JobManagerRunner.java
index 14baa6f..f95b5a0 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/jobmaster/JobManagerRunner.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/jobmaster/JobManagerRunner.java
@@ -36,6 +36,7 @@ import org.apache.flink.runtime.leaderelection.LeaderElectionService;
import org.apache.flink.runtime.messages.Acknowledge;
import org.apache.flink.runtime.metrics.MetricRegistry;
import org.apache.flink.runtime.metrics.groups.JobManagerMetricGroup;
+import org.apache.flink.runtime.metrics.util.MetricUtils;
import org.apache.flink.runtime.rpc.FatalErrorHandler;
import org.apache.flink.runtime.rpc.RpcService;
import org.apache.flink.util.ExceptionUtils;
@@ -127,7 +128,7 @@ public class JobManagerRunner implements LeaderContender, OnCompletionActions, F
checkArgument(jobGraph.getNumberOfVertices() > 0, "The given job is empty");
final String hostAddress = rpcService.getAddress().isEmpty() ? "localhost" : rpcService.getAddress();
- jobManagerMetrics = new JobManagerMetricGroup(metricRegistry, hostAddress);
+ jobManagerMetrics = MetricUtils.instantiateJobManagerMetricGroup(metricRegistry, hostAddress);
this.jobManagerMetricGroup = jobManagerMetrics;
// libraries and class loader first
http://git-wip-us.apache.org/repos/asf/flink/blob/7fb7e0b9/flink-runtime/src/main/java/org/apache/flink/runtime/metrics/util/MetricUtils.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/metrics/util/MetricUtils.java b/flink-runtime/src/main/java/org/apache/flink/runtime/metrics/util/MetricUtils.java
index 08353e3..2a59a7f 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/metrics/util/MetricUtils.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/metrics/util/MetricUtils.java
@@ -22,23 +22,27 @@ import org.apache.flink.metrics.Gauge;
import org.apache.flink.metrics.MetricGroup;
import org.apache.flink.runtime.io.network.NetworkEnvironment;
import org.apache.flink.runtime.metrics.MetricRegistry;
+import org.apache.flink.runtime.metrics.groups.JobManagerMetricGroup;
import org.apache.flink.runtime.metrics.groups.TaskManagerMetricGroup;
-import org.apache.flink.runtime.taskexecutor.utils.TaskExecutorMetricsInitializer;
import org.apache.flink.runtime.taskmanager.TaskManagerLocation;
+import org.apache.flink.util.Preconditions;
-import org.apache.commons.lang3.text.WordUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.lang.management.BufferPoolMXBean;
+import javax.management.AttributeNotFoundException;
+import javax.management.InstanceNotFoundException;
+import javax.management.MBeanException;
+import javax.management.MBeanServer;
+import javax.management.MalformedObjectNameException;
+import javax.management.ObjectName;
+import javax.management.ReflectionException;
+
import java.lang.management.ClassLoadingMXBean;
import java.lang.management.GarbageCollectorMXBean;
import java.lang.management.ManagementFactory;
import java.lang.management.MemoryMXBean;
-import java.lang.management.OperatingSystemMXBean;
import java.lang.management.ThreadMXBean;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
import java.util.List;
/**
@@ -51,6 +55,21 @@ public class MetricUtils {
private MetricUtils() {
}
+ public static JobManagerMetricGroup instantiateJobManagerMetricGroup(
+ final MetricRegistry metricRegistry,
+ final String hostname) {
+ final JobManagerMetricGroup jobManagerMetricGroup = new JobManagerMetricGroup(
+ metricRegistry,
+ hostname);
+
+ MetricGroup statusGroup = jobManagerMetricGroup.addGroup(METRIC_GROUP_STATUS_NAME);
+
+ // initialize the JM metrics
+ instantiateStatusMetrics(statusGroup);
+
+ return jobManagerMetricGroup;
+ }
+
public static TaskManagerMetricGroup instantiateTaskManagerMetricGroup(
MetricRegistry metricRegistry,
TaskManagerLocation taskManagerLocation,
@@ -60,59 +79,55 @@ public class MetricUtils {
taskManagerLocation.getHostname(),
taskManagerLocation.getResourceID().toString());
+ MetricGroup statusGroup = taskManagerMetricGroup.addGroup(METRIC_GROUP_STATUS_NAME);
+
// Initialize the TM metrics
- TaskExecutorMetricsInitializer.instantiateStatusMetrics(taskManagerMetricGroup, network);
+ instantiateStatusMetrics(statusGroup);
+ instantiateNetworkMetrics(statusGroup, network);
return taskManagerMetricGroup;
}
- public static void instantiateNetworkMetrics(
- MetricGroup metrics,
- final NetworkEnvironment network) {
- MetricGroup status = metrics.addGroup(METRIC_GROUP_STATUS_NAME);
+ public static void instantiateStatusMetrics(
+ MetricGroup metricGroup) {
+ MetricGroup jvm = metricGroup.addGroup("JVM");
- MetricGroup networkGroup = status
- .addGroup("Network");
+ instantiateClassLoaderMetrics(jvm.addGroup("ClassLoader"));
+ instantiateGarbageCollectorMetrics(jvm.addGroup("GarbageCollector"));
+ instantiateMemoryMetrics(jvm.addGroup("Memory"));
+ instantiateThreadMetrics(jvm.addGroup("Threads"));
+ instantiateCPUMetrics(jvm.addGroup("CPU"));
+ }
- networkGroup.gauge("TotalMemorySegments", new Gauge<Integer>() {
+ private static void instantiateNetworkMetrics(
+ MetricGroup metrics,
+ final NetworkEnvironment network) {
+ metrics.<Long, Gauge<Long>>gauge("TotalMemorySegments", new Gauge<Long> () {
@Override
- public Integer getValue() {
- return network.getNetworkBufferPool().getTotalNumberOfMemorySegments();
+ public Long getValue() {
+ return (long) network.getNetworkBufferPool().getTotalNumberOfMemorySegments();
}
});
- networkGroup.gauge("AvailableMemorySegments", new Gauge<Integer>() {
+
+ metrics.<Long, Gauge<Long>>gauge("AvailableMemorySegments", new Gauge<Long> () {
@Override
- public Integer getValue() {
- return network.getNetworkBufferPool().getNumberOfAvailableMemorySegments();
+ public Long getValue() {
+ return (long) network.getNetworkBufferPool().getNumberOfAvailableMemorySegments();
}
});
}
- public static void instantiateStatusMetrics(
- MetricGroup metrics) {
- MetricGroup status = metrics
- .addGroup(METRIC_GROUP_STATUS_NAME);
-
- MetricGroup jvm = status
- .addGroup("JVM");
-
- instantiateClassLoaderMetrics(jvm.addGroup("ClassLoader"));
- instantiateGarbageCollectorMetrics(jvm.addGroup("GarbageCollector"));
- instantiateMemoryMetrics(jvm.addGroup("Memory"));
- instantiateThreadMetrics(jvm.addGroup("Threads"));
- instantiateCPUMetrics(jvm.addGroup("CPU"));
- }
-
private static void instantiateClassLoaderMetrics(MetricGroup metrics) {
final ClassLoadingMXBean mxBean = ManagementFactory.getClassLoadingMXBean();
- metrics.gauge("ClassesLoaded", new Gauge<Long>() {
+ metrics.<Long, Gauge<Long>>gauge("ClassesLoaded", new Gauge<Long> () {
@Override
public Long getValue() {
return mxBean.getTotalLoadedClassCount();
}
});
- metrics.gauge("ClassesUnloaded", new Gauge<Long>() {
+
+ metrics.<Long, Gauge<Long>>gauge("ClassesUnloaded", new Gauge<Long> () {
@Override
public Long getValue() {
return mxBean.getUnloadedClassCount();
@@ -123,15 +138,17 @@ public class MetricUtils {
private static void instantiateGarbageCollectorMetrics(MetricGroup metrics) {
List<GarbageCollectorMXBean> garbageCollectors = ManagementFactory.getGarbageCollectorMXBeans();
- for (final GarbageCollectorMXBean garbageCollector : garbageCollectors) {
+ for (final GarbageCollectorMXBean garbageCollector: garbageCollectors) {
MetricGroup gcGroup = metrics.addGroup(garbageCollector.getName());
- gcGroup.gauge("Count", new Gauge<Long>() {
+
+ gcGroup.<Long, Gauge<Long>>gauge("Count", new Gauge<Long> () {
@Override
public Long getValue() {
return garbageCollector.getCollectionCount();
}
});
- gcGroup.gauge("Time", new Gauge<Long>() {
+
+ gcGroup.<Long, Gauge<Long>>gauge("Time", new Gauge<Long> () {
@Override
public Long getValue() {
return garbageCollector.getCollectionTime();
@@ -142,20 +159,22 @@ public class MetricUtils {
private static void instantiateMemoryMetrics(MetricGroup metrics) {
final MemoryMXBean mxBean = ManagementFactory.getMemoryMXBean();
+
MetricGroup heap = metrics.addGroup("Heap");
- heap.gauge("Used", new Gauge<Long>() {
+
+ heap.<Long, Gauge<Long>>gauge("Used", new Gauge<Long> () {
@Override
public Long getValue() {
return mxBean.getHeapMemoryUsage().getUsed();
}
});
- heap.gauge("Committed", new Gauge<Long>() {
+ heap.<Long, Gauge<Long>>gauge("Committed", new Gauge<Long> () {
@Override
public Long getValue() {
return mxBean.getHeapMemoryUsage().getCommitted();
}
});
- heap.gauge("Max", new Gauge<Long>() {
+ heap.<Long, Gauge<Long>>gauge("Max", new Gauge<Long> () {
@Override
public Long getValue() {
return mxBean.getHeapMemoryUsage().getMax();
@@ -163,54 +182,61 @@ public class MetricUtils {
});
MetricGroup nonHeap = metrics.addGroup("NonHeap");
- nonHeap.gauge("Used", new Gauge<Long>() {
+
+ nonHeap.<Long, Gauge<Long>>gauge("Used", new Gauge<Long> () {
@Override
public Long getValue() {
return mxBean.getNonHeapMemoryUsage().getUsed();
}
});
- nonHeap.gauge("Committed", new Gauge<Long>() {
+ nonHeap.<Long, Gauge<Long>>gauge("Committed", new Gauge<Long> () {
@Override
public Long getValue() {
return mxBean.getNonHeapMemoryUsage().getCommitted();
}
});
- nonHeap.gauge("Max", new Gauge<Long>() {
+ nonHeap.<Long, Gauge<Long>>gauge("Max", new Gauge<Long> () {
@Override
public Long getValue() {
return mxBean.getNonHeapMemoryUsage().getMax();
}
});
- List<BufferPoolMXBean> bufferMxBeans = ManagementFactory.getPlatformMXBeans(BufferPoolMXBean.class);
+ final MBeanServer con = ManagementFactory.getPlatformMBeanServer();
- for (final BufferPoolMXBean bufferMxBean : bufferMxBeans) {
- MetricGroup bufferGroup = metrics.addGroup(WordUtils.capitalize(bufferMxBean.getName()));
- bufferGroup.gauge("Count", new Gauge<Long>() {
- @Override
- public Long getValue() {
- return bufferMxBean.getCount();
- }
- });
- bufferGroup.gauge("MemoryUsed", new Gauge<Long>() {
- @Override
- public Long getValue() {
- return bufferMxBean.getMemoryUsed();
- }
- });
- bufferGroup.gauge("TotalCapacity", new Gauge<Long>() {
- @Override
- public Long getValue() {
- return bufferMxBean.getTotalCapacity();
- }
- });
+ final String directBufferPoolName = "java.nio:type=BufferPool,name=direct";
+
+ try {
+ final ObjectName directObjectName = new ObjectName(directBufferPoolName);
+
+ MetricGroup direct = metrics.addGroup("Direct");
+
+ direct.<Long, Gauge<Long>>gauge("Count", new AttributeGauge<>(con, directObjectName, "Count", -1L));
+ direct.<Long, Gauge<Long>>gauge("MemoryUsed", new AttributeGauge<>(con, directObjectName, "MemoryUsed", -1L));
+ direct.<Long, Gauge<Long>>gauge("TotalCapacity", new AttributeGauge<>(con, directObjectName, "TotalCapacity", -1L));
+ } catch (MalformedObjectNameException e) {
+ LOG.warn("Could not create object name {}.", directBufferPoolName, e);
+ }
+
+ final String mappedBufferPoolName = "java.nio:type=BufferPool,name=mapped";
+
+ try {
+ final ObjectName mappedObjectName = new ObjectName(mappedBufferPoolName);
+
+ MetricGroup mapped = metrics.addGroup("Mapped");
+
+ mapped.<Long, Gauge<Long>>gauge("Count", new AttributeGauge<>(con, mappedObjectName, "Count", -1L));
+ mapped.<Long, Gauge<Long>>gauge("MemoryUsed", new AttributeGauge<>(con, mappedObjectName, "MemoryUsed", -1L));
+ mapped.<Long, Gauge<Long>>gauge("TotalCapacity", new AttributeGauge<>(con, mappedObjectName, "TotalCapacity", -1L));
+ } catch (MalformedObjectNameException e) {
+ LOG.warn("Could not create object name {}.", mappedBufferPoolName, e);
}
}
private static void instantiateThreadMetrics(MetricGroup metrics) {
final ThreadMXBean mxBean = ManagementFactory.getThreadMXBean();
- metrics.gauge("Count", new Gauge<Integer>() {
+ metrics.<Integer, Gauge<Integer>>gauge("Count", new Gauge<Integer> () {
@Override
public Integer getValue() {
return mxBean.getThreadCount();
@@ -220,54 +246,48 @@ public class MetricUtils {
private static void instantiateCPUMetrics(MetricGroup metrics) {
try {
- final OperatingSystemMXBean mxBean = ManagementFactory.getOperatingSystemMXBean();
-
- final Method fetchCPULoadMethod = Class.forName("com.sun.management.OperatingSystemMXBean")
- .getMethod("getProcessCpuLoad");
- // verify that we can invoke the method
- fetchCPULoadMethod.invoke(mxBean);
+ final com.sun.management.OperatingSystemMXBean mxBean = (com.sun.management.OperatingSystemMXBean) ManagementFactory.getOperatingSystemMXBean();
- final Method fetchCPUTimeMethod = Class.forName("com.sun.management.OperatingSystemMXBean")
- .getMethod("getProcessCpuTime");
- // verify that we can invoke the method
- fetchCPUTimeMethod.invoke(mxBean);
-
- metrics.gauge("Load", new Gauge<Double>() {
+ metrics.<Double, Gauge<Double>>gauge("Load", new Gauge<Double> () {
@Override
public Double getValue() {
- try {
- return (Double) fetchCPULoadMethod.invoke(mxBean);
- } catch (IllegalAccessException | InvocationTargetException | IllegalArgumentException ignored) {
- return -1.0;
- }
+ return mxBean.getProcessCpuLoad();
}
});
- metrics.gauge("Time", new Gauge<Long>() {
+ metrics.<Long, Gauge<Long>>gauge("Time", new Gauge<Long> () {
@Override
public Long getValue() {
- try {
- return (Long) fetchCPUTimeMethod.invoke(mxBean);
- } catch (IllegalAccessException | InvocationTargetException | IllegalArgumentException ignored) {
- return -1L;
- }
+ return mxBean.getProcessCpuTime();
}
});
- } catch (ClassNotFoundException | InvocationTargetException | SecurityException | NoSuchMethodException | IllegalArgumentException | IllegalAccessException ignored) {
+ } catch (Exception e) {
LOG.warn("Cannot access com.sun.management.OperatingSystemMXBean.getProcessCpuLoad()" +
- " - CPU load metrics will not be available.");
- // make sure that a metric still exists for the given name
- metrics.gauge("Load", new Gauge<Double>() {
- @Override
- public Double getValue() {
- return -1.0;
- }
- });
- metrics.gauge("Time", new Gauge<Long>() {
- @Override
- public Long getValue() {
- return -1L;
- }
- });
+ " - CPU load metrics will not be available.", e);
+ }
+ }
+
+ private static final class AttributeGauge<T> implements Gauge<T> {
+ private final MBeanServer server;
+ private final ObjectName objectName;
+ private final String attributeName;
+ private final T errorValue;
+
+ private AttributeGauge(MBeanServer server, ObjectName objectName, String attributeName, T errorValue) {
+ this.server = Preconditions.checkNotNull(server);
+ this.objectName = Preconditions.checkNotNull(objectName);
+ this.attributeName = Preconditions.checkNotNull(attributeName);
+ this.errorValue = errorValue;
+ }
+
+ @SuppressWarnings("unchecked")
+ @Override
+ public T getValue() {
+ try {
+ return (T) server.getAttribute(objectName, attributeName);
+ } catch (MBeanException | AttributeNotFoundException | InstanceNotFoundException | ReflectionException e) {
+ LOG.warn("Could not read attribute {}.", attributeName, e);
+ return errorValue;
+ }
}
}
}
http://git-wip-us.apache.org/repos/asf/flink/blob/7fb7e0b9/flink-runtime/src/main/java/org/apache/flink/runtime/taskexecutor/utils/TaskExecutorMetricsInitializer.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/taskexecutor/utils/TaskExecutorMetricsInitializer.java b/flink-runtime/src/main/java/org/apache/flink/runtime/taskexecutor/utils/TaskExecutorMetricsInitializer.java
deleted file mode 100644
index 1f8d5ed..0000000
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/taskexecutor/utils/TaskExecutorMetricsInitializer.java
+++ /dev/null
@@ -1,257 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.flink.runtime.taskexecutor.utils;
-
-import com.sun.management.OperatingSystemMXBean;
-import org.apache.flink.metrics.Gauge;
-import org.apache.flink.metrics.MetricGroup;
-import org.apache.flink.runtime.io.network.NetworkEnvironment;
-import org.apache.flink.runtime.taskexecutor.TaskExecutor;
-import org.apache.flink.util.Preconditions;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.management.AttributeNotFoundException;
-import javax.management.InstanceNotFoundException;
-import javax.management.MBeanException;
-import javax.management.MBeanServer;
-import javax.management.MalformedObjectNameException;
-import javax.management.ObjectName;
-import javax.management.ReflectionException;
-import java.lang.management.ClassLoadingMXBean;
-import java.lang.management.GarbageCollectorMXBean;
-import java.lang.management.ManagementFactory;
-import java.lang.management.MemoryMXBean;
-import java.lang.management.ThreadMXBean;
-import java.util.List;
-
-/**
- * Utility class ot initialize {@link TaskExecutor} specific metrics.
- */
-public class TaskExecutorMetricsInitializer {
- private static final Logger LOG = LoggerFactory.getLogger(TaskExecutorMetricsInitializer.class);
-
- public static void instantiateStatusMetrics(
- MetricGroup taskManagerMetricGroup,
- NetworkEnvironment network) {
- MetricGroup status = taskManagerMetricGroup.addGroup("Status");
-
- instantiateNetworkMetrics(status.addGroup("Network"), network);
-
- MetricGroup jvm = status.addGroup("JVM");
-
- instantiateClassLoaderMetrics(jvm.addGroup("ClassLoader"));
- instantiateGarbageCollectorMetrics(jvm.addGroup("GarbageCollector"));
- instantiateMemoryMetrics(jvm.addGroup("Memory"));
- instantiateThreadMetrics(jvm.addGroup("Threads"));
- instantiateCPUMetrics(jvm.addGroup("CPU"));
- }
-
- private static void instantiateNetworkMetrics(
- MetricGroup metrics,
- final NetworkEnvironment network) {
- metrics.<Long, Gauge<Long>>gauge("TotalMemorySegments", new Gauge<Long> () {
- @Override
- public Long getValue() {
- return (long) network.getNetworkBufferPool().getTotalNumberOfMemorySegments();
- }
- });
-
- metrics.<Long, Gauge<Long>>gauge("AvailableMemorySegments", new Gauge<Long> () {
- @Override
- public Long getValue() {
- return (long) network.getNetworkBufferPool().getNumberOfAvailableMemorySegments();
- }
- });
- }
-
- private static void instantiateClassLoaderMetrics(MetricGroup metrics) {
- final ClassLoadingMXBean mxBean = ManagementFactory.getClassLoadingMXBean();
-
- metrics.<Long, Gauge<Long>>gauge("ClassesLoaded", new Gauge<Long> () {
- @Override
- public Long getValue() {
- return mxBean.getTotalLoadedClassCount();
- }
- });
-
- metrics.<Long, Gauge<Long>>gauge("ClassesUnloaded", new Gauge<Long> () {
- @Override
- public Long getValue() {
- return mxBean.getUnloadedClassCount();
- }
- });
- }
-
- private static void instantiateGarbageCollectorMetrics(MetricGroup metrics) {
- List<GarbageCollectorMXBean> garbageCollectors = ManagementFactory.getGarbageCollectorMXBeans();
-
- for (final GarbageCollectorMXBean garbageCollector: garbageCollectors) {
- MetricGroup gcGroup = metrics.addGroup(garbageCollector.getName());
-
- gcGroup.<Long, Gauge<Long>>gauge("Count", new Gauge<Long> () {
- @Override
- public Long getValue() {
- return garbageCollector.getCollectionCount();
- }
- });
-
- gcGroup.<Long, Gauge<Long>>gauge("Time", new Gauge<Long> () {
- @Override
- public Long getValue() {
- return garbageCollector.getCollectionTime();
- }
- });
- }
- }
-
- private static void instantiateMemoryMetrics(MetricGroup metrics) {
- final MemoryMXBean mxBean = ManagementFactory.getMemoryMXBean();
-
- MetricGroup heap = metrics.addGroup("Heap");
-
- heap.<Long, Gauge<Long>>gauge("Used", new Gauge<Long> () {
- @Override
- public Long getValue() {
- return mxBean.getHeapMemoryUsage().getUsed();
- }
- });
- heap.<Long, Gauge<Long>>gauge("Committed", new Gauge<Long> () {
- @Override
- public Long getValue() {
- return mxBean.getHeapMemoryUsage().getCommitted();
- }
- });
- heap.<Long, Gauge<Long>>gauge("Max", new Gauge<Long> () {
- @Override
- public Long getValue() {
- return mxBean.getHeapMemoryUsage().getMax();
- }
- });
-
- MetricGroup nonHeap = metrics.addGroup("NonHeap");
-
- nonHeap.<Long, Gauge<Long>>gauge("Used", new Gauge<Long> () {
- @Override
- public Long getValue() {
- return mxBean.getNonHeapMemoryUsage().getUsed();
- }
- });
- nonHeap.<Long, Gauge<Long>>gauge("Committed", new Gauge<Long> () {
- @Override
- public Long getValue() {
- return mxBean.getNonHeapMemoryUsage().getCommitted();
- }
- });
- nonHeap.<Long, Gauge<Long>>gauge("Max", new Gauge<Long> () {
- @Override
- public Long getValue() {
- return mxBean.getNonHeapMemoryUsage().getMax();
- }
- });
-
- final MBeanServer con = ManagementFactory.getPlatformMBeanServer();
-
- final String directBufferPoolName = "java.nio:type=BufferPool,name=direct";
-
- try {
- final ObjectName directObjectName = new ObjectName(directBufferPoolName);
-
- MetricGroup direct = metrics.addGroup("Direct");
-
- direct.<Long, Gauge<Long>>gauge("Count", new TaskExecutorMetricsInitializer.AttributeGauge<>(con, directObjectName, "Count", -1L));
- direct.<Long, Gauge<Long>>gauge("MemoryUsed", new TaskExecutorMetricsInitializer.AttributeGauge<>(con, directObjectName, "MemoryUsed", -1L));
- direct.<Long, Gauge<Long>>gauge("TotalCapacity", new TaskExecutorMetricsInitializer.AttributeGauge<>(con, directObjectName, "TotalCapacity", -1L));
- } catch (MalformedObjectNameException e) {
- LOG.warn("Could not create object name {}.", directBufferPoolName, e);
- }
-
- final String mappedBufferPoolName = "java.nio:type=BufferPool,name=mapped";
-
- try {
- final ObjectName mappedObjectName = new ObjectName(mappedBufferPoolName);
-
- MetricGroup mapped = metrics.addGroup("Mapped");
-
- mapped.<Long, Gauge<Long>>gauge("Count", new TaskExecutorMetricsInitializer.AttributeGauge<>(con, mappedObjectName, "Count", -1L));
- mapped.<Long, Gauge<Long>>gauge("MemoryUsed", new TaskExecutorMetricsInitializer.AttributeGauge<>(con, mappedObjectName, "MemoryUsed", -1L));
- mapped.<Long, Gauge<Long>>gauge("TotalCapacity", new TaskExecutorMetricsInitializer.AttributeGauge<>(con, mappedObjectName, "TotalCapacity", -1L));
- } catch (MalformedObjectNameException e) {
- LOG.warn("Could not create object name {}.", mappedBufferPoolName, e);
- }
- }
-
- private static void instantiateThreadMetrics(MetricGroup metrics) {
- final ThreadMXBean mxBean = ManagementFactory.getThreadMXBean();
-
- metrics.<Integer, Gauge<Integer>>gauge("Count", new Gauge<Integer> () {
- @Override
- public Integer getValue() {
- return mxBean.getThreadCount();
- }
- });
- }
-
- private static void instantiateCPUMetrics(MetricGroup metrics) {
- try {
- final OperatingSystemMXBean mxBean = (OperatingSystemMXBean) ManagementFactory.getOperatingSystemMXBean();
-
- metrics.<Double, Gauge<Double>>gauge("Load", new Gauge<Double> () {
- @Override
- public Double getValue() {
- return mxBean.getProcessCpuLoad();
- }
- });
- metrics.<Long, Gauge<Long>>gauge("Time", new Gauge<Long> () {
- @Override
- public Long getValue() {
- return mxBean.getProcessCpuTime();
- }
- });
- } catch (Exception e) {
- LOG.warn("Cannot access com.sun.management.OperatingSystemMXBean.getProcessCpuLoad()" +
- " - CPU load metrics will not be available.", e);
- }
- }
-
- private static final class AttributeGauge<T> implements Gauge<T> {
- private final MBeanServer server;
- private final ObjectName objectName;
- private final String attributeName;
- private final T errorValue;
-
- private AttributeGauge(MBeanServer server, ObjectName objectName, String attributeName, T errorValue) {
- this.server = Preconditions.checkNotNull(server);
- this.objectName = Preconditions.checkNotNull(objectName);
- this.attributeName = Preconditions.checkNotNull(attributeName);
- this.errorValue = errorValue;
- }
-
- @SuppressWarnings("unchecked")
- @Override
- public T getValue() {
- try {
- return (T) server.getAttribute(objectName, attributeName);
- } catch (MBeanException | AttributeNotFoundException | InstanceNotFoundException | ReflectionException e) {
- LOG.warn("Could not read attribute {}.", attributeName, e);
- return errorValue;
- }
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/flink/blob/7fb7e0b9/flink-runtime/src/main/scala/org/apache/flink/runtime/jobmanager/JobManager.scala
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/scala/org/apache/flink/runtime/jobmanager/JobManager.scala b/flink-runtime/src/main/scala/org/apache/flink/runtime/jobmanager/JobManager.scala
index d40a0fd..4fb1196 100644
--- a/flink-runtime/src/main/scala/org/apache/flink/runtime/jobmanager/JobManager.scala
+++ b/flink-runtime/src/main/scala/org/apache/flink/runtime/jobmanager/JobManager.scala
@@ -1878,7 +1878,6 @@ class JobManager(
jobManagerMetricGroup.gauge[Long, Gauge[Long]]("numRunningJobs", new Gauge[Long] {
override def getValue: Long = JobManager.this.currentJobs.size
})
- MetricUtils.instantiateStatusMetrics(jobManagerMetricGroup)
}
}
@@ -2513,7 +2512,7 @@ object JobManager {
}
}
- val jobManagerMetricGroup = new JobManagerMetricGroup(
+ val jobManagerMetricGroup = MetricUtils.instantiateJobManagerMetricGroup(
metricRegistry,
configuration.getString(JobManagerOptions.ADDRESS))
[2/7] flink git commit: [FLINK-7876] Register TaskManagerMetricGroup
under ResourceID
Posted by tr...@apache.org.
http://git-wip-us.apache.org/repos/asf/flink/blob/d45b9412/flink-runtime/src/test/java/org/apache/flink/runtime/clusterframework/ResourceManagerTest.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/clusterframework/ResourceManagerTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/clusterframework/ResourceManagerTest.java
index 1a3ca70..d8e65a6 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/clusterframework/ResourceManagerTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/clusterframework/ResourceManagerTest.java
@@ -45,7 +45,7 @@ import org.apache.flink.runtime.leaderelection.TestingLeaderElectionService;
import org.apache.flink.runtime.leaderelection.TestingLeaderRetrievalService;
import org.apache.flink.runtime.messages.Acknowledge;
import org.apache.flink.runtime.messages.JobManagerMessages;
-import org.apache.flink.runtime.metrics.MetricRegistry;
+import org.apache.flink.runtime.metrics.MetricRegistryImpl;
import org.apache.flink.runtime.registration.RegistrationResponse;
import org.apache.flink.runtime.resourcemanager.JobLeaderIdService;
import org.apache.flink.runtime.resourcemanager.ResourceManagerConfiguration;
@@ -502,7 +502,7 @@ public class ResourceManagerTest extends TestLogger {
final ScheduledExecutor scheduledExecutor = mock(ScheduledExecutor.class);
final HeartbeatServices heartbeatServices = new TestingHeartbeatServices(heartbeatInterval, heartbeatTimeout, scheduledExecutor);
- final MetricRegistry metricRegistry = mock(MetricRegistry.class);
+ final MetricRegistryImpl metricRegistry = mock(MetricRegistryImpl.class);
final JobLeaderIdService jobLeaderIdService = mock(JobLeaderIdService.class);
final TestingFatalErrorHandler testingFatalErrorHandler = new TestingFatalErrorHandler();
final SlotManager slotManager = new SlotManager(
@@ -601,7 +601,7 @@ public class ResourceManagerTest extends TestLogger {
final ScheduledExecutor scheduledExecutor = mock(ScheduledExecutor.class);
final HeartbeatServices heartbeatServices = new TestingHeartbeatServices(heartbeatInterval, heartbeatTimeout, scheduledExecutor);
- final MetricRegistry metricRegistry = mock(MetricRegistry.class);
+ final MetricRegistryImpl metricRegistry = mock(MetricRegistryImpl.class);
final JobLeaderIdService jobLeaderIdService = new JobLeaderIdService(
highAvailabilityServices,
rpcService.getScheduledExecutor(),
http://git-wip-us.apache.org/repos/asf/flink/blob/d45b9412/flink-runtime/src/test/java/org/apache/flink/runtime/dispatcher/DispatcherTest.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/dispatcher/DispatcherTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/dispatcher/DispatcherTest.java
index d1ca757..8558145 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/dispatcher/DispatcherTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/dispatcher/DispatcherTest.java
@@ -34,7 +34,7 @@ import org.apache.flink.runtime.jobmaster.JobManagerRunner;
import org.apache.flink.runtime.jobmaster.JobManagerServices;
import org.apache.flink.runtime.leaderelection.TestingLeaderElectionService;
import org.apache.flink.runtime.messages.Acknowledge;
-import org.apache.flink.runtime.metrics.MetricRegistry;
+import org.apache.flink.runtime.metrics.MetricRegistryImpl;
import org.apache.flink.runtime.resourcemanager.ResourceManagerGateway;
import org.apache.flink.runtime.rpc.FatalErrorHandler;
import org.apache.flink.runtime.rpc.RpcService;
@@ -114,7 +114,7 @@ public class DispatcherTest extends TestLogger {
mock(ResourceManagerGateway.class),
mock(BlobServer.class),
heartbeatServices,
- mock(MetricRegistry.class),
+ mock(MetricRegistryImpl.class),
fatalErrorHandler,
jobManagerRunner,
jobId);
@@ -174,7 +174,7 @@ public class DispatcherTest extends TestLogger {
mock(ResourceManagerGateway.class),
mock(BlobServer.class),
heartbeatServices,
- mock(MetricRegistry.class),
+ mock(MetricRegistryImpl.class),
fatalErrorHandler,
mock(JobManagerRunner.class),
jobId);
@@ -209,7 +209,7 @@ public class DispatcherTest extends TestLogger {
ResourceManagerGateway resourceManagerGateway,
BlobServer blobServer,
HeartbeatServices heartbeatServices,
- MetricRegistry metricRegistry,
+ MetricRegistryImpl metricRegistry,
FatalErrorHandler fatalErrorHandler,
JobManagerRunner jobManagerRunner,
JobID expectedJobId) throws Exception {
@@ -238,7 +238,7 @@ public class DispatcherTest extends TestLogger {
HighAvailabilityServices highAvailabilityServices,
HeartbeatServices heartbeatServices,
JobManagerServices jobManagerServices,
- MetricRegistry metricRegistry,
+ MetricRegistryImpl metricRegistry,
OnCompletionActions onCompleteActions,
FatalErrorHandler fatalErrorHandler) throws Exception {
assertEquals(expectedJobId, jobGraph.getJobID());
http://git-wip-us.apache.org/repos/asf/flink/blob/d45b9412/flink-runtime/src/test/java/org/apache/flink/runtime/jobmanager/JobManagerHARecoveryTest.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/jobmanager/JobManagerHARecoveryTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/jobmanager/JobManagerHARecoveryTest.java
index 7df26fc..d843da2 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/jobmanager/JobManagerHARecoveryTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/jobmanager/JobManagerHARecoveryTest.java
@@ -62,7 +62,9 @@ import org.apache.flink.runtime.leaderelection.LeaderElectionService;
import org.apache.flink.runtime.leaderelection.TestingLeaderElectionService;
import org.apache.flink.runtime.leaderelection.TestingLeaderRetrievalService;
import org.apache.flink.runtime.messages.JobManagerMessages;
-import org.apache.flink.runtime.metrics.MetricRegistry;
+import org.apache.flink.runtime.metrics.MetricRegistryImpl;
+import org.apache.flink.runtime.metrics.NoOpMetricRegistry;
+import org.apache.flink.runtime.metrics.groups.JobManagerMetricGroup;
import org.apache.flink.runtime.state.OperatorStateHandle;
import org.apache.flink.runtime.state.memory.ByteStreamStateHandle;
import org.apache.flink.runtime.taskmanager.TaskManager;
@@ -206,7 +208,7 @@ public class JobManagerHARecoveryTest extends TestLogger {
mySubmittedJobGraphStore,
checkpointStateFactory,
jobRecoveryTimeout,
- Option.<MetricRegistry>empty(),
+ Option.<MetricRegistryImpl>empty(),
Option.<String>empty());
jobManager = system.actorOf(jobManagerProps);
@@ -217,6 +219,7 @@ public class JobManagerHARecoveryTest extends TestLogger {
ResourceID.generate(),
system,
testingHighAvailabilityServices,
+ new NoOpMetricRegistry(),
"localhost",
Option.apply("taskmanager"),
true,
@@ -380,7 +383,7 @@ public class JobManagerHARecoveryTest extends TestLogger {
submittedJobGraphStore,
mock(CheckpointRecoveryFactory.class),
jobRecoveryTimeout,
- Option.<MetricRegistry>apply(null),
+ Option.<MetricRegistryImpl>apply(null),
recoveredJobs).withDispatcher(CallingThreadDispatcher.Id());
jobManager = system.actorOf(jobManagerProps);
@@ -418,7 +421,7 @@ public class JobManagerHARecoveryTest extends TestLogger {
SubmittedJobGraphStore submittedJobGraphs,
CheckpointRecoveryFactory checkpointRecoveryFactory,
FiniteDuration jobRecoveryTimeout,
- Option<MetricRegistry> metricsRegistry,
+ JobManagerMetricGroup jobManagerMetricGroup,
Collection<JobID> recoveredJobs) {
super(
flinkConfiguration,
@@ -435,7 +438,7 @@ public class JobManagerHARecoveryTest extends TestLogger {
submittedJobGraphs,
checkpointRecoveryFactory,
jobRecoveryTimeout,
- metricsRegistry,
+ jobManagerMetricGroup,
Option.empty());
this.recoveredJobs = recoveredJobs;
http://git-wip-us.apache.org/repos/asf/flink/blob/d45b9412/flink-runtime/src/test/java/org/apache/flink/runtime/jobmanager/JobManagerTest.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/jobmanager/JobManagerTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/jobmanager/JobManagerTest.java
index bd7f11f..a697aae 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/jobmanager/JobManagerTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/jobmanager/JobManagerTest.java
@@ -75,6 +75,7 @@ import org.apache.flink.runtime.messages.JobManagerMessages.SubmitJob;
import org.apache.flink.runtime.messages.JobManagerMessages.TriggerSavepoint;
import org.apache.flink.runtime.messages.JobManagerMessages.TriggerSavepointSuccess;
import org.apache.flink.runtime.messages.RegistrationMessages;
+import org.apache.flink.runtime.metrics.NoOpMetricRegistry;
import org.apache.flink.runtime.query.KvStateLocation;
import org.apache.flink.runtime.query.KvStateMessage.LookupKvStateLocation;
import org.apache.flink.runtime.query.KvStateMessage.NotifyKvStateRegistered;
@@ -624,6 +625,7 @@ public class JobManagerTest extends TestLogger {
TestingUtils.defaultExecutor(),
TestingUtils.defaultExecutor(),
highAvailabilityServices,
+ new NoOpMetricRegistry(),
Option.empty(),
TestingJobManager.class,
MemoryArchivist.class)._1();
@@ -645,6 +647,7 @@ public class JobManagerTest extends TestLogger {
ResourceID.generate(),
system,
highAvailabilityServices,
+ new NoOpMetricRegistry(),
"localhost",
scala.Option.<String>empty(),
true,
@@ -841,6 +844,7 @@ public class JobManagerTest extends TestLogger {
TestingUtils.defaultExecutor(),
TestingUtils.defaultExecutor(),
highAvailabilityServices,
+ new NoOpMetricRegistry(),
Option.empty(),
Option.apply("jm"),
Option.apply("arch"),
@@ -859,6 +863,7 @@ public class JobManagerTest extends TestLogger {
ResourceID.generate(),
actorSystem,
highAvailabilityServices,
+ new NoOpMetricRegistry(),
"localhost",
Option.apply("tm"),
true,
@@ -1051,6 +1056,7 @@ public class JobManagerTest extends TestLogger {
TestingUtils.defaultExecutor(),
TestingUtils.defaultExecutor(),
highAvailabilityServices,
+ new NoOpMetricRegistry(),
Option.empty(),
Option.apply("jm"),
Option.apply("arch"),
@@ -1069,6 +1075,7 @@ public class JobManagerTest extends TestLogger {
ResourceID.generate(),
actorSystem,
highAvailabilityServices,
+ new NoOpMetricRegistry(),
"localhost",
Option.apply("tm"),
true,
@@ -1164,6 +1171,7 @@ public class JobManagerTest extends TestLogger {
TestingUtils.defaultExecutor(),
TestingUtils.defaultExecutor(),
highAvailabilityServices,
+ new NoOpMetricRegistry(),
Option.empty(),
Option.apply("jm"),
Option.apply("arch"),
@@ -1182,6 +1190,7 @@ public class JobManagerTest extends TestLogger {
ResourceID.generate(),
actorSystem,
highAvailabilityServices,
+ new NoOpMetricRegistry(),
"localhost",
Option.apply("tm"),
true,
@@ -1275,6 +1284,7 @@ public class JobManagerTest extends TestLogger {
TestingUtils.defaultExecutor(),
TestingUtils.defaultExecutor(),
highAvailabilityServices,
+ new NoOpMetricRegistry(),
Option.empty(),
Option.apply("jm"),
Option.apply("arch"),
@@ -1296,6 +1306,7 @@ public class JobManagerTest extends TestLogger {
ResourceID.generate(),
actorSystem,
highAvailabilityServices,
+ new NoOpMetricRegistry(),
"localhost",
Option.apply("tm"),
true,
http://git-wip-us.apache.org/repos/asf/flink/blob/d45b9412/flink-runtime/src/test/java/org/apache/flink/runtime/jobmanager/JobSubmitTest.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/jobmanager/JobSubmitTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/jobmanager/JobSubmitTest.java
index 340a735..cc93f18 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/jobmanager/JobSubmitTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/jobmanager/JobSubmitTest.java
@@ -37,6 +37,7 @@ import org.apache.flink.runtime.jobgraph.tasks.CheckpointCoordinatorConfiguratio
import org.apache.flink.runtime.jobgraph.tasks.JobCheckpointingSettings;
import org.apache.flink.runtime.leaderretrieval.LeaderRetrievalService;
import org.apache.flink.runtime.messages.JobManagerMessages;
+import org.apache.flink.runtime.metrics.NoOpMetricRegistry;
import org.apache.flink.runtime.testingUtils.TestingUtils;
import org.apache.flink.runtime.testtasks.NoOpInvokable;
import org.apache.flink.runtime.util.LeaderRetrievalUtils;
@@ -94,6 +95,7 @@ public class JobSubmitTest {
TestingUtils.defaultExecutor(),
TestingUtils.defaultExecutor(),
highAvailabilityServices,
+ new NoOpMetricRegistry(),
Option.empty(),
JobManager.class,
MemoryArchivist.class)._1();
http://git-wip-us.apache.org/repos/asf/flink/blob/d45b9412/flink-runtime/src/test/java/org/apache/flink/runtime/jobmaster/JobManagerRunnerMockTest.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/jobmaster/JobManagerRunnerMockTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/jobmaster/JobManagerRunnerMockTest.java
index b4f50fb..083d6e9 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/jobmaster/JobManagerRunnerMockTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/jobmaster/JobManagerRunnerMockTest.java
@@ -33,7 +33,7 @@ import org.apache.flink.runtime.jobgraph.JobVertex;
import org.apache.flink.runtime.jobmanager.OnCompletionActions;
import org.apache.flink.runtime.jobmanager.SubmittedJobGraphStore;
import org.apache.flink.runtime.leaderelection.LeaderElectionService;
-import org.apache.flink.runtime.metrics.MetricRegistry;
+import org.apache.flink.runtime.metrics.MetricRegistryImpl;
import org.apache.flink.runtime.metrics.MetricRegistryConfiguration;
import org.apache.flink.runtime.rpc.FatalErrorHandler;
import org.apache.flink.runtime.rpc.RpcService;
@@ -115,7 +115,7 @@ public class JobManagerRunnerMockTest extends TestLogger {
haServices,
heartbeatServices,
JobManagerServices.fromConfiguration(new Configuration(), mock(BlobServer.class)),
- new MetricRegistry(MetricRegistryConfiguration.defaultMetricRegistryConfiguration()),
+ new MetricRegistryImpl(MetricRegistryConfiguration.defaultMetricRegistryConfiguration()),
jobCompletion,
jobCompletion));
}
http://git-wip-us.apache.org/repos/asf/flink/blob/d45b9412/flink-runtime/src/test/java/org/apache/flink/runtime/leaderelection/JobManagerLeaderElectionTest.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/leaderelection/JobManagerLeaderElectionTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/leaderelection/JobManagerLeaderElectionTest.java
index c3b57fa..e4ceb40 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/leaderelection/JobManagerLeaderElectionTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/leaderelection/JobManagerLeaderElectionTest.java
@@ -28,7 +28,6 @@ import akka.util.Timeout;
import org.apache.curator.framework.CuratorFramework;
import org.apache.curator.test.TestingServer;
import org.apache.flink.configuration.BlobServerOptions;
-import org.apache.flink.configuration.ConfigConstants;
import org.apache.flink.configuration.Configuration;
import org.apache.flink.runtime.akka.AkkaUtils;
import org.apache.flink.runtime.blob.BlobServer;
@@ -43,7 +42,7 @@ import org.apache.flink.runtime.jobmanager.HighAvailabilityMode;
import org.apache.flink.runtime.jobmanager.StandaloneSubmittedJobGraphStore;
import org.apache.flink.runtime.jobmanager.SubmittedJobGraphStore;
import org.apache.flink.runtime.jobmanager.scheduler.Scheduler;
-import org.apache.flink.runtime.metrics.MetricRegistry;
+import org.apache.flink.runtime.metrics.MetricRegistryImpl;
import org.apache.flink.runtime.testingUtils.TestingJobManager;
import org.apache.flink.runtime.testingUtils.TestingJobManagerMessages;
import org.apache.flink.runtime.testingUtils.TestingUtils;
@@ -199,7 +198,7 @@ public class JobManagerLeaderElectionTest extends TestLogger {
submittedJobGraphStore,
checkpointRecoveryFactory,
AkkaUtils.getDefaultTimeoutAsFiniteDuration(),
- Option.<MetricRegistry>empty(),
+ Option.<MetricRegistryImpl>empty(),
Option.<String>empty());
}
}
http://git-wip-us.apache.org/repos/asf/flink/blob/d45b9412/flink-runtime/src/test/java/org/apache/flink/runtime/metrics/MetricRegistryImplTest.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/metrics/MetricRegistryImplTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/metrics/MetricRegistryImplTest.java
new file mode 100644
index 0000000..b0b20b2
--- /dev/null
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/metrics/MetricRegistryImplTest.java
@@ -0,0 +1,496 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.flink.runtime.metrics;
+
+import org.apache.flink.configuration.ConfigConstants;
+import org.apache.flink.configuration.Configuration;
+import org.apache.flink.configuration.MetricOptions;
+import org.apache.flink.metrics.Counter;
+import org.apache.flink.metrics.Metric;
+import org.apache.flink.metrics.MetricConfig;
+import org.apache.flink.metrics.MetricGroup;
+import org.apache.flink.metrics.SimpleCounter;
+import org.apache.flink.metrics.reporter.MetricReporter;
+import org.apache.flink.metrics.reporter.Scheduled;
+import org.apache.flink.runtime.akka.AkkaUtils;
+import org.apache.flink.runtime.metrics.groups.MetricGroupTest;
+import org.apache.flink.runtime.metrics.groups.TaskManagerMetricGroup;
+import org.apache.flink.runtime.metrics.scope.ScopeFormats;
+import org.apache.flink.runtime.metrics.util.TestReporter;
+import org.apache.flink.util.TestLogger;
+
+import akka.actor.ActorNotFound;
+import akka.actor.ActorRef;
+import akka.actor.ActorSystem;
+import org.junit.Assert;
+import org.junit.Test;
+
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+
+import scala.concurrent.Await;
+import scala.concurrent.duration.FiniteDuration;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+/**
+ * Tests for the {@link MetricRegistryImpl}.
+ */
+public class MetricRegistryImplTest extends TestLogger {
+
+ private static final char GLOBAL_DEFAULT_DELIMITER = '.';
+
+ @Test
+ public void testIsShutdown() {
+ MetricRegistryImpl metricRegistry = new MetricRegistryImpl(MetricRegistryConfiguration.defaultMetricRegistryConfiguration());
+
+ Assert.assertFalse(metricRegistry.isShutdown());
+
+ metricRegistry.shutdown();
+
+ Assert.assertTrue(metricRegistry.isShutdown());
+ }
+
+ /**
+ * Verifies that the reporter class argument is correctly used to instantiate and open the reporter.
+ */
+ @Test
+ public void testReporterInstantiation() {
+ Configuration config = new Configuration();
+
+ config.setString(MetricOptions.REPORTERS_LIST, "test");
+ config.setString(ConfigConstants.METRICS_REPORTER_PREFIX + "test." + ConfigConstants.METRICS_REPORTER_CLASS_SUFFIX, TestReporter1.class.getName());
+
+ MetricRegistryImpl metricRegistry = new MetricRegistryImpl(MetricRegistryConfiguration.fromConfiguration(config));
+
+ assertTrue(metricRegistry.getReporters().size() == 1);
+
+ Assert.assertTrue(TestReporter1.wasOpened);
+
+ metricRegistry.shutdown();
+ }
+
+ /**
+ * Reporter that exposes whether open() was called.
+ */
+ protected static class TestReporter1 extends TestReporter {
+ public static boolean wasOpened = false;
+
+ @Override
+ public void open(MetricConfig config) {
+ wasOpened = true;
+ }
+ }
+
+ /**
+ * Verifies that multiple reporters are instantiated correctly.
+ */
+ @Test
+ public void testMultipleReporterInstantiation() {
+ Configuration config = new Configuration();
+
+ config.setString(MetricOptions.REPORTERS_LIST, "test1, test2,test3");
+ config.setString(ConfigConstants.METRICS_REPORTER_PREFIX + "test1." + ConfigConstants.METRICS_REPORTER_CLASS_SUFFIX, TestReporter11.class.getName());
+ config.setString(ConfigConstants.METRICS_REPORTER_PREFIX + "test2." + ConfigConstants.METRICS_REPORTER_CLASS_SUFFIX, TestReporter12.class.getName());
+ config.setString(ConfigConstants.METRICS_REPORTER_PREFIX + "test3." + ConfigConstants.METRICS_REPORTER_CLASS_SUFFIX, TestReporter13.class.getName());
+
+ MetricRegistryImpl metricRegistry = new MetricRegistryImpl(MetricRegistryConfiguration.fromConfiguration(config));
+
+ assertTrue(metricRegistry.getReporters().size() == 3);
+
+ Assert.assertTrue(TestReporter11.wasOpened);
+ Assert.assertTrue(TestReporter12.wasOpened);
+ Assert.assertTrue(TestReporter13.wasOpened);
+
+ metricRegistry.shutdown();
+ }
+
+ /**
+ * Reporter that exposes whether open() was called.
+ */
+ protected static class TestReporter11 extends TestReporter {
+ public static boolean wasOpened = false;
+
+ @Override
+ public void open(MetricConfig config) {
+ wasOpened = true;
+ }
+ }
+
+ /**
+ * Reporter that exposes whether open() was called.
+ */
+ protected static class TestReporter12 extends TestReporter {
+ public static boolean wasOpened = false;
+
+ @Override
+ public void open(MetricConfig config) {
+ wasOpened = true;
+ }
+ }
+
+ /**
+ * Reporter that exposes whether open() was called.
+ */
+ protected static class TestReporter13 extends TestReporter {
+ public static boolean wasOpened = false;
+
+ @Override
+ public void open(MetricConfig config) {
+ wasOpened = true;
+ }
+ }
+
+ /**
+ * Verifies that configured arguments are properly forwarded to the reporter.
+ */
+ @Test
+ public void testReporterArgumentForwarding() {
+ Configuration config = new Configuration();
+
+ config.setString(MetricOptions.REPORTERS_LIST, "test");
+ config.setString(ConfigConstants.METRICS_REPORTER_PREFIX + "test." + ConfigConstants.METRICS_REPORTER_CLASS_SUFFIX, TestReporter2.class.getName());
+ config.setString(ConfigConstants.METRICS_REPORTER_PREFIX + "test.arg1", "hello");
+ config.setString(ConfigConstants.METRICS_REPORTER_PREFIX + "test.arg2", "world");
+
+ new MetricRegistryImpl(MetricRegistryConfiguration.fromConfiguration(config)).shutdown();
+
+ Assert.assertEquals("hello", TestReporter2.mc.getString("arg1", null));
+ Assert.assertEquals("world", TestReporter2.mc.getString("arg2", null));
+ }
+
+ /**
+ * Reporter that exposes the {@link MetricConfig} it was given.
+ */
+ protected static class TestReporter2 extends TestReporter {
+ static MetricConfig mc;
+ @Override
+ public void open(MetricConfig config) {
+ mc = config;
+ }
+ }
+
+ /**
+ * Verifies that reporters implementing the Scheduled interface are regularly called to report the metrics.
+ *
+ * @throws InterruptedException
+ */
+ @Test
+ public void testReporterScheduling() throws InterruptedException {
+ Configuration config = new Configuration();
+
+ config.setString(MetricOptions.REPORTERS_LIST, "test");
+ config.setString(ConfigConstants.METRICS_REPORTER_PREFIX + "test." + ConfigConstants.METRICS_REPORTER_CLASS_SUFFIX, TestReporter3.class.getName());
+ config.setString(ConfigConstants.METRICS_REPORTER_PREFIX + "test.arg1", "hello");
+ config.setString(ConfigConstants.METRICS_REPORTER_PREFIX + "test." + ConfigConstants.METRICS_REPORTER_INTERVAL_SUFFIX, "50 MILLISECONDS");
+
+ MetricRegistryImpl registry = new MetricRegistryImpl(MetricRegistryConfiguration.fromConfiguration(config));
+
+ long start = System.currentTimeMillis();
+
+ // only start counting from now on
+ TestReporter3.reportCount = 0;
+
+ for (int x = 0; x < 10; x++) {
+ Thread.sleep(100);
+ int reportCount = TestReporter3.reportCount;
+ long curT = System.currentTimeMillis();
+ /**
+ * Within a given time-frame T only T/500 reports may be triggered due to the interval between reports.
+ * This value however does not not take the first triggered report into account (=> +1).
+ * Furthermore we have to account for the mis-alignment between reports being triggered and our time
+ * measurement (=> +1); for T=200 a total of 4-6 reports may have been
+ * triggered depending on whether the end of the interval for the first reports ends before
+ * or after T=50.
+ */
+ long maxAllowedReports = (curT - start) / 50 + 2;
+ Assert.assertTrue("Too many reports were triggered.", maxAllowedReports >= reportCount);
+ }
+ Assert.assertTrue("No report was triggered.", TestReporter3.reportCount > 0);
+
+ registry.shutdown();
+ }
+
+ /**
+ * Reporter that exposes how often report() was called.
+ */
+ protected static class TestReporter3 extends TestReporter implements Scheduled {
+ public static int reportCount = 0;
+
+ @Override
+ public void report() {
+ reportCount++;
+ }
+ }
+
+ /**
+ * Verifies that reporters are notified of added/removed metrics.
+ */
+ @Test
+ public void testReporterNotifications() {
+ Configuration config = new Configuration();
+ config.setString(MetricOptions.REPORTERS_LIST, "test1,test2");
+ config.setString(ConfigConstants.METRICS_REPORTER_PREFIX + "test1." + ConfigConstants.METRICS_REPORTER_CLASS_SUFFIX, TestReporter6.class.getName());
+ config.setString(ConfigConstants.METRICS_REPORTER_PREFIX + "test2." + ConfigConstants.METRICS_REPORTER_CLASS_SUFFIX, TestReporter7.class.getName());
+
+ MetricRegistryImpl registry = new MetricRegistryImpl(MetricRegistryConfiguration.fromConfiguration(config));
+
+ TaskManagerMetricGroup root = new TaskManagerMetricGroup(registry, "host", "id");
+ root.counter("rootCounter");
+
+ assertTrue(TestReporter6.addedMetric instanceof Counter);
+ assertEquals("rootCounter", TestReporter6.addedMetricName);
+
+ assertTrue(TestReporter7.addedMetric instanceof Counter);
+ assertEquals("rootCounter", TestReporter7.addedMetricName);
+
+ root.close();
+
+ assertTrue(TestReporter6.removedMetric instanceof Counter);
+ assertEquals("rootCounter", TestReporter6.removedMetricName);
+
+ assertTrue(TestReporter7.removedMetric instanceof Counter);
+ assertEquals("rootCounter", TestReporter7.removedMetricName);
+
+ registry.shutdown();
+ }
+
+ /**
+ * Reporter that exposes the name and metric instance of the last metric that was added or removed.
+ */
+ protected static class TestReporter6 extends TestReporter {
+ static Metric addedMetric;
+ static String addedMetricName;
+
+ static Metric removedMetric;
+ static String removedMetricName;
+
+ @Override
+ public void notifyOfAddedMetric(Metric metric, String metricName, MetricGroup group) {
+ addedMetric = metric;
+ addedMetricName = metricName;
+ }
+
+ @Override
+ public void notifyOfRemovedMetric(Metric metric, String metricName, MetricGroup group) {
+ removedMetric = metric;
+ removedMetricName = metricName;
+ }
+ }
+
+ /**
+ * Reporter that exposes the name and metric instance of the last metric that was added or removed.
+ */
+ protected static class TestReporter7 extends TestReporter {
+ static Metric addedMetric;
+ static String addedMetricName;
+
+ static Metric removedMetric;
+ static String removedMetricName;
+
+ @Override
+ public void notifyOfAddedMetric(Metric metric, String metricName, MetricGroup group) {
+ addedMetric = metric;
+ addedMetricName = metricName;
+ }
+
+ @Override
+ public void notifyOfRemovedMetric(Metric metric, String metricName, MetricGroup group) {
+ removedMetric = metric;
+ removedMetricName = metricName;
+ }
+ }
+
+ /**
+ * Verifies that the scope configuration is properly extracted.
+ */
+ @Test
+ public void testScopeConfig() {
+ Configuration config = new Configuration();
+
+ config.setString(MetricOptions.SCOPE_NAMING_TM, "A");
+ config.setString(MetricOptions.SCOPE_NAMING_TM_JOB, "B");
+ config.setString(MetricOptions.SCOPE_NAMING_TASK, "C");
+ config.setString(MetricOptions.SCOPE_NAMING_OPERATOR, "D");
+
+ ScopeFormats scopeConfig = ScopeFormats.fromConfig(config);
+
+ assertEquals("A", scopeConfig.getTaskManagerFormat().format());
+ assertEquals("B", scopeConfig.getTaskManagerJobFormat().format());
+ assertEquals("C", scopeConfig.getTaskFormat().format());
+ assertEquals("D", scopeConfig.getOperatorFormat().format());
+ }
+
+ @Test
+ public void testConfigurableDelimiter() {
+ Configuration config = new Configuration();
+ config.setString(MetricOptions.SCOPE_DELIMITER, "_");
+ config.setString(MetricOptions.SCOPE_NAMING_TM, "A.B.C.D.E");
+
+ MetricRegistryImpl registry = new MetricRegistryImpl(MetricRegistryConfiguration.fromConfiguration(config));
+
+ TaskManagerMetricGroup tmGroup = new TaskManagerMetricGroup(registry, "host", "id");
+ assertEquals("A_B_C_D_E_name", tmGroup.getMetricIdentifier("name"));
+
+ registry.shutdown();
+ }
+
+ @Test
+ public void testConfigurableDelimiterForReporters() {
+ Configuration config = new Configuration();
+ config.setString(MetricOptions.REPORTERS_LIST, "test1,test2,test3");
+ config.setString(ConfigConstants.METRICS_REPORTER_PREFIX + "test1." + ConfigConstants.METRICS_REPORTER_SCOPE_DELIMITER, "_");
+ config.setString(ConfigConstants.METRICS_REPORTER_PREFIX + "test1." + ConfigConstants.METRICS_REPORTER_CLASS_SUFFIX, TestReporter.class.getName());
+ config.setString(ConfigConstants.METRICS_REPORTER_PREFIX + "test2." + ConfigConstants.METRICS_REPORTER_SCOPE_DELIMITER, "-");
+ config.setString(ConfigConstants.METRICS_REPORTER_PREFIX + "test2." + ConfigConstants.METRICS_REPORTER_CLASS_SUFFIX, TestReporter.class.getName());
+ config.setString(ConfigConstants.METRICS_REPORTER_PREFIX + "test3." + ConfigConstants.METRICS_REPORTER_SCOPE_DELIMITER, "AA");
+ config.setString(ConfigConstants.METRICS_REPORTER_PREFIX + "test3." + ConfigConstants.METRICS_REPORTER_CLASS_SUFFIX, TestReporter.class.getName());
+
+ MetricRegistryImpl registry = new MetricRegistryImpl(MetricRegistryConfiguration.fromConfiguration(config));
+
+ assertEquals(GLOBAL_DEFAULT_DELIMITER, registry.getDelimiter());
+ assertEquals('_', registry.getDelimiter(0));
+ assertEquals('-', registry.getDelimiter(1));
+ assertEquals(GLOBAL_DEFAULT_DELIMITER, registry.getDelimiter(2));
+ assertEquals(GLOBAL_DEFAULT_DELIMITER, registry.getDelimiter(3));
+ assertEquals(GLOBAL_DEFAULT_DELIMITER, registry.getDelimiter(-1));
+
+ registry.shutdown();
+ }
+
+ @Test
+ public void testConfigurableDelimiterForReportersInGroup() {
+ Configuration config = new Configuration();
+ config.setString(MetricOptions.REPORTERS_LIST, "test1,test2,test3,test4");
+ config.setString(ConfigConstants.METRICS_REPORTER_PREFIX + "test1." + ConfigConstants.METRICS_REPORTER_SCOPE_DELIMITER, "_");
+ config.setString(ConfigConstants.METRICS_REPORTER_PREFIX + "test1." + ConfigConstants.METRICS_REPORTER_CLASS_SUFFIX, TestReporter8.class.getName());
+ config.setString(ConfigConstants.METRICS_REPORTER_PREFIX + "test2." + ConfigConstants.METRICS_REPORTER_SCOPE_DELIMITER, "-");
+ config.setString(ConfigConstants.METRICS_REPORTER_PREFIX + "test2." + ConfigConstants.METRICS_REPORTER_CLASS_SUFFIX, TestReporter8.class.getName());
+ config.setString(ConfigConstants.METRICS_REPORTER_PREFIX + "test3." + ConfigConstants.METRICS_REPORTER_SCOPE_DELIMITER, "AA");
+ config.setString(ConfigConstants.METRICS_REPORTER_PREFIX + "test3." + ConfigConstants.METRICS_REPORTER_CLASS_SUFFIX, TestReporter8.class.getName());
+ config.setString(ConfigConstants.METRICS_REPORTER_PREFIX + "test4." + ConfigConstants.METRICS_REPORTER_CLASS_SUFFIX, TestReporter8.class.getName());
+ config.setString(MetricOptions.SCOPE_NAMING_TM, "A.B");
+
+ MetricRegistryImpl registry = new MetricRegistryImpl(MetricRegistryConfiguration.fromConfiguration(config));
+ List<MetricReporter> reporters = registry.getReporters();
+ ((TestReporter8) reporters.get(0)).expectedDelimiter = '_'; //test1 reporter
+ ((TestReporter8) reporters.get(1)).expectedDelimiter = '-'; //test2 reporter
+ ((TestReporter8) reporters.get(2)).expectedDelimiter = GLOBAL_DEFAULT_DELIMITER; //test3 reporter, because 'AA' - not correct delimiter
+ ((TestReporter8) reporters.get(3)).expectedDelimiter = GLOBAL_DEFAULT_DELIMITER; //for test4 reporter use global delimiter
+
+ TaskManagerMetricGroup group = new TaskManagerMetricGroup(registry, "host", "id");
+ group.counter("C");
+ group.close();
+ registry.shutdown();
+ assertEquals(4, TestReporter8.numCorrectDelimitersForRegister);
+ assertEquals(4, TestReporter8.numCorrectDelimitersForUnregister);
+ }
+
+ /**
+ * Tests that the query actor will be stopped when the MetricRegistry is shut down.
+ */
+ @Test
+ public void testQueryActorShutdown() throws Exception {
+ final FiniteDuration timeout = new FiniteDuration(10L, TimeUnit.SECONDS);
+
+ MetricRegistryImpl registry = new MetricRegistryImpl(MetricRegistryConfiguration.defaultMetricRegistryConfiguration());
+
+ final ActorSystem actorSystem = AkkaUtils.createDefaultActorSystem();
+
+ registry.startQueryService(actorSystem, null);
+
+ ActorRef queryServiceActor = registry.getQueryService();
+
+ registry.shutdown();
+
+ try {
+ Await.result(actorSystem.actorSelection(queryServiceActor.path()).resolveOne(timeout), timeout);
+
+ fail("The query actor should be terminated resulting in a ActorNotFound exception.");
+ } catch (ActorNotFound e) {
+ // we expect the query actor to be shut down
+ }
+ }
+
+ /**
+ * Reporter that verifies that the configured delimiter is applied correctly when generating the metric identifier.
+ */
+ public static class TestReporter8 extends TestReporter {
+ char expectedDelimiter;
+ public static int numCorrectDelimitersForRegister = 0;
+ public static int numCorrectDelimitersForUnregister = 0;
+
+ @Override
+ public void notifyOfAddedMetric(Metric metric, String metricName, MetricGroup group) {
+ String expectedMetric = "A" + expectedDelimiter + "B" + expectedDelimiter + "C";
+ assertEquals(expectedMetric, group.getMetricIdentifier(metricName, this));
+ assertEquals(expectedMetric, group.getMetricIdentifier(metricName));
+ numCorrectDelimitersForRegister++;
+ }
+
+ @Override
+ public void notifyOfRemovedMetric(Metric metric, String metricName, MetricGroup group) {
+ String expectedMetric = "A" + expectedDelimiter + "B" + expectedDelimiter + "C";
+ assertEquals(expectedMetric, group.getMetricIdentifier(metricName, this));
+ assertEquals(expectedMetric, group.getMetricIdentifier(metricName));
+ numCorrectDelimitersForUnregister++;
+ }
+ }
+
+ @Test
+ public void testExceptionIsolation() throws Exception {
+
+ Configuration config = new Configuration();
+ config.setString(MetricOptions.REPORTERS_LIST, "test1,test2");
+ config.setString(ConfigConstants.METRICS_REPORTER_PREFIX + "test1." + ConfigConstants.METRICS_REPORTER_CLASS_SUFFIX, FailingReporter.class.getName());
+ config.setString(ConfigConstants.METRICS_REPORTER_PREFIX + "test2." + ConfigConstants.METRICS_REPORTER_CLASS_SUFFIX, TestReporter7.class.getName());
+
+ MetricRegistryImpl registry = new MetricRegistryImpl(MetricRegistryConfiguration.fromConfiguration(config));
+
+ Counter metric = new SimpleCounter();
+ registry.register(metric, "counter", new MetricGroupTest.DummyAbstractMetricGroup(registry));
+
+ assertEquals(metric, TestReporter7.addedMetric);
+ assertEquals("counter", TestReporter7.addedMetricName);
+
+ registry.unregister(metric, "counter", new MetricGroupTest.DummyAbstractMetricGroup(registry));
+
+ assertEquals(metric, TestReporter7.removedMetric);
+ assertEquals("counter", TestReporter7.removedMetricName);
+
+ registry.shutdown();
+ }
+
+ /**
+ * Reporter that throws an exception when it is notified of an added or removed metric.
+ */
+ protected static class FailingReporter extends TestReporter {
+ @Override
+ public void notifyOfAddedMetric(Metric metric, String metricName, MetricGroup group) {
+ throw new RuntimeException();
+ }
+
+ @Override
+ public void notifyOfRemovedMetric(Metric metric, String metricName, MetricGroup group) {
+ throw new RuntimeException();
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/flink/blob/d45b9412/flink-runtime/src/test/java/org/apache/flink/runtime/metrics/MetricRegistryTest.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/metrics/MetricRegistryTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/metrics/MetricRegistryTest.java
deleted file mode 100644
index 284b86a..0000000
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/metrics/MetricRegistryTest.java
+++ /dev/null
@@ -1,496 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.flink.runtime.metrics;
-
-import org.apache.flink.configuration.ConfigConstants;
-import org.apache.flink.configuration.Configuration;
-import org.apache.flink.configuration.MetricOptions;
-import org.apache.flink.metrics.Counter;
-import org.apache.flink.metrics.Metric;
-import org.apache.flink.metrics.MetricConfig;
-import org.apache.flink.metrics.MetricGroup;
-import org.apache.flink.metrics.SimpleCounter;
-import org.apache.flink.metrics.reporter.MetricReporter;
-import org.apache.flink.metrics.reporter.Scheduled;
-import org.apache.flink.runtime.akka.AkkaUtils;
-import org.apache.flink.runtime.metrics.groups.MetricGroupTest;
-import org.apache.flink.runtime.metrics.groups.TaskManagerMetricGroup;
-import org.apache.flink.runtime.metrics.scope.ScopeFormats;
-import org.apache.flink.runtime.metrics.util.TestReporter;
-import org.apache.flink.util.TestLogger;
-
-import akka.actor.ActorNotFound;
-import akka.actor.ActorRef;
-import akka.actor.ActorSystem;
-import org.junit.Assert;
-import org.junit.Test;
-
-import java.util.List;
-import java.util.concurrent.TimeUnit;
-
-import scala.concurrent.Await;
-import scala.concurrent.duration.FiniteDuration;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-/**
- * Tests for the {@link MetricRegistry}.
- */
-public class MetricRegistryTest extends TestLogger {
-
- private static final char GLOBAL_DEFAULT_DELIMITER = '.';
-
- @Test
- public void testIsShutdown() {
- MetricRegistry metricRegistry = new MetricRegistry(MetricRegistryConfiguration.defaultMetricRegistryConfiguration());
-
- Assert.assertFalse(metricRegistry.isShutdown());
-
- metricRegistry.shutdown();
-
- Assert.assertTrue(metricRegistry.isShutdown());
- }
-
- /**
- * Verifies that the reporter class argument is correctly used to instantiate and open the reporter.
- */
- @Test
- public void testReporterInstantiation() {
- Configuration config = new Configuration();
-
- config.setString(MetricOptions.REPORTERS_LIST, "test");
- config.setString(ConfigConstants.METRICS_REPORTER_PREFIX + "test." + ConfigConstants.METRICS_REPORTER_CLASS_SUFFIX, TestReporter1.class.getName());
-
- MetricRegistry metricRegistry = new MetricRegistry(MetricRegistryConfiguration.fromConfiguration(config));
-
- assertTrue(metricRegistry.getReporters().size() == 1);
-
- Assert.assertTrue(TestReporter1.wasOpened);
-
- metricRegistry.shutdown();
- }
-
- /**
- * Reporter that exposes whether open() was called.
- */
- protected static class TestReporter1 extends TestReporter {
- public static boolean wasOpened = false;
-
- @Override
- public void open(MetricConfig config) {
- wasOpened = true;
- }
- }
-
- /**
- * Verifies that multiple reporters are instantiated correctly.
- */
- @Test
- public void testMultipleReporterInstantiation() {
- Configuration config = new Configuration();
-
- config.setString(MetricOptions.REPORTERS_LIST, "test1, test2,test3");
- config.setString(ConfigConstants.METRICS_REPORTER_PREFIX + "test1." + ConfigConstants.METRICS_REPORTER_CLASS_SUFFIX, TestReporter11.class.getName());
- config.setString(ConfigConstants.METRICS_REPORTER_PREFIX + "test2." + ConfigConstants.METRICS_REPORTER_CLASS_SUFFIX, TestReporter12.class.getName());
- config.setString(ConfigConstants.METRICS_REPORTER_PREFIX + "test3." + ConfigConstants.METRICS_REPORTER_CLASS_SUFFIX, TestReporter13.class.getName());
-
- MetricRegistry metricRegistry = new MetricRegistry(MetricRegistryConfiguration.fromConfiguration(config));
-
- assertTrue(metricRegistry.getReporters().size() == 3);
-
- Assert.assertTrue(TestReporter11.wasOpened);
- Assert.assertTrue(TestReporter12.wasOpened);
- Assert.assertTrue(TestReporter13.wasOpened);
-
- metricRegistry.shutdown();
- }
-
- /**
- * Reporter that exposes whether open() was called.
- */
- protected static class TestReporter11 extends TestReporter {
- public static boolean wasOpened = false;
-
- @Override
- public void open(MetricConfig config) {
- wasOpened = true;
- }
- }
-
- /**
- * Reporter that exposes whether open() was called.
- */
- protected static class TestReporter12 extends TestReporter {
- public static boolean wasOpened = false;
-
- @Override
- public void open(MetricConfig config) {
- wasOpened = true;
- }
- }
-
- /**
- * Reporter that exposes whether open() was called.
- */
- protected static class TestReporter13 extends TestReporter {
- public static boolean wasOpened = false;
-
- @Override
- public void open(MetricConfig config) {
- wasOpened = true;
- }
- }
-
- /**
- * Verifies that configured arguments are properly forwarded to the reporter.
- */
- @Test
- public void testReporterArgumentForwarding() {
- Configuration config = new Configuration();
-
- config.setString(MetricOptions.REPORTERS_LIST, "test");
- config.setString(ConfigConstants.METRICS_REPORTER_PREFIX + "test." + ConfigConstants.METRICS_REPORTER_CLASS_SUFFIX, TestReporter2.class.getName());
- config.setString(ConfigConstants.METRICS_REPORTER_PREFIX + "test.arg1", "hello");
- config.setString(ConfigConstants.METRICS_REPORTER_PREFIX + "test.arg2", "world");
-
- new MetricRegistry(MetricRegistryConfiguration.fromConfiguration(config)).shutdown();
-
- Assert.assertEquals("hello", TestReporter2.mc.getString("arg1", null));
- Assert.assertEquals("world", TestReporter2.mc.getString("arg2", null));
- }
-
- /**
- * Reporter that exposes the {@link MetricConfig} it was given.
- */
- protected static class TestReporter2 extends TestReporter {
- static MetricConfig mc;
- @Override
- public void open(MetricConfig config) {
- mc = config;
- }
- }
-
- /**
- * Verifies that reporters implementing the Scheduled interface are regularly called to report the metrics.
- *
- * @throws InterruptedException
- */
- @Test
- public void testReporterScheduling() throws InterruptedException {
- Configuration config = new Configuration();
-
- config.setString(MetricOptions.REPORTERS_LIST, "test");
- config.setString(ConfigConstants.METRICS_REPORTER_PREFIX + "test." + ConfigConstants.METRICS_REPORTER_CLASS_SUFFIX, TestReporter3.class.getName());
- config.setString(ConfigConstants.METRICS_REPORTER_PREFIX + "test.arg1", "hello");
- config.setString(ConfigConstants.METRICS_REPORTER_PREFIX + "test." + ConfigConstants.METRICS_REPORTER_INTERVAL_SUFFIX, "50 MILLISECONDS");
-
- MetricRegistry registry = new MetricRegistry(MetricRegistryConfiguration.fromConfiguration(config));
-
- long start = System.currentTimeMillis();
-
- // only start counting from now on
- TestReporter3.reportCount = 0;
-
- for (int x = 0; x < 10; x++) {
- Thread.sleep(100);
- int reportCount = TestReporter3.reportCount;
- long curT = System.currentTimeMillis();
- /**
- * Within a given time-frame T only T/500 reports may be triggered due to the interval between reports.
- * This value however does not not take the first triggered report into account (=> +1).
- * Furthermore we have to account for the mis-alignment between reports being triggered and our time
- * measurement (=> +1); for T=200 a total of 4-6 reports may have been
- * triggered depending on whether the end of the interval for the first reports ends before
- * or after T=50.
- */
- long maxAllowedReports = (curT - start) / 50 + 2;
- Assert.assertTrue("Too many reports were triggered.", maxAllowedReports >= reportCount);
- }
- Assert.assertTrue("No report was triggered.", TestReporter3.reportCount > 0);
-
- registry.shutdown();
- }
-
- /**
- * Reporter that exposes how often report() was called.
- */
- protected static class TestReporter3 extends TestReporter implements Scheduled {
- public static int reportCount = 0;
-
- @Override
- public void report() {
- reportCount++;
- }
- }
-
- /**
- * Verifies that reporters are notified of added/removed metrics.
- */
- @Test
- public void testReporterNotifications() {
- Configuration config = new Configuration();
- config.setString(MetricOptions.REPORTERS_LIST, "test1,test2");
- config.setString(ConfigConstants.METRICS_REPORTER_PREFIX + "test1." + ConfigConstants.METRICS_REPORTER_CLASS_SUFFIX, TestReporter6.class.getName());
- config.setString(ConfigConstants.METRICS_REPORTER_PREFIX + "test2." + ConfigConstants.METRICS_REPORTER_CLASS_SUFFIX, TestReporter7.class.getName());
-
- MetricRegistry registry = new MetricRegistry(MetricRegistryConfiguration.fromConfiguration(config));
-
- TaskManagerMetricGroup root = new TaskManagerMetricGroup(registry, "host", "id");
- root.counter("rootCounter");
-
- assertTrue(TestReporter6.addedMetric instanceof Counter);
- assertEquals("rootCounter", TestReporter6.addedMetricName);
-
- assertTrue(TestReporter7.addedMetric instanceof Counter);
- assertEquals("rootCounter", TestReporter7.addedMetricName);
-
- root.close();
-
- assertTrue(TestReporter6.removedMetric instanceof Counter);
- assertEquals("rootCounter", TestReporter6.removedMetricName);
-
- assertTrue(TestReporter7.removedMetric instanceof Counter);
- assertEquals("rootCounter", TestReporter7.removedMetricName);
-
- registry.shutdown();
- }
-
- /**
- * Reporter that exposes the name and metric instance of the last metric that was added or removed.
- */
- protected static class TestReporter6 extends TestReporter {
- static Metric addedMetric;
- static String addedMetricName;
-
- static Metric removedMetric;
- static String removedMetricName;
-
- @Override
- public void notifyOfAddedMetric(Metric metric, String metricName, MetricGroup group) {
- addedMetric = metric;
- addedMetricName = metricName;
- }
-
- @Override
- public void notifyOfRemovedMetric(Metric metric, String metricName, MetricGroup group) {
- removedMetric = metric;
- removedMetricName = metricName;
- }
- }
-
- /**
- * Reporter that exposes the name and metric instance of the last metric that was added or removed.
- */
- protected static class TestReporter7 extends TestReporter {
- static Metric addedMetric;
- static String addedMetricName;
-
- static Metric removedMetric;
- static String removedMetricName;
-
- @Override
- public void notifyOfAddedMetric(Metric metric, String metricName, MetricGroup group) {
- addedMetric = metric;
- addedMetricName = metricName;
- }
-
- @Override
- public void notifyOfRemovedMetric(Metric metric, String metricName, MetricGroup group) {
- removedMetric = metric;
- removedMetricName = metricName;
- }
- }
-
- /**
- * Verifies that the scope configuration is properly extracted.
- */
- @Test
- public void testScopeConfig() {
- Configuration config = new Configuration();
-
- config.setString(MetricOptions.SCOPE_NAMING_TM, "A");
- config.setString(MetricOptions.SCOPE_NAMING_TM_JOB, "B");
- config.setString(MetricOptions.SCOPE_NAMING_TASK, "C");
- config.setString(MetricOptions.SCOPE_NAMING_OPERATOR, "D");
-
- ScopeFormats scopeConfig = ScopeFormats.fromConfig(config);
-
- assertEquals("A", scopeConfig.getTaskManagerFormat().format());
- assertEquals("B", scopeConfig.getTaskManagerJobFormat().format());
- assertEquals("C", scopeConfig.getTaskFormat().format());
- assertEquals("D", scopeConfig.getOperatorFormat().format());
- }
-
- @Test
- public void testConfigurableDelimiter() {
- Configuration config = new Configuration();
- config.setString(MetricOptions.SCOPE_DELIMITER, "_");
- config.setString(MetricOptions.SCOPE_NAMING_TM, "A.B.C.D.E");
-
- MetricRegistry registry = new MetricRegistry(MetricRegistryConfiguration.fromConfiguration(config));
-
- TaskManagerMetricGroup tmGroup = new TaskManagerMetricGroup(registry, "host", "id");
- assertEquals("A_B_C_D_E_name", tmGroup.getMetricIdentifier("name"));
-
- registry.shutdown();
- }
-
- @Test
- public void testConfigurableDelimiterForReporters() {
- Configuration config = new Configuration();
- config.setString(MetricOptions.REPORTERS_LIST, "test1,test2,test3");
- config.setString(ConfigConstants.METRICS_REPORTER_PREFIX + "test1." + ConfigConstants.METRICS_REPORTER_SCOPE_DELIMITER, "_");
- config.setString(ConfigConstants.METRICS_REPORTER_PREFIX + "test1." + ConfigConstants.METRICS_REPORTER_CLASS_SUFFIX, TestReporter.class.getName());
- config.setString(ConfigConstants.METRICS_REPORTER_PREFIX + "test2." + ConfigConstants.METRICS_REPORTER_SCOPE_DELIMITER, "-");
- config.setString(ConfigConstants.METRICS_REPORTER_PREFIX + "test2." + ConfigConstants.METRICS_REPORTER_CLASS_SUFFIX, TestReporter.class.getName());
- config.setString(ConfigConstants.METRICS_REPORTER_PREFIX + "test3." + ConfigConstants.METRICS_REPORTER_SCOPE_DELIMITER, "AA");
- config.setString(ConfigConstants.METRICS_REPORTER_PREFIX + "test3." + ConfigConstants.METRICS_REPORTER_CLASS_SUFFIX, TestReporter.class.getName());
-
- MetricRegistry registry = new MetricRegistry(MetricRegistryConfiguration.fromConfiguration(config));
-
- assertEquals(GLOBAL_DEFAULT_DELIMITER, registry.getDelimiter());
- assertEquals('_', registry.getDelimiter(0));
- assertEquals('-', registry.getDelimiter(1));
- assertEquals(GLOBAL_DEFAULT_DELIMITER, registry.getDelimiter(2));
- assertEquals(GLOBAL_DEFAULT_DELIMITER, registry.getDelimiter(3));
- assertEquals(GLOBAL_DEFAULT_DELIMITER, registry.getDelimiter(-1));
-
- registry.shutdown();
- }
-
- @Test
- public void testConfigurableDelimiterForReportersInGroup() {
- Configuration config = new Configuration();
- config.setString(MetricOptions.REPORTERS_LIST, "test1,test2,test3,test4");
- config.setString(ConfigConstants.METRICS_REPORTER_PREFIX + "test1." + ConfigConstants.METRICS_REPORTER_SCOPE_DELIMITER, "_");
- config.setString(ConfigConstants.METRICS_REPORTER_PREFIX + "test1." + ConfigConstants.METRICS_REPORTER_CLASS_SUFFIX, TestReporter8.class.getName());
- config.setString(ConfigConstants.METRICS_REPORTER_PREFIX + "test2." + ConfigConstants.METRICS_REPORTER_SCOPE_DELIMITER, "-");
- config.setString(ConfigConstants.METRICS_REPORTER_PREFIX + "test2." + ConfigConstants.METRICS_REPORTER_CLASS_SUFFIX, TestReporter8.class.getName());
- config.setString(ConfigConstants.METRICS_REPORTER_PREFIX + "test3." + ConfigConstants.METRICS_REPORTER_SCOPE_DELIMITER, "AA");
- config.setString(ConfigConstants.METRICS_REPORTER_PREFIX + "test3." + ConfigConstants.METRICS_REPORTER_CLASS_SUFFIX, TestReporter8.class.getName());
- config.setString(ConfigConstants.METRICS_REPORTER_PREFIX + "test4." + ConfigConstants.METRICS_REPORTER_CLASS_SUFFIX, TestReporter8.class.getName());
- config.setString(MetricOptions.SCOPE_NAMING_TM, "A.B");
-
- MetricRegistry registry = new MetricRegistry(MetricRegistryConfiguration.fromConfiguration(config));
- List<MetricReporter> reporters = registry.getReporters();
- ((TestReporter8) reporters.get(0)).expectedDelimiter = '_'; //test1 reporter
- ((TestReporter8) reporters.get(1)).expectedDelimiter = '-'; //test2 reporter
- ((TestReporter8) reporters.get(2)).expectedDelimiter = GLOBAL_DEFAULT_DELIMITER; //test3 reporter, because 'AA' - not correct delimiter
- ((TestReporter8) reporters.get(3)).expectedDelimiter = GLOBAL_DEFAULT_DELIMITER; //for test4 reporter use global delimiter
-
- TaskManagerMetricGroup group = new TaskManagerMetricGroup(registry, "host", "id");
- group.counter("C");
- group.close();
- registry.shutdown();
- assertEquals(4, TestReporter8.numCorrectDelimitersForRegister);
- assertEquals(4, TestReporter8.numCorrectDelimitersForUnregister);
- }
-
- /**
- * Tests that the query actor will be stopped when the MetricRegistry is shut down.
- */
- @Test
- public void testQueryActorShutdown() throws Exception {
- final FiniteDuration timeout = new FiniteDuration(10L, TimeUnit.SECONDS);
-
- MetricRegistry registry = new MetricRegistry(MetricRegistryConfiguration.defaultMetricRegistryConfiguration());
-
- final ActorSystem actorSystem = AkkaUtils.createDefaultActorSystem();
-
- registry.startQueryService(actorSystem, null);
-
- ActorRef queryServiceActor = registry.getQueryService();
-
- registry.shutdown();
-
- try {
- Await.result(actorSystem.actorSelection(queryServiceActor.path()).resolveOne(timeout), timeout);
-
- fail("The query actor should be terminated resulting in a ActorNotFound exception.");
- } catch (ActorNotFound e) {
- // we expect the query actor to be shut down
- }
- }
-
- /**
- * Reporter that verifies that the configured delimiter is applied correctly when generating the metric identifier.
- */
- public static class TestReporter8 extends TestReporter {
- char expectedDelimiter;
- public static int numCorrectDelimitersForRegister = 0;
- public static int numCorrectDelimitersForUnregister = 0;
-
- @Override
- public void notifyOfAddedMetric(Metric metric, String metricName, MetricGroup group) {
- String expectedMetric = "A" + expectedDelimiter + "B" + expectedDelimiter + "C";
- assertEquals(expectedMetric, group.getMetricIdentifier(metricName, this));
- assertEquals(expectedMetric, group.getMetricIdentifier(metricName));
- numCorrectDelimitersForRegister++;
- }
-
- @Override
- public void notifyOfRemovedMetric(Metric metric, String metricName, MetricGroup group) {
- String expectedMetric = "A" + expectedDelimiter + "B" + expectedDelimiter + "C";
- assertEquals(expectedMetric, group.getMetricIdentifier(metricName, this));
- assertEquals(expectedMetric, group.getMetricIdentifier(metricName));
- numCorrectDelimitersForUnregister++;
- }
- }
-
- @Test
- public void testExceptionIsolation() throws Exception {
-
- Configuration config = new Configuration();
- config.setString(MetricOptions.REPORTERS_LIST, "test1,test2");
- config.setString(ConfigConstants.METRICS_REPORTER_PREFIX + "test1." + ConfigConstants.METRICS_REPORTER_CLASS_SUFFIX, FailingReporter.class.getName());
- config.setString(ConfigConstants.METRICS_REPORTER_PREFIX + "test2." + ConfigConstants.METRICS_REPORTER_CLASS_SUFFIX, TestReporter7.class.getName());
-
- MetricRegistry registry = new MetricRegistry(MetricRegistryConfiguration.fromConfiguration(config));
-
- Counter metric = new SimpleCounter();
- registry.register(metric, "counter", new MetricGroupTest.DummyAbstractMetricGroup(registry));
-
- assertEquals(metric, TestReporter7.addedMetric);
- assertEquals("counter", TestReporter7.addedMetricName);
-
- registry.unregister(metric, "counter", new MetricGroupTest.DummyAbstractMetricGroup(registry));
-
- assertEquals(metric, TestReporter7.removedMetric);
- assertEquals("counter", TestReporter7.removedMetricName);
-
- registry.shutdown();
- }
-
- /**
- * Reporter that throws an exception when it is notified of an added or removed metric.
- */
- protected static class FailingReporter extends TestReporter {
- @Override
- public void notifyOfAddedMetric(Metric metric, String metricName, MetricGroup group) {
- throw new RuntimeException();
- }
-
- @Override
- public void notifyOfRemovedMetric(Metric metric, String metricName, MetricGroup group) {
- throw new RuntimeException();
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/flink/blob/d45b9412/flink-runtime/src/test/java/org/apache/flink/runtime/metrics/NoOpMetricRegistry.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/metrics/NoOpMetricRegistry.java b/flink-runtime/src/test/java/org/apache/flink/runtime/metrics/NoOpMetricRegistry.java
new file mode 100644
index 0000000..1140e3d
--- /dev/null
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/metrics/NoOpMetricRegistry.java
@@ -0,0 +1,60 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.flink.runtime.metrics;
+
+import org.apache.flink.configuration.Configuration;
+import org.apache.flink.metrics.Metric;
+import org.apache.flink.runtime.metrics.groups.AbstractMetricGroup;
+import org.apache.flink.runtime.metrics.scope.ScopeFormats;
+
+/**
+ * Metric registry which does nothing and is intended for testing purposes.
+ */
+public class NoOpMetricRegistry implements MetricRegistry {
+
+ final char delimiter = ',';
+
+ final ScopeFormats scopeFormats = ScopeFormats.fromConfig(new Configuration());
+
+ @Override
+ public char getDelimiter() {
+ return delimiter;
+ }
+
+ @Override
+ public char getDelimiter(int index) {
+ return delimiter;
+ }
+
+ @Override
+ public int getNumberReporters() {
+ return 0;
+ }
+
+ @Override
+ public void register(Metric metric, String metricName, AbstractMetricGroup group) {}
+
+ @Override
+ public void unregister(Metric metric, String metricName, AbstractMetricGroup group) {}
+
+ @Override
+ public ScopeFormats getScopeFormats() {
+ return scopeFormats;
+ }
+}
http://git-wip-us.apache.org/repos/asf/flink/blob/d45b9412/flink-runtime/src/test/java/org/apache/flink/runtime/metrics/TaskManagerMetricsTest.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/metrics/TaskManagerMetricsTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/metrics/TaskManagerMetricsTest.java
index cea0928..31304e5 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/metrics/TaskManagerMetricsTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/metrics/TaskManagerMetricsTest.java
@@ -61,6 +61,9 @@ public class TaskManagerMetricsTest extends TestLogger {
HighAvailabilityServices highAvailabilityServices = new EmbeddedHaServices(TestingUtils.defaultExecutor());
+ final MetricRegistryImpl metricRegistry = new MetricRegistryImpl(
+ MetricRegistryConfiguration.fromConfiguration(new Configuration()));
+
try {
actorSystem = AkkaUtils.createLocalActorSystem(new Configuration());
@@ -73,6 +76,7 @@ public class TaskManagerMetricsTest extends TestLogger {
TestingUtils.defaultExecutor(),
TestingUtils.defaultExecutor(),
highAvailabilityServices,
+ new NoOpMetricRegistry(),
Option.empty(),
JobManager.class,
MemoryArchivist.class)._1();
@@ -89,9 +93,9 @@ public class TaskManagerMetricsTest extends TestLogger {
TaskManagerConfiguration taskManagerConfiguration = TaskManagerConfiguration.fromConfiguration(config);
TaskManagerServices taskManagerServices = TaskManagerServices.fromConfiguration(
- taskManagerServicesConfiguration, tmResourceID);
-
- final MetricRegistry tmRegistry = taskManagerServices.getMetricRegistry();
+ taskManagerServicesConfiguration,
+ tmResourceID,
+ metricRegistry);
// create the task manager
final Props tmProps = TaskManager.getTaskManagerProps(
@@ -103,7 +107,7 @@ public class TaskManagerMetricsTest extends TestLogger {
taskManagerServices.getIOManager(),
taskManagerServices.getNetworkEnvironment(),
highAvailabilityServices,
- tmRegistry);
+ taskManagerServices.getTaskManagerMetricGroup());
final ActorRef taskManager = actorSystem.actorOf(tmProps);
@@ -135,7 +139,7 @@ public class TaskManagerMetricsTest extends TestLogger {
}};
// verify that the registry was not shutdown due to the disconnect
- Assert.assertFalse(tmRegistry.isShutdown());
+ Assert.assertFalse(metricRegistry.isShutdown());
// shut down the actors and the actor system
actorSystem.shutdown();
@@ -148,6 +152,8 @@ public class TaskManagerMetricsTest extends TestLogger {
if (highAvailabilityServices != null) {
highAvailabilityServices.closeAndCleanupAllData();
}
+
+ metricRegistry.shutdown();
}
}
}
http://git-wip-us.apache.org/repos/asf/flink/blob/d45b9412/flink-runtime/src/test/java/org/apache/flink/runtime/metrics/dump/MetricQueryServiceTest.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/metrics/dump/MetricQueryServiceTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/metrics/dump/MetricQueryServiceTest.java
index 5c33ad6..55ba3a9 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/metrics/dump/MetricQueryServiceTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/metrics/dump/MetricQueryServiceTest.java
@@ -25,8 +25,8 @@ import org.apache.flink.metrics.Histogram;
import org.apache.flink.metrics.Meter;
import org.apache.flink.metrics.SimpleCounter;
import org.apache.flink.runtime.akka.AkkaUtils;
-import org.apache.flink.runtime.metrics.MetricRegistry;
import org.apache.flink.runtime.metrics.MetricRegistryConfiguration;
+import org.apache.flink.runtime.metrics.MetricRegistryImpl;
import org.apache.flink.runtime.metrics.groups.TaskManagerMetricGroup;
import org.apache.flink.runtime.metrics.util.TestingHistogram;
import org.apache.flink.util.TestLogger;
@@ -82,7 +82,7 @@ public class MetricQueryServiceTest extends TestLogger {
}
};
- MetricRegistry registry = new MetricRegistry(MetricRegistryConfiguration.defaultMetricRegistryConfiguration());
+ MetricRegistryImpl registry = new MetricRegistryImpl(MetricRegistryConfiguration.defaultMetricRegistryConfiguration());
final TaskManagerMetricGroup tm = new TaskManagerMetricGroup(registry, "host", "id");
MetricQueryService.notifyOfAddedMetric(serviceActor, c, "counter", tm);
http://git-wip-us.apache.org/repos/asf/flink/blob/d45b9412/flink-runtime/src/test/java/org/apache/flink/runtime/metrics/groups/AbstractMetricGroupTest.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/metrics/groups/AbstractMetricGroupTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/metrics/groups/AbstractMetricGroupTest.java
index 648ee47..8d91b81 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/metrics/groups/AbstractMetricGroupTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/metrics/groups/AbstractMetricGroupTest.java
@@ -25,8 +25,8 @@ import org.apache.flink.metrics.CharacterFilter;
import org.apache.flink.metrics.Metric;
import org.apache.flink.metrics.MetricGroup;
import org.apache.flink.metrics.reporter.MetricReporter;
-import org.apache.flink.runtime.metrics.MetricRegistry;
import org.apache.flink.runtime.metrics.MetricRegistryConfiguration;
+import org.apache.flink.runtime.metrics.MetricRegistryImpl;
import org.apache.flink.runtime.metrics.dump.QueryScopeInfo;
import org.apache.flink.runtime.metrics.util.TestReporter;
@@ -45,7 +45,7 @@ public class AbstractMetricGroupTest {
*/
@Test
public void testGetAllVariables() {
- MetricRegistry registry = new MetricRegistry(MetricRegistryConfiguration.defaultMetricRegistryConfiguration());
+ MetricRegistryImpl registry = new MetricRegistryImpl(MetricRegistryConfiguration.defaultMetricRegistryConfiguration());
AbstractMetricGroup group = new AbstractMetricGroup<AbstractMetricGroup<?>>(registry, new String[0], null) {
@Override
@@ -90,7 +90,7 @@ public class AbstractMetricGroupTest {
config.setString(ConfigConstants.METRICS_REPORTER_PREFIX + "test2." + ConfigConstants.METRICS_REPORTER_CLASS_SUFFIX, TestReporter2.class.getName());
config.setString(ConfigConstants.METRICS_REPORTER_PREFIX + "test2." + ConfigConstants.METRICS_REPORTER_SCOPE_DELIMITER, "!");
- MetricRegistry testRegistry = new MetricRegistry(MetricRegistryConfiguration.fromConfiguration(config));
+ MetricRegistryImpl testRegistry = new MetricRegistryImpl(MetricRegistryConfiguration.fromConfiguration(config));
try {
MetricGroup tmGroup = new TaskManagerMetricGroup(testRegistry, "host", "id");
tmGroup.counter("1");
@@ -180,7 +180,7 @@ public class AbstractMetricGroupTest {
public void testScopeGenerationWithoutReporters() {
Configuration config = new Configuration();
config.setString(MetricOptions.SCOPE_NAMING_TM, "A.B.C.D");
- MetricRegistry testRegistry = new MetricRegistry(MetricRegistryConfiguration.fromConfiguration(config));
+ MetricRegistryImpl testRegistry = new MetricRegistryImpl(MetricRegistryConfiguration.fromConfiguration(config));
try {
TaskManagerMetricGroup group = new TaskManagerMetricGroup(testRegistry, "host", "id");
http://git-wip-us.apache.org/repos/asf/flink/blob/d45b9412/flink-runtime/src/test/java/org/apache/flink/runtime/metrics/groups/JobManagerGroupTest.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/metrics/groups/JobManagerGroupTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/metrics/groups/JobManagerGroupTest.java
index 03341a6..05a72ac 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/metrics/groups/JobManagerGroupTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/metrics/groups/JobManagerGroupTest.java
@@ -22,8 +22,8 @@ import org.apache.flink.api.common.JobID;
import org.apache.flink.configuration.Configuration;
import org.apache.flink.configuration.MetricOptions;
import org.apache.flink.runtime.jobgraph.JobGraph;
-import org.apache.flink.runtime.metrics.MetricRegistry;
import org.apache.flink.runtime.metrics.MetricRegistryConfiguration;
+import org.apache.flink.runtime.metrics.MetricRegistryImpl;
import org.apache.flink.runtime.metrics.dump.QueryScopeInfo;
import org.apache.flink.runtime.metrics.util.DummyCharacterFilter;
import org.apache.flink.util.TestLogger;
@@ -45,7 +45,7 @@ public class JobManagerGroupTest extends TestLogger {
@Test
public void addAndRemoveJobs() {
- MetricRegistry registry = new MetricRegistry(MetricRegistryConfiguration.defaultMetricRegistryConfiguration());
+ MetricRegistryImpl registry = new MetricRegistryImpl(MetricRegistryConfiguration.defaultMetricRegistryConfiguration());
final JobManagerMetricGroup group = new JobManagerMetricGroup(registry, "localhost");
final JobID jid1 = new JobID();
@@ -77,7 +77,7 @@ public class JobManagerGroupTest extends TestLogger {
@Test
public void testCloseClosesAll() {
- MetricRegistry registry = new MetricRegistry(MetricRegistryConfiguration.defaultMetricRegistryConfiguration());
+ MetricRegistryImpl registry = new MetricRegistryImpl(MetricRegistryConfiguration.defaultMetricRegistryConfiguration());
final JobManagerMetricGroup group = new JobManagerMetricGroup(registry, "localhost");
final JobID jid1 = new JobID();
@@ -103,7 +103,7 @@ public class JobManagerGroupTest extends TestLogger {
@Test
public void testGenerateScopeDefault() {
- MetricRegistry registry = new MetricRegistry(MetricRegistryConfiguration.defaultMetricRegistryConfiguration());
+ MetricRegistryImpl registry = new MetricRegistryImpl(MetricRegistryConfiguration.defaultMetricRegistryConfiguration());
JobManagerMetricGroup group = new JobManagerMetricGroup(registry, "localhost");
assertArrayEquals(new String[]{"localhost", "jobmanager"}, group.getScopeComponents());
@@ -116,7 +116,7 @@ public class JobManagerGroupTest extends TestLogger {
public void testGenerateScopeCustom() {
Configuration cfg = new Configuration();
cfg.setString(MetricOptions.SCOPE_NAMING_JM, "constant.<host>.foo.<host>");
- MetricRegistry registry = new MetricRegistry(MetricRegistryConfiguration.fromConfiguration(cfg));
+ MetricRegistryImpl registry = new MetricRegistryImpl(MetricRegistryConfiguration.fromConfiguration(cfg));
JobManagerMetricGroup group = new JobManagerMetricGroup(registry, "host");
@@ -128,7 +128,7 @@ public class JobManagerGroupTest extends TestLogger {
@Test
public void testCreateQueryServiceMetricInfo() {
- MetricRegistry registry = new MetricRegistry(MetricRegistryConfiguration.defaultMetricRegistryConfiguration());
+ MetricRegistryImpl registry = new MetricRegistryImpl(MetricRegistryConfiguration.defaultMetricRegistryConfiguration());
JobManagerMetricGroup jm = new JobManagerMetricGroup(registry, "host");
QueryScopeInfo.JobManagerQueryScopeInfo info = jm.createQueryServiceMetricInfo(new DummyCharacterFilter());
http://git-wip-us.apache.org/repos/asf/flink/blob/d45b9412/flink-runtime/src/test/java/org/apache/flink/runtime/metrics/groups/JobManagerJobGroupTest.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/metrics/groups/JobManagerJobGroupTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/metrics/groups/JobManagerJobGroupTest.java
index d734dfd..4373f80 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/metrics/groups/JobManagerJobGroupTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/metrics/groups/JobManagerJobGroupTest.java
@@ -21,8 +21,8 @@ package org.apache.flink.runtime.metrics.groups;
import org.apache.flink.api.common.JobID;
import org.apache.flink.configuration.Configuration;
import org.apache.flink.configuration.MetricOptions;
-import org.apache.flink.runtime.metrics.MetricRegistry;
import org.apache.flink.runtime.metrics.MetricRegistryConfiguration;
+import org.apache.flink.runtime.metrics.MetricRegistryImpl;
import org.apache.flink.runtime.metrics.dump.QueryScopeInfo;
import org.apache.flink.runtime.metrics.util.DummyCharacterFilter;
import org.apache.flink.util.TestLogger;
@@ -39,7 +39,7 @@ public class JobManagerJobGroupTest extends TestLogger {
@Test
public void testGenerateScopeDefault() {
- MetricRegistry registry = new MetricRegistry(MetricRegistryConfiguration.defaultMetricRegistryConfiguration());
+ MetricRegistryImpl registry = new MetricRegistryImpl(MetricRegistryConfiguration.defaultMetricRegistryConfiguration());
JobManagerMetricGroup tmGroup = new JobManagerMetricGroup(registry, "theHostName");
JobMetricGroup jmGroup = new JobManagerJobMetricGroup(registry, tmGroup, new JobID(), "myJobName");
@@ -60,7 +60,7 @@ public class JobManagerJobGroupTest extends TestLogger {
Configuration cfg = new Configuration();
cfg.setString(MetricOptions.SCOPE_NAMING_JM, "abc");
cfg.setString(MetricOptions.SCOPE_NAMING_JM_JOB, "some-constant.<job_name>");
- MetricRegistry registry = new MetricRegistry(MetricRegistryConfiguration.fromConfiguration(cfg));
+ MetricRegistryImpl registry = new MetricRegistryImpl(MetricRegistryConfiguration.fromConfiguration(cfg));
JobID jid = new JobID();
@@ -83,7 +83,7 @@ public class JobManagerJobGroupTest extends TestLogger {
Configuration cfg = new Configuration();
cfg.setString(MetricOptions.SCOPE_NAMING_JM, "peter");
cfg.setString(MetricOptions.SCOPE_NAMING_JM_JOB, "*.some-constant.<job_id>");
- MetricRegistry registry = new MetricRegistry(MetricRegistryConfiguration.fromConfiguration(cfg));
+ MetricRegistryImpl registry = new MetricRegistryImpl(MetricRegistryConfiguration.fromConfiguration(cfg));
JobID jid = new JobID();
@@ -104,7 +104,7 @@ public class JobManagerJobGroupTest extends TestLogger {
@Test
public void testCreateQueryServiceMetricInfo() {
JobID jid = new JobID();
- MetricRegistry registry = new MetricRegistry(MetricRegistryConfiguration.defaultMetricRegistryConfiguration());
+ MetricRegistryImpl registry = new MetricRegistryImpl(MetricRegistryConfiguration.defaultMetricRegistryConfiguration());
JobManagerMetricGroup jm = new JobManagerMetricGroup(registry, "host");
JobManagerJobMetricGroup jmj = new JobManagerJobMetricGroup(registry, jm, jid, "jobname");
http://git-wip-us.apache.org/repos/asf/flink/blob/d45b9412/flink-runtime/src/test/java/org/apache/flink/runtime/metrics/groups/MetricGroupRegistrationTest.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/metrics/groups/MetricGroupRegistrationTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/metrics/groups/MetricGroupRegistrationTest.java
index 56ce5fa..324bb73 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/metrics/groups/MetricGroupRegistrationTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/metrics/groups/MetricGroupRegistrationTest.java
@@ -27,9 +27,10 @@ import org.apache.flink.metrics.Histogram;
import org.apache.flink.metrics.HistogramStatistics;
import org.apache.flink.metrics.Metric;
import org.apache.flink.metrics.MetricGroup;
-import org.apache.flink.runtime.metrics.MetricRegistry;
import org.apache.flink.runtime.metrics.MetricRegistryConfiguration;
+import org.apache.flink.runtime.metrics.MetricRegistryImpl;
import org.apache.flink.runtime.metrics.util.TestReporter;
+import org.apache.flink.util.TestLogger;
import org.junit.Assert;
import org.junit.Test;
@@ -39,7 +40,7 @@ import static org.junit.Assert.assertEquals;
/**
* Tests for the registration of groups and metrics on a {@link MetricGroup}.
*/
-public class MetricGroupRegistrationTest {
+public class MetricGroupRegistrationTest extends TestLogger {
/**
* Verifies that group methods instantiate the correct metric with the given name.
*/
@@ -49,7 +50,7 @@ public class MetricGroupRegistrationTest {
config.setString(MetricOptions.REPORTERS_LIST, "test");
config.setString(ConfigConstants.METRICS_REPORTER_PREFIX + "test." + ConfigConstants.METRICS_REPORTER_CLASS_SUFFIX, TestReporter1.class.getName());
- MetricRegistry registry = new MetricRegistry(MetricRegistryConfiguration.fromConfiguration(config));
+ MetricRegistryImpl registry = new MetricRegistryImpl(MetricRegistryConfiguration.fromConfiguration(config));
MetricGroup root = new TaskManagerMetricGroup(registry, "host", "id");
@@ -111,7 +112,7 @@ public class MetricGroupRegistrationTest {
public void testDuplicateGroupName() {
Configuration config = new Configuration();
- MetricRegistry registry = new MetricRegistry(MetricRegistryConfiguration.fromConfiguration(config));
+ MetricRegistryImpl registry = new MetricRegistryImpl(MetricRegistryConfiguration.fromConfiguration(config));
MetricGroup root = new TaskManagerMetricGroup(registry, "host", "id");
http://git-wip-us.apache.org/repos/asf/flink/blob/d45b9412/flink-runtime/src/test/java/org/apache/flink/runtime/metrics/groups/MetricGroupTest.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/metrics/groups/MetricGroupTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/metrics/groups/MetricGroupTest.java
index 633dbed..94760e6 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/metrics/groups/MetricGroupTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/metrics/groups/MetricGroupTest.java
@@ -26,6 +26,7 @@ import org.apache.flink.metrics.MetricGroup;
import org.apache.flink.runtime.jobgraph.JobVertexID;
import org.apache.flink.runtime.metrics.MetricRegistry;
import org.apache.flink.runtime.metrics.MetricRegistryConfiguration;
+import org.apache.flink.runtime.metrics.MetricRegistryImpl;
import org.apache.flink.runtime.metrics.dump.QueryScopeInfo;
import org.apache.flink.runtime.metrics.util.DummyCharacterFilter;
import org.apache.flink.util.AbstractID;
@@ -48,13 +49,13 @@ public class MetricGroupTest extends TestLogger {
private static final MetricRegistryConfiguration defaultMetricRegistryConfiguration = MetricRegistryConfiguration.defaultMetricRegistryConfiguration();
- private MetricRegistry registry;
+ private MetricRegistryImpl registry;
- private final MetricRegistry exceptionOnRegister = new ExceptionOnRegisterRegistry();
+ private final MetricRegistryImpl exceptionOnRegister = new ExceptionOnRegisterRegistry();
@Before
public void createRegistry() {
- this.registry = new MetricRegistry(defaultMetricRegistryConfiguration);
+ this.registry = new MetricRegistryImpl(defaultMetricRegistryConfiguration);
}
@After
@@ -134,7 +135,7 @@ public class MetricGroupTest extends TestLogger {
JobID jid = new JobID();
JobVertexID vid = new JobVertexID();
AbstractID eid = new AbstractID();
- MetricRegistry registry = new MetricRegistry(defaultMetricRegistryConfiguration);
+ MetricRegistryImpl registry = new MetricRegistryImpl(defaultMetricRegistryConfiguration);
TaskManagerMetricGroup tm = new TaskManagerMetricGroup(registry, "host", "id");
TaskManagerJobMetricGroup job = new TaskManagerJobMetricGroup(registry, tm, jid, "jobname");
TaskMetricGroup task = new TaskMetricGroup(registry, job, vid, eid, "taskName", 4, 5);
@@ -156,7 +157,7 @@ public class MetricGroupTest extends TestLogger {
// ------------------------------------------------------------------------
- private static class ExceptionOnRegisterRegistry extends MetricRegistry {
+ private static class ExceptionOnRegisterRegistry extends MetricRegistryImpl {
public ExceptionOnRegisterRegistry() {
super(defaultMetricRegistryConfiguration);
http://git-wip-us.apache.org/repos/asf/flink/blob/d45b9412/flink-runtime/src/test/java/org/apache/flink/runtime/metrics/groups/OperatorGroupTest.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/metrics/groups/OperatorGroupTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/metrics/groups/OperatorGroupTest.java
index 4363a9d..820b73e 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/metrics/groups/OperatorGroupTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/metrics/groups/OperatorGroupTest.java
@@ -24,8 +24,8 @@ import org.apache.flink.configuration.MetricOptions;
import org.apache.flink.runtime.executiongraph.ExecutionAttemptID;
import org.apache.flink.runtime.jobgraph.JobVertexID;
import org.apache.flink.runtime.jobgraph.OperatorID;
-import org.apache.flink.runtime.metrics.MetricRegistry;
import org.apache.flink.runtime.metrics.MetricRegistryConfiguration;
+import org.apache.flink.runtime.metrics.MetricRegistryImpl;
import org.apache.flink.runtime.metrics.dump.QueryScopeInfo;
import org.apache.flink.runtime.metrics.scope.ScopeFormat;
import org.apache.flink.runtime.metrics.util.DummyCharacterFilter;
@@ -47,7 +47,7 @@ public class OperatorGroupTest extends TestLogger {
@Test
public void testGenerateScopeDefault() {
- MetricRegistry registry = new MetricRegistry(MetricRegistryConfiguration.defaultMetricRegistryConfiguration());
+ MetricRegistryImpl registry = new MetricRegistryImpl(MetricRegistryConfiguration.defaultMetricRegistryConfiguration());
TaskManagerMetricGroup tmGroup = new TaskManagerMetricGroup(registry, "theHostName", "test-tm-id");
TaskManagerJobMetricGroup jmGroup = new TaskManagerJobMetricGroup(registry, tmGroup, new JobID(), "myJobName");
@@ -70,7 +70,7 @@ public class OperatorGroupTest extends TestLogger {
public void testGenerateScopeCustom() {
Configuration cfg = new Configuration();
cfg.setString(MetricOptions.SCOPE_NAMING_OPERATOR, "<tm_id>.<job_id>.<task_id>.<operator_name>.<operator_id>");
- MetricRegistry registry = new MetricRegistry(MetricRegistryConfiguration.fromConfiguration(cfg));
+ MetricRegistryImpl registry = new MetricRegistryImpl(MetricRegistryConfiguration.fromConfiguration(cfg));
try {
String tmID = "test-tm-id";
JobID jid = new JobID();
@@ -97,7 +97,7 @@ public class OperatorGroupTest extends TestLogger {
@Test
public void testIOMetricGroupInstantiation() {
- MetricRegistry registry = new MetricRegistry(MetricRegistryConfiguration.defaultMetricRegistryConfiguration());
+ MetricRegistryImpl registry = new MetricRegistryImpl(MetricRegistryConfiguration.defaultMetricRegistryConfiguration());
TaskManagerMetricGroup tmGroup = new TaskManagerMetricGroup(registry, "theHostName", "test-tm-id");
TaskManagerJobMetricGroup jmGroup = new TaskManagerJobMetricGroup(registry, tmGroup, new JobID(), "myJobName");
@@ -114,7 +114,7 @@ public class OperatorGroupTest extends TestLogger {
@Test
public void testVariables() {
- MetricRegistry registry = new MetricRegistry(MetricRegistryConfiguration.defaultMetricRegistryConfiguration());
+ MetricRegistryImpl registry = new MetricRegistryImpl(MetricRegistryConfiguration.defaultMetricRegistryConfiguration());
JobID jid = new JobID();
JobVertexID tid = new JobVertexID();
@@ -156,7 +156,7 @@ public class OperatorGroupTest extends TestLogger {
JobVertexID vid = new JobVertexID();
AbstractID eid = new AbstractID();
OperatorID oid = new OperatorID();
- MetricRegistry registry = new MetricRegistry(MetricRegistryConfiguration.defaultMetricRegistryConfiguration());
+ MetricRegistryImpl registry = new MetricRegistryImpl(MetricRegistryConfiguration.defaultMetricRegistryConfiguration());
TaskManagerMetricGroup tm = new TaskManagerMetricGroup(registry, "host", "id");
TaskManagerJobMetricGroup job = new TaskManagerJobMetricGroup(registry, tm, jid, "jobname");
TaskMetricGroup task = new TaskMetricGroup(registry, job, vid, eid, "taskName", 4, 5);
http://git-wip-us.apache.org/repos/asf/flink/blob/d45b9412/flink-runtime/src/test/java/org/apache/flink/runtime/metrics/groups/TaskManagerGroupTest.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/metrics/groups/TaskManagerGroupTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/metrics/groups/TaskManagerGroupTest.java
index bd85303..3272f73 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/metrics/groups/TaskManagerGroupTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/metrics/groups/TaskManagerGroupTest.java
@@ -23,8 +23,8 @@ import org.apache.flink.configuration.Configuration;
import org.apache.flink.configuration.MetricOptions;
import org.apache.flink.runtime.executiongraph.ExecutionAttemptID;
import org.apache.flink.runtime.jobgraph.JobVertexID;
-import org.apache.flink.runtime.metrics.MetricRegistry;
import org.apache.flink.runtime.metrics.MetricRegistryConfiguration;
+import org.apache.flink.runtime.metrics.MetricRegistryImpl;
import org.apache.flink.runtime.metrics.dump.QueryScopeInfo;
import org.apache.flink.runtime.metrics.util.DummyCharacterFilter;
import org.apache.flink.util.AbstractID;
@@ -50,7 +50,7 @@ public class TaskManagerGroupTest extends TestLogger {
@Test
public void addAndRemoveJobs() throws IOException {
- MetricRegistry registry = new MetricRegistry(MetricRegistryConfiguration.defaultMetricRegistryConfiguration());
+ MetricRegistryImpl registry = new MetricRegistryImpl(MetricRegistryConfiguration.defaultMetricRegistryConfiguration());
final TaskManagerMetricGroup group = new TaskManagerMetricGroup(
registry, "localhost", new AbstractID().toString());
@@ -112,7 +112,7 @@ public class TaskManagerGroupTest extends TestLogger {
@Test
public void testCloseClosesAll() throws IOException {
- MetricRegistry registry = new MetricRegistry(MetricRegistryConfiguration.defaultMetricRegistryConfiguration());
+ MetricRegistryImpl registry = new MetricRegistryImpl(MetricRegistryConfiguration.defaultMetricRegistryConfiguration());
final TaskManagerMetricGroup group = new TaskManagerMetricGroup(
registry, "localhost", new AbstractID().toString());
@@ -152,7 +152,7 @@ public class TaskManagerGroupTest extends TestLogger {
@Test
public void testGenerateScopeDefault() {
- MetricRegistry registry = new MetricRegistry(MetricRegistryConfiguration.defaultMetricRegistryConfiguration());
+ MetricRegistryImpl registry = new MetricRegistryImpl(MetricRegistryConfiguration.defaultMetricRegistryConfiguration());
TaskManagerMetricGroup group = new TaskManagerMetricGroup(registry, "localhost", "id");
assertArrayEquals(new String[]{"localhost", "taskmanager", "id"}, group.getScopeComponents());
@@ -164,7 +164,7 @@ public class TaskManagerGroupTest extends TestLogger {
public void testGenerateScopeCustom() {
Configuration cfg = new Configuration();
cfg.setString(MetricOptions.SCOPE_NAMING_TM, "constant.<host>.foo.<host>");
- MetricRegistry registry = new MetricRegistry(MetricRegistryConfiguration.fromConfiguration(cfg));
+ MetricRegistryImpl registry = new MetricRegistryImpl(MetricRegistryConfiguration.fromConfiguration(cfg));
TaskManagerMetricGroup group = new TaskManagerMetricGroup(registry, "host", "id");
assertArrayEquals(new String[]{"constant", "host", "foo", "host"}, group.getScopeComponents());
@@ -174,7 +174,7 @@ public class TaskManagerGroupTest extends TestLogger {
@Test
public void testCreateQueryServiceMetricInfo() {
- MetricRegistry registry = new MetricRegistry(MetricRegistryConfiguration.defaultMetricRegistryConfiguration());
+ MetricRegistryImpl registry = new MetricRegistryImpl(MetricRegistryConfiguration.defaultMetricRegistryConfiguration());
TaskManagerMetricGroup tm = new TaskManagerMetricGroup(registry, "host", "id");
QueryScopeInfo.TaskManagerQueryScopeInfo info = tm.createQueryServiceMetricInfo(new DummyCharacterFilter());