From 396c66a3d65a417618e4ce28c548cca6f028abc0 Mon Sep 17 00:00:00 2001 From: Kevin Yu Date: Thu, 22 Oct 2015 00:06:13 -0700 Subject: [PATCH 1/3] [SPARK-5966] --- .../src/main/scala/org/apache/spark/deploy/SparkSubmit.scala | 5 +++++ 1 file changed, 5 insertions(+) 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 ad92f5635af3..848912f6df38 100644 --- a/core/src/main/scala/org/apache/spark/deploy/SparkSubmit.scala +++ b/core/src/main/scala/org/apache/spark/deploy/SparkSubmit.scala @@ -266,6 +266,11 @@ object SparkSubmit { } } + // SPARK-5966, check deployMode CLUSTER and master local + if (clusterManager == LOCAL && deployMode == CLUSTER) { + printErrorAndExit("Cluster deploy mode is not compatible with master \"local\"") + } + // Update args.deployMode if it is null. It will be passed down as a Spark property later. (args.deployMode, deployMode) match { case (null, CLIENT) => args.deployMode = "client" From 6bb14916c4fd70a356cd9ea53889233134fd11d9 Mon Sep 17 00:00:00 2001 From: Kevin Yu Date: Thu, 22 Oct 2015 14:47:18 -0700 Subject: [PATCH 2/3] implement code review comments --- .../main/scala/org/apache/spark/deploy/SparkSubmit.scala | 6 ++---- .../org/apache/spark/sql/catalyst/planning/impatient.sc | 1 + 2 files changed, 3 insertions(+), 4 deletions(-) create mode 100644 sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/planning/impatient.sc 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 848912f6df38..37edfe0b5c20 100644 --- a/core/src/main/scala/org/apache/spark/deploy/SparkSubmit.scala +++ b/core/src/main/scala/org/apache/spark/deploy/SparkSubmit.scala @@ -266,10 +266,6 @@ object SparkSubmit { } } - // SPARK-5966, check deployMode CLUSTER and master local - if (clusterManager == LOCAL && deployMode == CLUSTER) { - printErrorAndExit("Cluster deploy mode is not compatible with master \"local\"") - } // Update args.deployMode if it is null. It will be passed down as a Spark property later. (args.deployMode, deployMode) match { @@ -333,6 +329,8 @@ object SparkSubmit { case (STANDALONE, CLUSTER) if args.isR => printErrorAndExit("Cluster deploy mode is currently not supported for R " + "applications on standalone clusters.") + case (LOCAL, CLUSTER) => + printErrorAndExit("Cluster deploy mode is not compatible with master \"local\"") case (_, CLUSTER) if isShell(args.primaryResource) => printErrorAndExit("Cluster deploy mode is not applicable to Spark shells.") case (_, CLUSTER) if isSqlShell(args.mainClass) => diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/planning/impatient.sc b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/planning/impatient.sc new file mode 100644 index 000000000000..decdd80add9f --- /dev/null +++ b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/planning/impatient.sc @@ -0,0 +1 @@ +1+1; From dc758286afbb076678f997c8d767dca2909c8b7d Mon Sep 17 00:00:00 2001 From: Kevin Yu Date: Thu, 22 Oct 2015 14:51:47 -0700 Subject: [PATCH 3/3] implement code review comments --- .../scala/org/apache/spark/sql/catalyst/planning/impatient.sc | 1 - 1 file changed, 1 deletion(-) delete mode 100644 sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/planning/impatient.sc diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/planning/impatient.sc b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/planning/impatient.sc deleted file mode 100644 index decdd80add9f..000000000000 --- a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/planning/impatient.sc +++ /dev/null @@ -1 +0,0 @@ -1+1;