You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by pw...@apache.org on 2014/09/18 21:08:09 UTC
git commit: [SPARK-3589][Minor]remove redundant code
Repository: spark
Updated Branches:
refs/heads/master 6cab838b9 -> 471e6a3a4
[SPARK-3589][Minor]remove redundant code
https://issues.apache.org/jira/browse/SPARK-3589
"export CLASSPATH" in spark-class is redundant since same variable is exported before.
We could reuse defined value "isYarnCluster" in SparkSubmit.scala.
Author: WangTaoTheTonic <ba...@aliyun.com>
Closes #2445 from WangTaoTheTonic/removeRedundant and squashes the following commits:
6fb6872 [WangTaoTheTonic] remove redundant code
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/471e6a3a
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/471e6a3a
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/471e6a3a
Branch: refs/heads/master
Commit: 471e6a3a47bd4b94878798f6f6fc93e2e672efff
Parents: 6cab838
Author: WangTaoTheTonic <ba...@aliyun.com>
Authored: Thu Sep 18 12:07:24 2014 -0700
Committer: Patrick Wendell <pw...@gmail.com>
Committed: Thu Sep 18 12:07:53 2014 -0700
----------------------------------------------------------------------
core/src/main/scala/org/apache/spark/deploy/SparkSubmit.scala | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/471e6a3a/core/src/main/scala/org/apache/spark/deploy/SparkSubmit.scala
----------------------------------------------------------------------
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 5d15af1..3dd1dd5 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)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org