Repository: hadoop Updated Branches: refs/heads/trunk d88497d44 -> 7afe5b1a3
MAPREDUCE-6404. Allow AM to specify a port range for starting its webapp. Contributed by Varun Saxena. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/7afe5b1a Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/7afe5b1a Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/7afe5b1a Branch: refs/heads/trunk Commit: 7afe5b1a3165e284ae831cd307a526763399f66d Parents: d88497d Author: Junping Du <[email protected]> Authored: Tue Feb 7 01:40:49 2017 -0800 Committer: Junping Du <[email protected]> Committed: Tue Feb 7 01:40:49 2017 -0800 ---------------------------------------------------------------------- .../hadoop/mapreduce/v2/app/client/MRClientService.java | 4 +++- .../main/java/org/apache/hadoop/mapreduce/MRJobConfig.java | 8 +++++++- .../src/main/resources/mapred-default.xml | 8 ++++++++ 3 files changed, 18 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/7afe5b1a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/client/MRClientService.java ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/client/MRClientService.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/client/MRClientService.java index d378b0a..6eb42be 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/client/MRClientService.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/client/MRClientService.java @@ -142,7 +142,9 @@ public class MRClientService extends AbstractService implements ClientService { // running in user-land. webApp = 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) { LOG.error("Webapps failed to start. Ignoring for now:", e); } http://git-wip-us.apache.org/repos/asf/hadoop/blob/7afe5b1a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/MRJobConfig.java ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/MRJobConfig.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/MRJobConfig.java index ab48255..0a4d222 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/MRJobConfig.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/MRJobConfig.java @@ -592,7 +592,13 @@ public interface MRJobConfig { */ public static final String MR_AM_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.*/ public static final String MR_AM_JOB_NODE_BLACKLISTING_ENABLE = MR_AM_PREFIX + "job.node-blacklisting.enable"; http://git-wip-us.apache.org/repos/asf/hadoop/blob/7afe5b1a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml index a163fbd..101aa07 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml @@ -1389,6 +1389,14 @@ </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> <name>yarn.app.mapreduce.am.job.committer.cancel-timeout</name> <value>60000</value> <description>The amount of time in milliseconds to wait for the output --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
