ingore it in SparkSubmit instead of SparkContext

Author: WangTaoTheTonic

core/src/main/scala/org/apache/spark/SparkContext.scala

@@ -175,6 +175,10 @@ class SparkContext(config: SparkConf) extends SparkStatusAPI with Logging {
     logInfo("Spark configuration:\n" + conf.toDebugString)
   }
 
+  // Set Spark driver host and port system properties.
+  conf.setIfMissing("spark.driver.host", Utils.localHostName())
+  conf.setIfMissing("spark.driver.port", "0")
+
   val jars: Seq[String] =
     conf.getOption("spark.jars").map(_.split(",")).map(_.filter(_.size != 0)).toSeq.flatten
 
@@ -202,14 +206,6 @@ class SparkContext(config: SparkConf) extends SparkStatusAPI with Logging {
 
   if (master == "yarn-client") System.setProperty("SPARK_YARN_MODE", "true")
 
-  // Set Spark driver host and port system properties. Ignore host setting in all cluster modes.
-  if (master.contains("cluster")) {
-    conf.set("spark.driver.host", Utils.localHostName())
-  } else {
-    conf.setIfMissing("spark.driver.host", Utils.localHostName())
-  }
-  conf.setIfMissing("spark.driver.port", "0")
-
   // An asynchronous listener bus for Spark events
   private[spark] val listenerBus = new LiveListenerBus
 

core/src/main/scala/org/apache/spark/deploy/Client.scala

@@ -155,14 +155,6 @@ object Client {
     }
     conf.set("spark.akka.askTimeout", "10")
     conf.set("akka.loglevel", driverArgs.logLevel.toString.replace("WARN", "WARNING"))
-
-    // Set the web ui port to be ephemeral so we don't conflict with other spark processes
-    // running on the same box
-    conf.set("spark.ui.port", "0")
-
-    // Set the master property to match the requested mode.
-    conf.set("spark.master", "standalone-cluster")
-
     Logger.getRootLogger.setLevel(driverArgs.logLevel)
 
     val (actorSystem, _) = AkkaUtils.createActorSystem(

core/src/main/scala/org/apache/spark/deploy/SparkSubmit.scala

@@ -279,6 +279,10 @@ object SparkSubmit {
       sysProps.getOrElseUpdate(k, v)
     }
 
+    if (deployMode == CLUSTER) {
+      sysProps -= ("spark.driver.host")
+    }
+
     // Resolve paths in certain spark properties
     val pathConfigs = Seq(
       "spark.jars",