From 6fb6872ce463547f5588415ce1cc0793ba8acf5a Mon Sep 17 00:00:00 2001 From: WangTaoTheTonic Date: Thu, 18 Sep 2014 19:19:29 +0800 Subject: [PATCH] remove redundant code --- bin/spark-class | 1 - core/src/main/scala/org/apache/spark/deploy/SparkSubmit.scala | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/bin/spark-class b/bin/spark-class index 613dc9c4566f..6d5fe3e3200c 100755 --- a/bin/spark-class +++ b/bin/spark-class @@ -169,7 +169,6 @@ 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 SparkSubmitDriverBootstrapper export RUNNER - export CLASSPATH export JAVA_OPTS export OUR_JAVA_MEM export SPARK_CLASS=1 diff --git a/core/src/main/scala/org/apache/spark/deploy/SparkSubmit.scala b/core/src/main/scala/org/apache/spark/deploy/SparkSubmit.scala index 5ed3575816a3..6ea8242119ad 100644 --- a/core/src/main/scala/org/apache/spark/deploy/SparkSubmit.scala +++ b/core/src/main/scala/org/apache/spark/deploy/SparkSubmit.scala @@ -261,7 +261,7 @@ object SparkSubmit { } // In yarn-cluster mode, use yarn.Client as a wrapper around the user class - if (clusterManager == YARN && deployMode == CLUSTER) { + if (isYarnCluster) { childMainClass = "org.apache.spark.deploy.yarn.Client" if (args.primaryResource != SPARK_INTERNAL) { childArgs += ("--jar", args.primaryResource)