Skip to content

SPARK-1588 Re-add support for SPARK_YARN_USER_ENV and SPARK_JAVA_OPTS #514

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
wants to merge 1 commit into from
Closed

SPARK-1588 Re-add support for SPARK_YARN_USER_ENV and SPARK_JAVA_OPTS #514

Show file tree
Hide file tree
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
13 changes: 13 additions & 0 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 @@ -265,6 +265,15 @@ trait ClientBase extends Logging {
YarnSparkHadoopUtil.setEnvFromInputString(env, System.getenv("SPARK_YARN_USER_ENV"),
File.pathSeparator)

val sparkJavaOpts = System.getenv().get("SPARK_JAVA_OPTS")
if (sparkJavaOpts != null) {
env("SPARK_JAVA_OPTS") = sparkJavaOpts
}
val sparkYarnUserEnv = System.getenv().get("SPARK_YARN_USER_ENV")
if (sparkYarnUserEnv != null) {
env("SPARK_YARN_USER_ENV") = sparkYarnUserEnv
}

env
}

Expand Down Expand Up @@ -320,6 +329,10 @@ trait ClientBase extends Logging {
JAVA_OPTS += "-XX:CMSIncrementalDutyCycle=10"
}

if (env.isDefinedAt("SPARK_JAVA_OPTS")) {
JAVA_OPTS += env("SPARK_JAVA_OPTS")
}

// TODO: it might be nicer to pass these as an internal environment variable rather than
// as Java options, due to complications with string parsing of nested quotes.
if (args.amClass == classOf[ExecutorLauncher].getName) {
Expand Down
3 changes: 3 additions & 0 deletions yarn/common/src/main/scala/org/apache/spark/deploy/yarn/ExecutorRunnableUtil.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,9 @@ trait ExecutorRunnableUtil extends Logging {
sys.props.get("spark.executor.extraJavaOptions").foreach { opts =>
JAVA_OPTS += opts
}
if (env.isDefinedAt("SPARK_JAVA_OPTS")) {
JAVA_OPTS += env("SPARK_JAVA_OPTS") + " "
}

JAVA_OPTS += " -Djava.io.tmpdir=" +
new Path(Environment.PWD.$(), YarnConfiguration.DEFAULT_CONTAINER_TEMP_DIR) + " "
Expand Down