diff options
| author | Marcelo Vanzin <vanzin@cloudera.com> | 2014-10-17 00:53:15 -0700 |
|---|---|---|
| committer | Andrew Or <andrewor14@gmail.com> | 2014-10-17 00:53:15 -0700 |
| commit | 0d958f163014e2b612ec445c80dfe69ff29d9f1a (patch) | |
| tree | 371ddc13fade15738811fd074f42e64eacd387df /yarn/alpha | |
| parent | 35875e9ec6e63a8f28a0bdc66f83d9b623bf02bb (diff) | |
| download | spark-0d958f163014e2b612ec445c80dfe69ff29d9f1a.tar.gz spark-0d958f163014e2b612ec445c80dfe69ff29d9f1a.tar.bz2 spark-0d958f163014e2b612ec445c80dfe69ff29d9f1a.zip | |
[SPARK-3606] [yarn] Correctly configure AmIpFilter for Yarn HA (1.1 vers...
...ion).
This is a backport of SPARK-3606 to branch-1.1. Some of the code had to be
duplicated since branch-1.1 doesn't have the cleanup work that was done to
the Yarn codebase.
I don't know whether the version issue in yarn/alpha/pom.xml was intentional,
but I couldn't compile the code without fixing it.
Author: Marcelo Vanzin <vanzin@cloudera.com>
Closes #2497 from vanzin/SPARK-3606-1.1 and squashes the following commits:
4fd3c27 [Marcelo Vanzin] Remove unused imports.
75cde8c [Marcelo Vanzin] Scala is weird.
b27ebda [Marcelo Vanzin] Review feedback.
72ceafb [Marcelo Vanzin] Undelete needed import.
61162a6 [Marcelo Vanzin] Use separate config for each param instead of json.
3b7205f [Marcelo Vanzin] Review feedback.
b3b3e50 [Marcelo Vanzin] [SPARK-3606] [yarn] Correctly configure AmIpFilter for Yarn HA (1.1 version).
Diffstat (limited to 'yarn/alpha')
| -rw-r--r-- | yarn/alpha/src/main/scala/org/apache/spark/deploy/yarn/ExecutorLauncher.scala | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/yarn/alpha/src/main/scala/org/apache/spark/deploy/yarn/ExecutorLauncher.scala b/yarn/alpha/src/main/scala/org/apache/spark/deploy/yarn/ExecutorLauncher.scala index 155dd88aa2..e9289aaf1f 100644 --- a/yarn/alpha/src/main/scala/org/apache/spark/deploy/yarn/ExecutorLauncher.scala +++ b/yarn/alpha/src/main/scala/org/apache/spark/deploy/yarn/ExecutorLauncher.scala @@ -185,7 +185,7 @@ class ExecutorLauncher(args: ApplicationMasterArguments, conf: Configuration, sp val parts = proxy.split(":") val proxyBase = System.getenv(ApplicationConstants.APPLICATION_WEB_PROXY_BASE_ENV) val uriBase = "http://" + proxy + proxyBase - val amFilter = "PROXY_HOST=" + parts(0) + "," + "PROXY_URI_BASE=" + uriBase + val amFilter = Map("PROXY_HOST" -> parts(0), "PROXY_URI_BASE" -> uriBase) val amFilterName = "org.apache.hadoop.yarn.server.webproxy.amfilter.AmIpFilter" actor ! AddWebUIFilter(amFilterName, amFilter, proxyBase) } |