aboutsummaryrefslogtreecommitdiff
path: root/docs/configuration.md
diff options
context:
space:
mode:
authorjerryshao <sshao@hortonworks.com>2015-12-15 18:24:23 -0800
committerAndrew Or <andrew@databricks.com>2015-12-15 18:24:23 -0800
commit63ccdef81329e785807f37b4e918a9247fc70e3c (patch)
tree593d610979db1106498066faf821bf6839508060 /docs/configuration.md
parent765a488494dac0ed38d2b81742c06467b79d96b2 (diff)
downloadspark-63ccdef81329e785807f37b4e918a9247fc70e3c.tar.gz
spark-63ccdef81329e785807f37b4e918a9247fc70e3c.tar.bz2
spark-63ccdef81329e785807f37b4e918a9247fc70e3c.zip
[SPARK-10123][DEPLOY] Support specifying deploy mode from configuration
Please help to review, thanks a lot. Author: jerryshao <sshao@hortonworks.com> Closes #10195 from jerryshao/SPARK-10123.
Diffstat (limited to 'docs/configuration.md')
-rw-r--r--docs/configuration.md15
1 files changed, 12 insertions, 3 deletions
diff --git a/docs/configuration.md b/docs/configuration.md
index 55cf4b2dac..38d3d059f9 100644
--- a/docs/configuration.md
+++ b/docs/configuration.md
@@ -48,7 +48,7 @@ The following format is accepted:
1y (years)
-Properties that specify a byte size should be configured with a unit of size.
+Properties that specify a byte size should be configured with a unit of size.
The following format is accepted:
1b (bytes)
@@ -192,6 +192,15 @@ of the most common options to set are:
<a href="submitting-applications.html#master-urls"> allowed master URL's</a>.
</td>
</tr>
+<tr>
+ <td><code>spark.submit.deployMode</code></td>
+ <td>(none)</td>
+ <td>
+ The deploy mode of Spark driver program, either "client" or "cluster",
+ Which means to launch driver program locally ("client")
+ or remotely ("cluster") on one of the nodes inside the cluster.
+ </td>
+</tr>
</table>
Apart from these, the following properties are also available, and may be useful in some situations:
@@ -1095,7 +1104,7 @@ Apart from these, the following properties are also available, and may be useful
<td><code>spark.rpc.lookupTimeout</code></td>
<td>120s</td>
<td>
- Duration for an RPC remote endpoint lookup operation to wait before timing out.
+ Duration for an RPC remote endpoint lookup operation to wait before timing out.
</td>
</tr>
</table>
@@ -1559,7 +1568,7 @@ Apart from these, the following properties are also available, and may be useful
<td><code>spark.streaming.stopGracefullyOnShutdown</code></td>
<td>false</td>
<td>
- If <code>true</code>, Spark shuts down the <code>StreamingContext</code> gracefully on JVM
+ If <code>true</code>, Spark shuts down the <code>StreamingContext</code> gracefully on JVM
shutdown rather than immediately.
</td>
</tr>