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/12 22:25:35 UTC
[14/14] flink git commit: [FLINK-8288] [runtime] register job master
rest endpoint url to yarn
[FLINK-8288] [runtime] register job master rest endpoint url to yarn
This closes #5186.
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/3b016868
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/3b016868
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/3b016868
Branch: refs/heads/master
Commit: 3b01686851e8281642924c4a620fb43b008de174
Parents: 3c99ae8
Author: shuai.xus <sh...@alibaba-inc.com>
Authored: Wed Dec 20 10:10:35 2017 +0800
Committer: Till Rohrmann <tr...@apache.org>
Committed: Fri Jan 12 17:55:01 2018 +0100
----------------------------------------------------------------------
.../entrypoint/JobClusterEntrypoint.java | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/3b016868/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 21a7ba4..cb1b086 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
@@ -92,16 +92,6 @@ public abstract class JobClusterEntrypoint extends ClusterEntrypoint {
HeartbeatServices heartbeatServices,
MetricRegistry metricRegistry) throws Exception {
- resourceManager = createResourceManager(
- configuration,
- ResourceID.generate(),
- rpcService,
- highAvailabilityServices,
- heartbeatServices,
- metricRegistry,
- this,
- null);
-
jobManagerServices = JobManagerServices.fromConfiguration(configuration, blobServer);
resourceManagerRetrievalService = highAvailabilityServices.getResourceManagerLeaderRetriever();
@@ -134,6 +124,16 @@ public abstract class JobClusterEntrypoint extends ClusterEntrypoint {
LOG.debug("Starting JobMaster REST endpoint.");
jobMasterRestEndpoint.start();
+ resourceManager = createResourceManager(
+ configuration,
+ ResourceID.generate(),
+ rpcService,
+ highAvailabilityServices,
+ heartbeatServices,
+ metricRegistry,
+ this,
+ jobMasterRestEndpoint.getRestAddress());
+
jobManagerRunner = createJobManagerRunner(
configuration,
ResourceID.generate(),