You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by rm...@apache.org on 2015/04/17 11:50:02 UTC
flink git commit: [FLINK-1902] Show jobmanager address/port in
configuration
Repository: flink
Updated Branches:
refs/heads/master 32a04e42d -> 10fc1d8d3
[FLINK-1902] Show jobmanager address/port in configuration
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/10fc1d8d
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/10fc1d8d
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/10fc1d8d
Branch: refs/heads/master
Commit: 10fc1d8d3374ef05c4c5430b1d7a5aaa63ee9185
Parents: 32a04e4
Author: Robert Metzger <rm...@apache.org>
Authored: Fri Apr 17 10:41:37 2015 +0200
Committer: Robert Metzger <rm...@apache.org>
Committed: Fri Apr 17 11:48:23 2015 +0200
----------------------------------------------------------------------
.../flink/yarn/YARNSessionFIFOITCase.java | 20 +++++++++++++++++++-
.../apache/flink/yarn/ApplicationMaster.scala | 3 +++
2 files changed, 22 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/10fc1d8d/flink-yarn-tests/src/main/java/org/apache/flink/yarn/YARNSessionFIFOITCase.java
----------------------------------------------------------------------
diff --git a/flink-yarn-tests/src/main/java/org/apache/flink/yarn/YARNSessionFIFOITCase.java b/flink-yarn-tests/src/main/java/org/apache/flink/yarn/YARNSessionFIFOITCase.java
index bb18e87..2edab17 100644
--- a/flink-yarn-tests/src/main/java/org/apache/flink/yarn/YARNSessionFIFOITCase.java
+++ b/flink-yarn-tests/src/main/java/org/apache/flink/yarn/YARNSessionFIFOITCase.java
@@ -20,6 +20,7 @@ package org.apache.flink.yarn;
import com.google.common.base.Joiner;
import org.apache.commons.io.FileUtils;
import org.apache.flink.client.FlinkYarnSessionCli;
+import org.apache.flink.configuration.ConfigConstants;
import org.apache.flink.configuration.GlobalConfiguration;
import org.apache.flink.runtime.yarn.AbstractFlinkYarnClient;
import org.apache.flink.runtime.yarn.AbstractFlinkYarnCluster;
@@ -61,6 +62,8 @@ import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentMap;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
import static org.apache.flink.yarn.UtilsTest.addTestAppender;
import static org.apache.flink.yarn.UtilsTest.checkForLogString;
@@ -194,6 +197,22 @@ public class YARNSessionFIFOITCase extends YarnTestBase {
Assert.assertEquals("veryFancy", parsed.getString("fancy-configuration-value"));
Assert.assertEquals("3", parsed.getString("yarn.maximum-failed-containers"));
+ // -------------- FLINK-1902: check if jobmanager hostname/port are shown in web interface
+ // first, get the hostname/port
+ String oC = outContent.toString();
+ Pattern p = Pattern.compile("Flink JobManager is now running on ([a-zA-Z0-9.-]+):([0-9]+)");
+ Matcher matches = p.matcher(oC);
+ String hostname = null;
+ String port = null;
+ while(matches.find()) {
+ hostname = matches.group(1);
+ port = matches.group(2);
+ }
+ LOG.info("Extracted hostname:port: {} {}", hostname, port);
+
+ Assert.assertEquals("unable to find hostname in " + parsed, hostname, parsed.getString(ConfigConstants.JOB_MANAGER_IPC_ADDRESS_KEY));
+ Assert.assertEquals("unable to find port in " + parsed, port, parsed.getString(ConfigConstants.JOB_MANAGER_IPC_PORT_KEY));
+
// test logfile access
String logs = TestBaseUtils.getFromHTTP(url + "logInfo");
Assert.assertTrue(logs.contains("Starting YARN ApplicationMaster/JobManager (Version"));
@@ -604,5 +623,4 @@ public class YARNSessionFIFOITCase extends YarnTestBase {
yarnCluster.shutdown();
LOG.info("Finished testJavaAPI()");
}
-
}
http://git-wip-us.apache.org/repos/asf/flink/blob/10fc1d8d/flink-yarn/src/main/scala/org/apache/flink/yarn/ApplicationMaster.scala
----------------------------------------------------------------------
diff --git a/flink-yarn/src/main/scala/org/apache/flink/yarn/ApplicationMaster.scala b/flink-yarn/src/main/scala/org/apache/flink/yarn/ApplicationMaster.scala
index 91434ee..0fdef47 100644
--- a/flink-yarn/src/main/scala/org/apache/flink/yarn/ApplicationMaster.scala
+++ b/flink-yarn/src/main/scala/org/apache/flink/yarn/ApplicationMaster.scala
@@ -102,6 +102,9 @@ object ApplicationMaster {
LOG.info("Starting Job Manger web frontend.")
config.setString(ConfigConstants.JOB_MANAGER_WEB_LOG_PATH_KEY, logDirs)
config.setInteger(ConfigConstants.JOB_MANAGER_WEB_PORT_KEY, 0); // set port to 0.
+ // set JobManager host/port for web interface.
+ config.setString(ConfigConstants.JOB_MANAGER_IPC_ADDRESS_KEY, ownHostname)
+ config.setInteger(ConfigConstants.JOB_MANAGER_IPC_PORT_KEY, jobManagerPort)
webserver = new WebInfoServer(config, jobManager, archiver)
webserver.start()
}