From 1ea6bbe5ed3c1c2e4d78ebb4712c550c2ce584e7 Mon Sep 17 00:00:00 2001 From: Andrew Or Date: Tue, 19 Aug 2014 02:03:56 -0700 Subject: [PATCH] SparkClassLauncher -> SparkSubmitDriverBootstrapper --- bin/spark-class | 6 +++--- ...ssLauncher.scala => SparkSubmitDriverBootstrapper.scala} | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) rename core/src/main/scala/org/apache/spark/deploy/{SparkClassLauncher.scala => SparkSubmitDriverBootstrapper.scala} (97%) diff --git a/bin/spark-class b/bin/spark-class index 2d1921474ed74..c7745e579d3f2 100755 --- a/bin/spark-class +++ b/bin/spark-class @@ -17,7 +17,7 @@ # limitations under the License. # -# NOTE: Any changes to this file must be reflected in SparkClassLauncher.scala! +# NOTE: Any changes to this file must be reflected in SparkSubmitDriverBootstrapper.scala! cygwin=false case "`uname`" in @@ -160,13 +160,13 @@ export CLASSPATH if [ -n "$SPARK_SUBMIT_BOOTSTRAP_DRIVER" ]; then # This is used only if the properties file actually contains these special configs - # Export the environment variables needed by SparkClassLauncher + # Export the environment variables needed by SparkSubmitDriverBootstrapper export RUNNER export CLASSPATH export JAVA_OPTS export OUR_JAVA_MEM shift - exec "$RUNNER" org.apache.spark.deploy.SparkClassLauncher "$@" + exec "$RUNNER" org.apache.spark.deploy.SparkSubmitDriverBootstrapper "$@" else JAVA_OPTS="$JAVA_OPTS -Xms$OUR_JAVA_MEM -Xmx$OUR_JAVA_MEM" if [ -n "$SPARK_PRINT_LAUNCH_COMMAND" ]; then diff --git a/core/src/main/scala/org/apache/spark/deploy/SparkClassLauncher.scala b/core/src/main/scala/org/apache/spark/deploy/SparkSubmitDriverBootstrapper.scala similarity index 97% rename from core/src/main/scala/org/apache/spark/deploy/SparkClassLauncher.scala rename to core/src/main/scala/org/apache/spark/deploy/SparkSubmitDriverBootstrapper.scala index 5ebc973391952..1f82787939ac6 100644 --- a/core/src/main/scala/org/apache/spark/deploy/SparkClassLauncher.scala +++ b/core/src/main/scala/org/apache/spark/deploy/SparkSubmitDriverBootstrapper.scala @@ -29,9 +29,9 @@ import org.apache.spark.util.{RedirectThread, Utils} * 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.SparkClassLauncher + * Usage: org.apache.spark.deploy.SparkSubmitDriverBootstrapper */ -private[spark] object SparkClassLauncher { +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.