[SPARK-5966]<Spark-submit deploy-mode cluster is not compatible with master local>

kevinyu98 · kevinyu98 · commit 396c66a3d65a · 2015-10-22T00:06:13.000-07:00
diff --git 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"

Original file line number	Diff line number	Diff line change
`@@ -266,6 +266,11 @@ object SparkSubmit {`
`266`	`266`	`}`
`267`	`267`	`}`
`268`	`268`
	`269`	`+ // SPARK-5966, check deployMode CLUSTER and master local`
	`270`	`+ if (clusterManager == LOCAL && deployMode == CLUSTER) {`
	`271`	`+ printErrorAndExit("Cluster deploy mode is not compatible with master \"local\"")`
	`272`	`+ }`
	`273`	`+`
`269`	`274`	`// Update args.deployMode if it is null. It will be passed down as a Spark property later.`
`270`	`275`	`(args.deployMode, deployMode) match {`
`271`	`276`	`case (null, CLIENT) => args.deployMode = "client"`