aboutsummaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorMarcelo Vanzin <vanzin@cloudera.com>2017-02-09 22:06:46 +0900
committerKousuke Saruta <sarutak@oss.nttdata.co.jp>2017-02-09 22:06:46 +0900
commit3fc8e8caf81d0049daf9b776ad4059b0df81630f (patch)
tree1c95fc4c278a08be5b72f11dd0cf89d1604028d8 /docs
parent1a09cd634610329e85ff212c71cf67c697da5f84 (diff)
downloadspark-3fc8e8caf81d0049daf9b776ad4059b0df81630f.tar.gz
spark-3fc8e8caf81d0049daf9b776ad4059b0df81630f.tar.bz2
spark-3fc8e8caf81d0049daf9b776ad4059b0df81630f.zip
[SPARK-17874][CORE] Add SSL port configuration.
Make the SSL port configuration explicit, instead of deriving it from the non-SSL port, but retain the existing functionality in case anyone depends on it. The change starts the HTTPS and HTTP connectors separately, so that it's possible to use independent ports for each. For that to work, the initialization of the server needs to be shuffled around a bit. The change also makes it so the initialization of both connectors is similar, and end up using the same Scheduler - previously only the HTTP connector would use the correct one. Also fixed some outdated documentation about a couple of services that were removed long ago. Tested with unit tests and by running spark-shell with SSL configs. Author: Marcelo Vanzin <vanzin@cloudera.com> Closes #16625 from vanzin/SPARK-17874.
Diffstat (limited to 'docs')
-rw-r--r--docs/configuration.md14
-rw-r--r--docs/security.md2
2 files changed, 15 insertions, 1 deletions
diff --git a/docs/configuration.md b/docs/configuration.md
index 7c040330db..2eaaa21fe4 100644
--- a/docs/configuration.md
+++ b/docs/configuration.md
@@ -1797,6 +1797,20 @@ Apart from these, the following properties are also available, and may be useful
</td>
</tr>
<tr>
+ <td><code>spark.ssl.[namespace].port</code></td>
+ <td>None</td>
+ <td>
+ The port where the SSL service will listen on.
+
+ <br />The port must be defined within a namespace configuration; see
+ <a href="security.html#ssl-configuration">SSL Configuration</a> for the available
+ namespaces.
+
+ <br />When not set, the SSL port will be derived from the non-SSL port for the
+ same service. A value of "0" will make the service bind to an ephemeral port.
+ </td>
+ </tr>
+ <tr>
<td><code>spark.ssl.enabledAlgorithms</code></td>
<td>Empty</td>
<td>
diff --git a/docs/security.md b/docs/security.md
index 67956930fe..42a09a9148 100644
--- a/docs/security.md
+++ b/docs/security.md
@@ -50,7 +50,7 @@ component-specific configuration namespaces used to override the default setting
</tr>
<tr>
<td><code>spark.ssl.fs</code></td>
- <td>HTTP file server and broadcast server</td>
+ <td>File download client (used to download jars and files from HTTPS-enabled servers).</td>
</tr>
<tr>
<td><code>spark.ssl.ui</code></td>