Skip to content

[SPARK-1177] Allow SPARK_JAR to be set in system properties #82

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
epahomov wants to merge 1 commit into from
Closed

[SPARK-1177] Allow SPARK_JAR to be set in system properties #82

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Allow SPARK_JAR to be set in system properties
  • Loading branch information
@epahomov
epahomov committed Mar 5, 2014
commit fd4bd8a8e3125f7f0f5b2845b6f0f12795731c09
8 changes: 6 additions & 2 deletions yarn/common/src/main/scala/org/apache/spark/deploy/yarn/ClientBase.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ trait ClientBase extends Logging {
// TODO(harvey): This could just go in ClientArguments.
def validateArgs() = {
Map(
(System.getenv("SPARK_JAR") == null) -> "Error: You must set SPARK_JAR environment variable!",
((System.getenv("SPARK_JAR") == null) && (System.getProperty("SPARK_JAR") == null)) -> "Error: You must set SPARK_JAR environment variable!",
((args.userJar == null && args.amClass == classOf[ApplicationMaster].getName) ->
"Error: You must specify a user jar when running in standalone mode!"),
(args.userClass == null) -> "Error: You must specify a user class!",
Expand Down Expand Up @@ -205,8 +205,12 @@ trait ClientBase extends Logging {

val statCache: Map[URI, FileStatus] = HashMap[URI, FileStatus]()

val sparkJar = System.getenv("SPARK_JAR") match {
case null => System.getProperty("SPARK_JAR")
case s: String => s
}
Map(
ClientBase.SPARK_JAR -> System.getenv("SPARK_JAR"), ClientBase.APP_JAR -> args.userJar,
ClientBase.SPARK_JAR -> sparkJar, ClientBase.APP_JAR -> args.userJar,
ClientBase.LOG4J_PROP -> System.getenv("SPARK_LOG4J_CONF")
).foreach { case(destName, _localPath) =>
val localPath: String = if (_localPath != null) _localPath.trim() else ""
Expand Down