From 2b286926b9623f0f154eab02f57fb48673b9bef7 Mon Sep 17 00:00:00 2001
From: WangTaoTheTonic <barneystinson@aliyun.com>
Date: Thu, 18 Sep 2014 12:07:24 -0700
Subject: [PATCH] [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 <barneystinson@aliyun.com>
Closes #2445 from WangTaoTheTonic/removeRedundant and squashes the following commits:
6fb6872 [WangTaoTheTonic] remove redundant code
(cherry picked from commit 471e6a3a47bd4b94878798f6f6fc93e2e672efff)
Signed-off-by: Patrick Wendell <pwendell@gmail.com>
---
core/src/main/scala/org/apache/spark/deploy/SparkSubmit.scala | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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 0fdb5ae3c2..7903ceb9ee 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)
--
GitLab