From bc4aa8c3d9b057a6d35b620eb8e00048137e9361 Mon Sep 17 00:00:00 2001 From: Bowen Li Date: Wed, 27 Sep 2017 15:30:02 -0700 Subject: [PATCH 1/2] [FLINK-7724] add extra metrics to MetricStoreTest.setupStore --- .../legacy/messages/JobMetricsOverview.java | 25 +++++++++++++++++++ .../messages/JobMetricsHandlerHeaders.java | 4 +++ .../metrics/AbstractMetricsHandlerTest.java | 15 +++++------ .../legacy/metrics/JobMetricsHandlerTest.java | 1 + .../metrics/JobVertexMetricsHandlerTest.java | 6 ++--- .../legacy/metrics/MetricStoreTest.java | 14 ++++++++--- 6 files changed, 51 insertions(+), 14 deletions(-) create mode 100644 flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/legacy/messages/JobMetricsOverview.java create mode 100644 flink-runtime/src/main/java/org/apache/flink/runtime/rest/messages/JobMetricsHandlerHeaders.java diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/legacy/messages/JobMetricsOverview.java b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/legacy/messages/JobMetricsOverview.java new file mode 100644 index 0000000000000..eddd10a941218 --- /dev/null +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/legacy/messages/JobMetricsOverview.java @@ -0,0 +1,25 @@ +package org.apache.flink.runtime.rest.handler.legacy.messages; + +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonProperty; +import org.apache.flink.runtime.rest.messages.ResponseBody; + +import java.util.Map; + +public class JobMetricsOverview implements ResponseBody { + + public static final String FIELD_NAME_METRICS = "metrics"; + + @JsonProperty(FIELD_NAME_METRICS) + private final Map metrics; + + @JsonCreator + public JobMetricsOverview( + @JsonProperty(FIELD_NAME_METRICS) Map metrics) { + this.metrics = metrics; + } + + public Map getMetrics() { + return metrics; + } +} diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/messages/JobMetricsHandlerHeaders.java b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/messages/JobMetricsHandlerHeaders.java new file mode 100644 index 0000000000000..82845320f4741 --- /dev/null +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/messages/JobMetricsHandlerHeaders.java @@ -0,0 +1,4 @@ +package org.apache.flink.runtime.rest.messages; + +public class JobMetricsHandlerHeaders { +} diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/rest/handler/legacy/metrics/AbstractMetricsHandlerTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/rest/handler/legacy/metrics/AbstractMetricsHandlerTest.java index 7cbbdc1b66e8b..8c38e7929b32a 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/rest/handler/legacy/metrics/AbstractMetricsHandlerTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/rest/handler/legacy/metrics/AbstractMetricsHandlerTest.java @@ -61,30 +61,31 @@ public void testHandleRequest() throws Exception { String availableList = handler.handleJsonRequest(pathParams, queryParams, null).get(); assertEquals("[" + - "{\"id\":\"8.opname.abc.metric5\"}," + - "{\"id\":\"8.abc.metric4\"}" + + "{\"id\":\"8.opname.abc.metric6\"}," + + "{\"id\":\"8.opname.abc.metric7\"}," + + "{\"id\":\"8.abc.metric5\"}" + "]", availableList); // get value for a single metric - queryParams.put("get", "8.opname.abc.metric5"); + queryParams.put("get", "8.opname.abc.metric6"); String metricValue = handler.handleJsonRequest(pathParams, queryParams, null).get(); assertEquals("[" + - "{\"id\":\"8.opname.abc.metric5\",\"value\":\"4\"}" + + "{\"id\":\"8.opname.abc.metric6\",\"value\":\"5\"}" + "]" , metricValue ); // get values for multiple metrics - queryParams.put("get", "8.opname.abc.metric5,8.abc.metric4"); + queryParams.put("get", "8.opname.abc.metric6,8.abc.metric5"); String metricValues = handler.handleJsonRequest(pathParams, queryParams, null).get(); assertEquals("[" + - "{\"id\":\"8.opname.abc.metric5\",\"value\":\"4\"}," + - "{\"id\":\"8.abc.metric4\",\"value\":\"3\"}" + + "{\"id\":\"8.opname.abc.metric6\",\"value\":\"5\"}," + + "{\"id\":\"8.abc.metric5\",\"value\":\"4\"}" + "]", metricValues ); diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/rest/handler/legacy/metrics/JobMetricsHandlerTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/rest/handler/legacy/metrics/JobMetricsHandlerTest.java index 4b28e6543353c..97ccd0717ead6 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/rest/handler/legacy/metrics/JobMetricsHandlerTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/rest/handler/legacy/metrics/JobMetricsHandlerTest.java @@ -64,6 +64,7 @@ public void getMapFor() throws Exception { Map metrics = handler.getMapFor(pathParams, store); assertEquals("2", metrics.get("abc.metric3")); + assertEquals("3", metrics.get("abc.metric4")); } @Test diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/rest/handler/legacy/metrics/JobVertexMetricsHandlerTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/rest/handler/legacy/metrics/JobVertexMetricsHandlerTest.java index c1304c4955f4d..1dee996722eea 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/rest/handler/legacy/metrics/JobVertexMetricsHandlerTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/rest/handler/legacy/metrics/JobVertexMetricsHandlerTest.java @@ -65,9 +65,9 @@ public void getMapFor() throws Exception { Map metrics = handler.getMapFor(pathParams, store); - assertEquals("3", metrics.get("8.abc.metric4")); - - assertEquals("4", metrics.get("8.opname.abc.metric5")); + assertEquals("4", metrics.get("8.abc.metric5")); + assertEquals("5", metrics.get("8.opname.abc.metric6")); + assertEquals("6", metrics.get("8.opname.abc.metric7")); } @Test diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/rest/handler/legacy/metrics/MetricStoreTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/rest/handler/legacy/metrics/MetricStoreTest.java index 2e83e08c55631..31225ada7cdcb 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/rest/handler/legacy/metrics/MetricStoreTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/rest/handler/legacy/metrics/MetricStoreTest.java @@ -39,8 +39,10 @@ public void testAdd() throws IOException { assertEquals("0", store.getJobManagerMetricStore().getMetric("abc.metric1", "-1")); assertEquals("1", store.getTaskManagerMetricStore("tmid").getMetric("abc.metric2", "-1")); assertEquals("2", store.getJobMetricStore("jobid").getMetric("abc.metric3", "-1")); - assertEquals("3", store.getTaskMetricStore("jobid", "taskid").getMetric("8.abc.metric4", "-1")); - assertEquals("4", store.getTaskMetricStore("jobid", "taskid").getMetric("8.opname.abc.metric5", "-1")); + assertEquals("3", store.getJobMetricStore("jobid").getMetric("abc.metric4", "-1")); + assertEquals("4", store.getTaskMetricStore("jobid", "taskid").getMetric("8.abc.metric5", "-1")); + assertEquals("5", store.getTaskMetricStore("jobid", "taskid").getMetric("8.opname.abc.metric6", "-1")); + assertEquals("6", store.getTaskMetricStore("jobid", "taskid").getMetric("8.opname.abc.metric7", "-1")); } @Test @@ -70,18 +72,22 @@ public static MetricStore setupStore(MetricStore store) { QueryScopeInfo.JobQueryScopeInfo job = new QueryScopeInfo.JobQueryScopeInfo("jobid", "abc"); MetricDump.CounterDump cd3 = new MetricDump.CounterDump(job, "metric3", 2); + MetricDump.CounterDump cd4 = new MetricDump.CounterDump(job, "metric4", 3); QueryScopeInfo.TaskQueryScopeInfo task = new QueryScopeInfo.TaskQueryScopeInfo("jobid", "taskid", 8, "abc"); - MetricDump.CounterDump cd4 = new MetricDump.CounterDump(task, "metric4", 3); + MetricDump.CounterDump cd5 = new MetricDump.CounterDump(task, "metric5", 4); QueryScopeInfo.OperatorQueryScopeInfo operator = new QueryScopeInfo.OperatorQueryScopeInfo("jobid", "taskid", 8, "opname", "abc"); - MetricDump.CounterDump cd5 = new MetricDump.CounterDump(operator, "metric5", 4); + MetricDump.CounterDump cd6 = new MetricDump.CounterDump(operator, "metric6", 5); + MetricDump.CounterDump cd7 = new MetricDump.CounterDump(operator, "metric7", 6); store.add(cd1); store.add(cd2); store.add(cd3); store.add(cd4); store.add(cd5); + store.add(cd6); + store.add(cd7); return store; } From d223444eba17c620e8c45c372a7b2e6fafdfd169 Mon Sep 17 00:00:00 2001 From: Bowen Li Date: Wed, 27 Sep 2017 15:39:17 -0700 Subject: [PATCH 2/2] delete unrelated files --- .../legacy/messages/JobMetricsOverview.java | 25 ------------------- .../messages/JobMetricsHandlerHeaders.java | 4 --- 2 files changed, 29 deletions(-) delete mode 100644 flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/legacy/messages/JobMetricsOverview.java delete mode 100644 flink-runtime/src/main/java/org/apache/flink/runtime/rest/messages/JobMetricsHandlerHeaders.java diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/legacy/messages/JobMetricsOverview.java b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/legacy/messages/JobMetricsOverview.java deleted file mode 100644 index eddd10a941218..0000000000000 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/legacy/messages/JobMetricsOverview.java +++ /dev/null @@ -1,25 +0,0 @@ -package org.apache.flink.runtime.rest.handler.legacy.messages; - -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonProperty; -import org.apache.flink.runtime.rest.messages.ResponseBody; - -import java.util.Map; - -public class JobMetricsOverview implements ResponseBody { - - public static final String FIELD_NAME_METRICS = "metrics"; - - @JsonProperty(FIELD_NAME_METRICS) - private final Map metrics; - - @JsonCreator - public JobMetricsOverview( - @JsonProperty(FIELD_NAME_METRICS) Map metrics) { - this.metrics = metrics; - } - - public Map getMetrics() { - return metrics; - } -} diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/messages/JobMetricsHandlerHeaders.java b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/messages/JobMetricsHandlerHeaders.java deleted file mode 100644 index 82845320f4741..0000000000000 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/messages/JobMetricsHandlerHeaders.java +++ /dev/null @@ -1,4 +0,0 @@ -package org.apache.flink.runtime.rest.messages; - -public class JobMetricsHandlerHeaders { -}