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 2018/01/21 09:38:57 UTC

flink git commit: [hotfix] [REST] Fix WebMonitorEndpoint that missing parameters while initializing handlers

Repository: flink
Updated Branches:
  refs/heads/master 4c883e342 -> 17e8664aa


[hotfix] [REST] Fix WebMonitorEndpoint that missing parameters while initializing handlers

This closes #5322.


Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/17e8664a
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/17e8664a
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/17e8664a

Branch: refs/heads/master
Commit: 17e8664aa6e2915c368e8eb75c6ae5e3b1942239
Parents: 4c883e3
Author: biao.liub <bi...@alibaba-inc.com>
Authored: Sat Jan 20 13:26:29 2018 +0800
Committer: Till Rohrmann <tr...@apache.org>
Committed: Sun Jan 21 10:38:45 2018 +0100

----------------------------------------------------------------------
 .../job/SubtaskExecutionAttemptAccumulatorsHeaders.java        | 6 +++---
 .../apache/flink/runtime/webmonitor/WebMonitorEndpoint.java    | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flink/blob/17e8664a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/messages/job/SubtaskExecutionAttemptAccumulatorsHeaders.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/messages/job/SubtaskExecutionAttemptAccumulatorsHeaders.java b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/messages/job/SubtaskExecutionAttemptAccumulatorsHeaders.java
index d162156..662e87c 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/messages/job/SubtaskExecutionAttemptAccumulatorsHeaders.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/messages/job/SubtaskExecutionAttemptAccumulatorsHeaders.java
@@ -31,7 +31,7 @@ import org.apache.flink.shaded.netty4.io.netty.handler.codec.http.HttpResponseSt
 /**
  * Message headers for the {@link SubtaskExecutionAttemptAccumulatorsHandler}.
  */
-public class SubtaskExecutionAttemptAccumulatorsHeaders implements MessageHeaders<EmptyRequestBody, SubtaskExecutionAttemptDetailsInfo, SubtaskAttemptMessageParameters> {
+public class SubtaskExecutionAttemptAccumulatorsHeaders implements MessageHeaders<EmptyRequestBody, SubtaskExecutionAttemptAccumulatorsInfo, SubtaskAttemptMessageParameters> {
 
 	private static final SubtaskExecutionAttemptAccumulatorsHeaders INSTANCE = new SubtaskExecutionAttemptAccumulatorsHeaders();
 
@@ -58,8 +58,8 @@ public class SubtaskExecutionAttemptAccumulatorsHeaders implements MessageHeader
 	}
 
 	@Override
-	public Class<SubtaskExecutionAttemptDetailsInfo> getResponseClass() {
-		return SubtaskExecutionAttemptDetailsInfo.class;
+	public Class<SubtaskExecutionAttemptAccumulatorsInfo> getResponseClass() {
+		return SubtaskExecutionAttemptAccumulatorsInfo.class;
 	}
 
 	@Override

http://git-wip-us.apache.org/repos/asf/flink/blob/17e8664a/flink-runtime/src/main/java/org/apache/flink/runtime/webmonitor/WebMonitorEndpoint.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/webmonitor/WebMonitorEndpoint.java b/flink-runtime/src/main/java/org/apache/flink/runtime/webmonitor/WebMonitorEndpoint.java
index f0cfb5e..e432752 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/webmonitor/WebMonitorEndpoint.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/webmonitor/WebMonitorEndpoint.java
@@ -376,7 +376,7 @@ public class WebMonitorEndpoint<T extends RestfulGateway> extends RestServerEndp
 			leaderRetriever,
 			timeout,
 			responseHeaders,
-			null,
+			SubtaskExecutionAttemptDetailsHeaders.getInstance(),
 			executionGraphCache,
 			executor,
 			metricFetcher);
@@ -386,7 +386,7 @@ public class WebMonitorEndpoint<T extends RestfulGateway> extends RestServerEndp
 			leaderRetriever,
 			timeout,
 			responseHeaders,
-			null,
+			SubtaskExecutionAttemptAccumulatorsHeaders.getInstance(),
 			executionGraphCache,
 			executor
 		);
@@ -396,7 +396,7 @@ public class WebMonitorEndpoint<T extends RestfulGateway> extends RestServerEndp
 			leaderRetriever,
 			timeout,
 			responseHeaders,
-			null,
+			SubtaskCurrentAttemptDetailsHeaders.getInstance(),
 			executionGraphCache,
 			executor,
 			metricFetcher