From a646a365e3beb8d0cd7e492e625ce68ee9439a07 Mon Sep 17 00:00:00 2001
From: Andrew Or <andrewor14@gmail.com>
Date: Tue, 5 Aug 2014 00:39:07 -0700
Subject: [PATCH] [SPARK-2857] Correct properties to set Master / Worker ports
`master.ui.port` and `worker.ui.port` were never picked up by SparkConf, simply because they are not prefixed with "spark." Unfortunately, this is also currently the documented way of setting these values.
Author: Andrew Or <andrewor14@gmail.com>
Closes #1779 from andrewor14/master-worker-port and squashes the following commits:
8475e95 [Andrew Or] Update docs to reflect changes in configs
4db3d5d [Andrew Or] Stop using configs that don't actually work
---
.../org/apache/spark/deploy/master/MasterArguments.scala | 4 ++--
.../scala/org/apache/spark/deploy/worker/ui/WorkerWebUI.scala | 2 +-
docs/spark-standalone.md | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/core/src/main/scala/org/apache/spark/deploy/master/MasterArguments.scala b/core/src/main/scala/org/apache/spark/deploy/master/MasterArguments.scala
index a87781fb93..4b0dbbe543 100644
--- a/core/src/main/scala/org/apache/spark/deploy/master/MasterArguments.scala
+++ b/core/src/main/scala/org/apache/spark/deploy/master/MasterArguments.scala
@@ -38,8 +38,8 @@ private[spark] class MasterArguments(args: Array[String], conf: SparkConf) {
if (System.getenv("SPARK_MASTER_WEBUI_PORT") != null) {
webUiPort = System.getenv("SPARK_MASTER_WEBUI_PORT").toInt
}
- if (conf.contains("master.ui.port")) {
- webUiPort = conf.get("master.ui.port").toInt
+ if (conf.contains("spark.master.ui.port")) {
+ webUiPort = conf.get("spark.master.ui.port").toInt
}
parse(args.toList)
diff --git a/core/src/main/scala/org/apache/spark/deploy/worker/ui/WorkerWebUI.scala b/core/src/main/scala/org/apache/spark/deploy/worker/ui/WorkerWebUI.scala
index 0ad2edba22..a9f531e9e4 100644
--- a/core/src/main/scala/org/apache/spark/deploy/worker/ui/WorkerWebUI.scala
+++ b/core/src/main/scala/org/apache/spark/deploy/worker/ui/WorkerWebUI.scala
@@ -58,6 +58,6 @@ private[spark] object WorkerWebUI {
val STATIC_RESOURCE_BASE = SparkUI.STATIC_RESOURCE_DIR
def getUIPort(requestedPort: Option[Int], conf: SparkConf): Int = {
- requestedPort.getOrElse(conf.getInt("worker.ui.port", WorkerWebUI.DEFAULT_PORT))
+ requestedPort.getOrElse(conf.getInt("spark.worker.ui.port", WorkerWebUI.DEFAULT_PORT))
}
}
diff --git a/docs/spark-standalone.md b/docs/spark-standalone.md
index 2fb30765f3..293a7ac9bc 100644
--- a/docs/spark-standalone.md
+++ b/docs/spark-standalone.md
@@ -314,7 +314,7 @@ configure those ports.
<td>Standalone Cluster Master</td>
<td>8080</td>
<td>Web UI</td>
- <td><code>master.ui.port</code></td>
+ <td><code>spark.master.ui.port</code></td>
<td>Jetty-based</td>
</tr>
<tr>
@@ -338,7 +338,7 @@ configure those ports.
<td>Worker</td>
<td>8081</td>
<td>Web UI</td>
- <td><code>worker.ui.port</code></td>
+ <td><code>spark.worker.ui.port</code></td>
<td>Jetty-based</td>
</tr>
<!-- Cluster interactions -->
--
GitLab