From 396c66a3d65a417618e4ce28c548cca6f028abc0 Mon Sep 17 00:00:00 2001
From: Kevin Yu <qyu@us.ibm.com>
Date: Thu, 22 Oct 2015 00:06:13 -0700
Subject: [PATCH] [SPARK-5966]<Spark-submit deploy-mode cluster is not
 compatible with  master local>

---
 .../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 ad92f5635af35..848912f6df380 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"