diff options
Diffstat (limited to 'core/src/main/scala')
4 files changed, 29 insertions, 4 deletions
diff --git a/core/src/main/scala/spark/deploy/master/Master.scala b/core/src/main/scala/spark/deploy/master/Master.scala index bd8f94d1ef..c98dddea7b 100644 --- a/core/src/main/scala/spark/deploy/master/Master.scala +++ b/core/src/main/scala/spark/deploy/master/Master.scala @@ -42,7 +42,7 @@ class Master(ip: String, port: Int, webUiPort: Int) extends Actor with Logging { def startWebUi() { val webUi = new MasterWebUI(context.system, self) try { - AkkaUtils.startSprayServer(context.system, ip, webUiPort, webUi.handler) + AkkaUtils.startSprayServer(context.system, "0.0.0.0", webUiPort, webUi.handler) } catch { case e: Exception => logError("Failed to create web UI", e) diff --git a/core/src/main/scala/spark/deploy/master/MasterArguments.scala b/core/src/main/scala/spark/deploy/master/MasterArguments.scala index 5d975cd546..0f7a92bdd0 100644 --- a/core/src/main/scala/spark/deploy/master/MasterArguments.scala +++ b/core/src/main/scala/spark/deploy/master/MasterArguments.scala @@ -10,7 +10,18 @@ class MasterArguments(args: Array[String]) { var ip = Utils.localIpAddress() var port = 7077 var webUiPort = 8080 - + + // Check for settings in environment variables + if (System.getenv("SPARK_MASTER_IP") != null) { + ip = System.getenv("SPARK_MASTER_IP") + } + if (System.getenv("SPARK_MASTER_PORT") != null) { + port = System.getenv("SPARK_MASTER_PORT").toInt + } + if (System.getenv("SPARK_MASTER_WEBUI_PORT") != null) { + webUiPort = System.getenv("SPARK_MASTER_WEBUI_PORT").toInt + } + parse(args.toList) def parse(args: List[String]): Unit = args match { diff --git a/core/src/main/scala/spark/deploy/worker/Worker.scala b/core/src/main/scala/spark/deploy/worker/Worker.scala index 8647f118ee..0a80463c0b 100644 --- a/core/src/main/scala/spark/deploy/worker/Worker.scala +++ b/core/src/main/scala/spark/deploy/worker/Worker.scala @@ -87,7 +87,7 @@ class Worker(ip: String, port: Int, webUiPort: Int, cores: Int, memory: Int, mas def startWebUi() { val webUi = new WorkerWebUI(context.system, self) try { - AkkaUtils.startSprayServer(context.system, ip, webUiPort, webUi.handler) + AkkaUtils.startSprayServer(context.system, "0.0.0.0", webUiPort, webUi.handler) } catch { case e: Exception => logError("Failed to create web UI", e) diff --git a/core/src/main/scala/spark/deploy/worker/WorkerArguments.scala b/core/src/main/scala/spark/deploy/worker/WorkerArguments.scala index 3248d03697..1efe8304ea 100644 --- a/core/src/main/scala/spark/deploy/worker/WorkerArguments.scala +++ b/core/src/main/scala/spark/deploy/worker/WorkerArguments.scala @@ -15,7 +15,21 @@ class WorkerArguments(args: Array[String]) { var cores = inferDefaultCores() var memory = inferDefaultMemory() var master: String = null - + + // Check for settings in environment variables + if (System.getenv("SPARK_WORKER_PORT") != null) { + port = System.getenv("SPARK_WORKER_PORT").toInt + } + if (System.getenv("SPARK_WORKER_CORES") != null) { + cores = System.getenv("SPARK_WORKER_CORES").toInt + } + if (System.getenv("SPARK_WORKER_MEMORY") != null) { + memory = Utils.memoryStringToMb(System.getenv("SPARK_WORKER_MEMORY")) + } + if (System.getenv("SPARK_WORKER_WEBUI_PORT") != null) { + webUiPort = System.getenv("SPARK_WORKER_WEBUI_PORT").toInt + } + parse(args.toList) def parse(args: List[String]): Unit = args match { |