Skip to content

[SPARK-17984][YARN][Mesos][Deploy][WIP] Added support for executor launch with leading arguments #15579

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
sheepduke wants to merge 3 commits into from
Closed

[SPARK-17984][YARN][Mesos][Deploy][WIP] Added support for executor launch with leading arguments #15579

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a24aff9
Added support for extra command in front of spark.
Oct 21, 2016
b6780cc
Modifed source code to meet Spark code style.
sheepduke Oct 27, 2016
d3628eb
Changed environment varaible.
sheepduke Nov 7, 2016
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
1 change: 1 addition & 0 deletions conf/spark-env.sh.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
# - SPARK_EXECUTOR_CORES, Number of cores for the executors (Default: 1).
# - SPARK_EXECUTOR_MEMORY, Memory per Executor (e.g. 1000M, 2G) (Default: 1G)
# - SPARK_DRIVER_MEMORY, Memory for Driver (e.g. 1000M, 2G) (Default: 1G)
# - SPARK_EXECUTOR_LAUNCH_PREFIX, Command string added in front of Spark executor

# Options for the daemons used in the standalone deploy mode
# - SPARK_MASTER_HOST, to bind the master to a different IP address or hostname
Expand Down
11 changes: 9 additions & 2 deletions yarn/src/main/scala/org/apache/spark/deploy/yarn/ExecutorRunnable.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,8 @@ private[yarn] class ExecutorRunnable(
*/

// For log4j configuration to reference
javaOpts += ("-Dspark.yarn.app.container.log.dir=" + ApplicationConstants.LOG_DIR_EXPANSION_VAR)
javaOpts += ("-Dspark.yarn.app.container.log.dir="
+ ApplicationConstants.LOG_DIR_EXPANSION_VAR)
YarnCommandBuilderUtils.addPermGenSizeOpt(javaOpts)

val userClassPath = Client.getUserClasspath(sparkConf).flatMap { uri =>
Expand All @@ -207,8 +208,14 @@ private[yarn] class ExecutorRunnable(
}.toSeq

YarnSparkHadoopUtil.addOutOfMemoryErrorArgument(javaOpts)

// Add support for extra executor prefix.
val executorCommandPrefix = (if (sys.env.contains("SPARK_EXECUTOR_LAUNCH_PREFIX"))
sys.env.get("SPARK_EXECUTOR_LAUNCH_PREFIX") else "");

val commands = prefixEnv ++ Seq(
YarnSparkHadoopUtil.expandEnvironment(Environment.JAVA_HOME) + "/bin/java",
executorCommandPrefix + " " + YarnSparkHadoopUtil.expandEnvironment(Environment.JAVA_HOME) +
"/bin/java",
"-server") ++
javaOpts ++
Seq("org.apache.spark.executor.CoarseGrainedExecutorBackend",
Expand Down