[SPARK-5078] Optionally read from SPARK_LOCAL_HOSTNAME

marmbrus · pwendell · commit a3978f3e156e · 2015-01-12T11:57:59.000-08:00
Current spark lets you set the ip address using SPARK_LOCAL_IP, but then this is given to akka after doing a reverse DNS lookup. This makes it difficult to run spark in Docker. You can already change the hostname that is used programmatically, but it would be nice to be able to do this with an environment variable as well. Author: Michael Armbrust <michael@databricks.com> Closes apache#3893 from marmbrus/localHostnameEnv and squashes the following commits: 85045b6 [Michael Armbrust] Optionally read from SPARK_LOCAL_HOSTNAME
diff --git a/core/src/main/scala/org/apache/spark/util/Utils.scala b/core/src/main/scala/org/apache/spark/util/Utils.scala
@@ -701,7 +701,7 @@ private[spark] object Utils extends Logging {
     }
   }
 
-  private var customHostname: Option[String] = None
+  private var customHostname: Option[String] = sys.env.get("SPARK_LOCAL_HOSTNAME")
 
   /**
    * Allow setting a custom host name because when we run on Mesos we need to use the same

Original file line number	Diff line number	Diff line change
`@@ -701,7 +701,7 @@ private[spark] object Utils extends Logging {`
`701`	`701`	`}`
`702`	`702`	`}`
`703`	`703`
`704`		`- private var customHostname: Option[String] = None`
	`704`	`+ private var customHostname: Option[String] = sys.env.get("SPARK_LOCAL_HOSTNAME")`
`705`	`705`
`706`	`706`	`/**`
`707`	`707`	`* Allow setting a custom host name because when we run on Mesos we need to use the same`