diff options
| author | Mridul Muralidharan <mridul@gmail.com> | 2013-04-17 05:52:00 +0530 |
|---|---|---|
| committer | Mridul Muralidharan <mridul@gmail.com> | 2013-04-17 05:52:00 +0530 |
| commit | a402b23bcd9a9470c5fa38bf46f150b51d43eac9 (patch) | |
| tree | e803777bde7136751cc50ddaf73c6f3d1c22a5aa /core/src/hadoop2-yarn/scala | |
| parent | bcdde331c3ed68af27bc5d6067c78f68dbd6b032 (diff) | |
| download | spark-a402b23bcd9a9470c5fa38bf46f150b51d43eac9.tar.gz spark-a402b23bcd9a9470c5fa38bf46f150b51d43eac9.tar.bz2 spark-a402b23bcd9a9470c5fa38bf46f150b51d43eac9.zip | |
Fudge order of classpath - so that our jars take precedence over what is in CLASSPATH variable. Sounds logical, hope there is no issue cos of it
Diffstat (limited to 'core/src/hadoop2-yarn/scala')
| -rw-r--r-- | core/src/hadoop2-yarn/scala/spark/deploy/yarn/Client.scala | 2 | ||||
| -rw-r--r-- | core/src/hadoop2-yarn/scala/spark/deploy/yarn/WorkerRunnable.scala | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/core/src/hadoop2-yarn/scala/spark/deploy/yarn/Client.scala b/core/src/hadoop2-yarn/scala/spark/deploy/yarn/Client.scala index 7fa6740579..c007dae98c 100644 --- a/core/src/hadoop2-yarn/scala/spark/deploy/yarn/Client.scala +++ b/core/src/hadoop2-yarn/scala/spark/deploy/yarn/Client.scala @@ -165,8 +165,8 @@ class Client(conf: Configuration, args: ClientArguments) extends Logging { // If log4j present, ensure ours overrides all others if (log4jConfLocalRes != null) Apps.addToEnvironment(env, Environment.CLASSPATH.name, "./") - Apps.addToEnvironment(env, Environment.CLASSPATH.name, "$CLASSPATH") Apps.addToEnvironment(env, Environment.CLASSPATH.name, "./*") + Apps.addToEnvironment(env, Environment.CLASSPATH.name, "$CLASSPATH") Client.populateHadoopClasspath(yarnConf, env) SparkHadoopUtil.setYarnMode(env) env("SPARK_YARN_JAR_PATH") = diff --git a/core/src/hadoop2-yarn/scala/spark/deploy/yarn/WorkerRunnable.scala b/core/src/hadoop2-yarn/scala/spark/deploy/yarn/WorkerRunnable.scala index 5688f1ab66..a2bf0af762 100644 --- a/core/src/hadoop2-yarn/scala/spark/deploy/yarn/WorkerRunnable.scala +++ b/core/src/hadoop2-yarn/scala/spark/deploy/yarn/WorkerRunnable.scala @@ -153,8 +153,8 @@ class WorkerRunnable(container: Container, conf: Configuration, masterAddress: S Apps.addToEnvironment(env, Environment.CLASSPATH.name, "./") } - Apps.addToEnvironment(env, Environment.CLASSPATH.name, "$CLASSPATH") Apps.addToEnvironment(env, Environment.CLASSPATH.name, "./*") + Apps.addToEnvironment(env, Environment.CLASSPATH.name, "$CLASSPATH") Client.populateHadoopClasspath(yarnConf, env) System.getenv().filterKeys(_.startsWith("SPARK")).foreach { case (k,v) => env(k) = v } |