big-data/hadoop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MAPREDUCE-6404. Allow AM to specify a port range for starting its webapp. Contributed by Varun Saxena.

Browse Source
This commit is contained in:
Junping Du 2017-02-07 01:40:49 -08:00
parent d88497d44a
commit 7afe5b1a31
3 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/client/MRClientService.java
View File

@ -142,7 +142,9 @@ protected void serviceStart() throws Exception {
// running in user-land. // running in user-land.
webApp = webApp =
WebApps.$for("mapreduce", AppContext.class, appContext, "ws") WebApps.$for("mapreduce", AppContext.class, appContext, "ws")
.withHttpPolicy(conf, Policy.HTTP_ONLY).start(new AMWebApp()); .withHttpPolicy(conf, Policy.HTTP_ONLY)
.withPortRange(conf, MRJobConfig.MR_AM_WEBAPP_PORT_RANGE)
.start(new AMWebApp());
} catch (Exception e) { } catch (Exception e) {
LOG.error("Webapps failed to start. Ignoring for now:", e); LOG.error("Webapps failed to start. Ignoring for now:", e);
} }

6
hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/MRJobConfig.java
View File

@ -593,6 +593,12 @@ public interface MRJobConfig {
public static final String MR_AM_JOB_CLIENT_PORT_RANGE = public static final String MR_AM_JOB_CLIENT_PORT_RANGE =
MR_AM_PREFIX + "job.client.port-range"; MR_AM_PREFIX + "job.client.port-range";
/**
* Range of ports that the MapReduce AM can use when binding for its webapp.
* Leave blank if you want all possible ports.
*/
String MR_AM_WEBAPP_PORT_RANGE = MR_AM_PREFIX + "webapp.port-range";
/** Enable blacklisting of nodes in the job.*/ /** Enable blacklisting of nodes in the job.*/
public static final String MR_AM_JOB_NODE_BLACKLISTING_ENABLE = public static final String MR_AM_JOB_NODE_BLACKLISTING_ENABLE =
MR_AM_PREFIX + "job.node-blacklisting.enable"; MR_AM_PREFIX + "job.node-blacklisting.enable";

8
hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml
View File

@ -1388,6 +1388,14 @@
For example 50000-50050,50100-50200</description> For example 50000-50050,50100-50200</description>
</property> </property>
<property>
<name>yarn.app.mapreduce.am.webapp.port-range</name>
<value></value>
<description>Range of ports that the MapReduce AM can use for its webapp when binding.
Leave blank if you want all possible ports.
For example 50000-50050,50100-50200</description>
</property>
<property> <property>
<name>yarn.app.mapreduce.am.job.committer.cancel-timeout</name> <name>yarn.app.mapreduce.am.job.committer.cancel-timeout</name>
<value>60000</value> <value>60000</value>