[SPARK-2849] Handle driver configs separately in client mode #1845
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Empty file.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -40,28 +40,3 @@ private[spark] object PythonUtils { | |
| paths.filter(_ != "").mkString(File.pathSeparator) | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,149 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one or more | ||
| * contributor license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright ownership. | ||
| * The ASF licenses this file to You under the Apache License, Version 2.0 | ||
| * (the "License"); you may not use this file except in compliance with | ||
| * the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package org.apache.spark.deploy | ||
|
|
||
| import java.io.File | ||
|
|
||
| import scala.collection.JavaConversions._ | ||
|
|
||
| import org.apache.spark.util.{RedirectThread, Utils} | ||
|
|
||
| /** | ||
| * Launch an application through Spark submit in client mode with the appropriate classpath, | ||
| * library paths, java options and memory. These properties of the JVM must be set before the | ||
| * driver JVM is launched. The sole purpose of this class is to avoid handling the complexity | ||
| * of parsing the properties file for such relevant configs in Bash. | ||
| * | ||
| * Usage: org.apache.spark.deploy.SparkSubmitDriverBootstrapper <submit args> | ||
| */ | ||
| private[spark] object SparkSubmitDriverBootstrapper { | ||
|
|
||
| // Note: This class depends on the behavior of `bin/spark-class` and `bin/spark-submit`. | ||
| // Any changes made there must be reflected in this file. | ||
|
|
||
| def main(args: Array[String]): Unit = { | ||
|
|
||
| // This should be called only from `bin/spark-class` | ||
| if (!sys.env.contains("SPARK_CLASS")) { | ||
| System.err.println("SparkSubmitDriverBootstrapper must be called from `bin/spark-class`!") | ||
| System.exit(1) | ||
| } | ||
|
|
||
| val submitArgs = args | ||
| val runner = sys.env("RUNNER") | ||
| val classpath = sys.env("CLASSPATH") | ||
| val javaOpts = sys.env("JAVA_OPTS") | ||
| val defaultDriverMemory = sys.env("OUR_JAVA_MEM") | ||
|
|
||
| // Spark submit specific environment variables | ||
| val deployMode = sys.env("SPARK_SUBMIT_DEPLOY_MODE") | ||
| val propertiesFile = sys.env("SPARK_SUBMIT_PROPERTIES_FILE") | ||
| val bootstrapDriver = sys.env("SPARK_SUBMIT_BOOTSTRAP_DRIVER") | ||
| val submitDriverMemory = sys.env.get("SPARK_SUBMIT_DRIVER_MEMORY") | ||
| val submitLibraryPath = sys.env.get("SPARK_SUBMIT_LIBRARY_PATH") | ||
| val submitClasspath = sys.env.get("SPARK_SUBMIT_CLASSPATH") | ||
| val submitJavaOpts = sys.env.get("SPARK_SUBMIT_OPTS") | ||
|
|
||
| assume(runner != null, "RUNNER must be set") | ||
| assume(classpath != null, "CLASSPATH must be set") | ||
| assume(javaOpts != null, "JAVA_OPTS must be set") | ||
| assume(defaultDriverMemory != null, "OUR_JAVA_MEM must be set") | ||
| assume(deployMode == "client", "SPARK_SUBMIT_DEPLOY_MODE must be \"client\"!") | ||
| assume(propertiesFile != null, "SPARK_SUBMIT_PROPERTIES_FILE must be set") | ||
| assume(bootstrapDriver != null, "SPARK_SUBMIT_BOOTSTRAP_DRIVER must be set") | ||
|
|
||
| // Parse the properties file for the equivalent spark.driver.* configs | ||
| val properties = SparkSubmitArguments.getPropertiesFromFile(new File(propertiesFile)).toMap | ||
| val confDriverMemory = properties.get("spark.driver.memory") | ||
| val confLibraryPath = properties.get("spark.driver.extraLibraryPath") | ||
| val confClasspath = properties.get("spark.driver.extraClassPath") | ||
| val confJavaOpts = properties.get("spark.driver.extraJavaOptions") | ||
|
|
||
| // Favor Spark submit arguments over the equivalent configs in the properties file. | ||
| // Note that we do not actually use the Spark submit values for library path, classpath, | ||
| // and Java opts here, because we have already captured them in Bash. | ||
|
|
||
| val newDriverMemory = submitDriverMemory | ||
| .orElse(confDriverMemory) | ||
| .getOrElse(defaultDriverMemory) | ||
|
|
||
| val newLibraryPath = | ||
| if (submitLibraryPath.isDefined) { | ||
| // SPARK_SUBMIT_LIBRARY_PATH is already captured in JAVA_OPTS | ||
| "" | ||
| } else { | ||
| confLibraryPath.map("-Djava.library.path=" + _).getOrElse("") | ||
| } | ||
|
|
||
| val newClasspath = | ||
| if (submitClasspath.isDefined) { | ||
| // SPARK_SUBMIT_CLASSPATH is already captured in CLASSPATH | ||
| classpath | ||
| } else { | ||
| classpath + confClasspath.map(sys.props("path.separator") + _).getOrElse("") | ||
| } | ||
|
|
||
| val newJavaOpts = | ||
| if (submitJavaOpts.isDefined) { | ||
| // SPARK_SUBMIT_OPTS is already captured in JAVA_OPTS | ||
| javaOpts | ||
| } else { | ||
| javaOpts + confJavaOpts.map(" " + _).getOrElse("") | ||
| } | ||
|
|
||
| val filteredJavaOpts = Utils.splitCommandString(newJavaOpts) | ||
| .filterNot(_.startsWith("-Xms")) | ||
| .filterNot(_.startsWith("-Xmx")) | ||
|
|
||
| // Build up command | ||
| val command: Seq[String] = | ||
| Seq(runner) ++ | ||
| Seq("-cp", newClasspath) ++ | ||
| Seq(newLibraryPath) ++ | ||
| filteredJavaOpts ++ | ||
| Seq(s"-Xms$newDriverMemory", s"-Xmx$newDriverMemory") ++ | ||
| Seq("org.apache.spark.deploy.SparkSubmit") ++ | ||
| submitArgs | ||
|
|
||
| // Print the launch command. This follows closely the format used in `bin/spark-class`. | ||
| if (sys.env.contains("SPARK_PRINT_LAUNCH_COMMAND")) { | ||
| System.err.print("Spark Command: ") | ||
| System.err.println(command.mkString(" ")) | ||
| System.err.println("========================================\n") | ||
| } | ||
|
|
||
| // Start the driver JVM | ||
| val filteredCommand = command.filter(_.nonEmpty) | ||
| val builder = new ProcessBuilder(filteredCommand) | ||
| val process = builder.start() | ||
|
|
||
| // Redirect stdin, stdout, and stderr to/from the child JVM | ||
| val stdinThread = new RedirectThread(System.in, process.getOutputStream, "redirect stdin") | ||
| val stdoutThread = new RedirectThread(process.getInputStream, System.out, "redirect stdout") | ||
| val stderrThread = new RedirectThread(process.getErrorStream, System.err, "redirect stderr") | ||
| stdinThread.start() | ||
| stdoutThread.start() | ||
| stderrThread.start() | ||
|
|
||
| // Terminate on broken pipe, which signals that the parent process has exited. This is | ||
| // important for the PySpark shell, where Spark submit itself is a python subprocess. | ||
| stdinThread.join() | ||
| process.destroy() | ||
| } | ||
|
|
||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
below we should change this to advise people to set
spark.driver.memoryinstead ofSPARK_DRIVER_MEMORY. Also we should remove the references inspark-env.sh.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ok