diff options
| author | Davies Liu <davies.liu@gmail.com> | 2016-06-15 15:55:07 -0700 |
|---|---|---|
| committer | Davies Liu <davies.liu@gmail.com> | 2016-06-15 15:55:07 -0700 |
| commit | a153e41c08b635b1b2a48b680d203c148deebc67 (patch) | |
| tree | 552e2dc3e9146662f523f7eb3495fe0a1607b8f3 /repl/scala-2.10 | |
| parent | 1a33f2e05c8813ce1ff94e10d0c03fc7e5c403ce (diff) | |
| download | spark-a153e41c08b635b1b2a48b680d203c148deebc67.tar.gz spark-a153e41c08b635b1b2a48b680d203c148deebc67.tar.bz2 spark-a153e41c08b635b1b2a48b680d203c148deebc67.zip | |
Revert "[SPARK-15782][YARN] Set spark.jars system property in client mode"
This reverts commit 4df8df5c2e68f5a5d231c401b04d762d7a648159.
Diffstat (limited to 'repl/scala-2.10')
| -rw-r--r-- | repl/scala-2.10/src/main/scala/org/apache/spark/repl/SparkILoop.scala | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/repl/scala-2.10/src/main/scala/org/apache/spark/repl/SparkILoop.scala b/repl/scala-2.10/src/main/scala/org/apache/spark/repl/SparkILoop.scala index 66de5e462a..b1e95d8fdb 100644 --- a/repl/scala-2.10/src/main/scala/org/apache/spark/repl/SparkILoop.scala +++ b/repl/scala-2.10/src/main/scala/org/apache/spark/repl/SparkILoop.scala @@ -1067,19 +1067,12 @@ object SparkILoop extends Logging { private def echo(msg: String) = Console println msg def getAddedJars: Array[String] = { - val conf = new SparkConf().setMaster(getMaster()) val envJars = sys.env.get("ADD_JARS") if (envJars.isDefined) { logWarning("ADD_JARS environment variable is deprecated, use --jar spark submit argument instead") } - val jars = { - val userJars = Utils.getUserJars(conf) - if (userJars.isEmpty) { - envJars.getOrElse("") - } else { - userJars.mkString(",") - } - } + val propJars = sys.props.get("spark.jars").flatMap { p => if (p == "") None else Some(p) } + val jars = propJars.orElse(envJars).getOrElse("") Utils.resolveURIs(jars).split(",").filter(_.nonEmpty) } |