aboutsummaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorJeff Zhang <zjffdu@apache.org>2016-08-31 00:20:41 -0700
committerFelix Cheung <felixcheung@apache.org>2016-08-31 00:20:41 -0700
commitfa6347938fc1c72ddc03a5f3cd2e929b5694f0a6 (patch)
tree7fc3cab4dc91e6b4ff04d6f88e6cddb1798a2944 /docs
parentd92cd227cf245be9ab8f9bce714386f8283a97cb (diff)
downloadspark-fa6347938fc1c72ddc03a5f3cd2e929b5694f0a6.tar.gz
spark-fa6347938fc1c72ddc03a5f3cd2e929b5694f0a6.tar.bz2
spark-fa6347938fc1c72ddc03a5f3cd2e929b5694f0a6.zip
[SPARK-17178][SPARKR][SPARKSUBMIT] Allow to set sparkr shell command through --conf
## What changes were proposed in this pull request? Allow user to set sparkr shell command through --conf spark.r.shell.command ## How was this patch tested? Unit test is added and also verify it manually through ``` bin/sparkr --master yarn-client --conf spark.r.shell.command=/usr/local/bin/R ``` Author: Jeff Zhang <zjffdu@apache.org> Closes #14744 from zjffdu/SPARK-17178.
Diffstat (limited to 'docs')
-rw-r--r--docs/configuration.md11
1 files changed, 10 insertions, 1 deletions
diff --git a/docs/configuration.md b/docs/configuration.md
index d0c76aaad0..6e98f67b73 100644
--- a/docs/configuration.md
+++ b/docs/configuration.md
@@ -1786,6 +1786,14 @@ showDF(properties, numRows = 200, truncate = FALSE)
Executable for executing R scripts in client modes for driver. Ignored in cluster modes.
</td>
</tr>
+<tr>
+ <td><code>spark.r.shell.command</code></td>
+ <td>R</td>
+ <td>
+ Executable for executing sparkR shell in client modes for driver. Ignored in cluster modes. It is the same as environment variable <code>SPARKR_DRIVER_R</code>, but take precedence over it.
+ <code>spark.r.shell.command</code> is used for sparkR shell while <code>spark.r.driver.command</code> is used for running R script.
+ </td>
+</tr>
</table>
#### Deploy
@@ -1852,7 +1860,8 @@ The following variables can be set in `spark-env.sh`:
</tr>
<tr>
<td><code>SPARKR_DRIVER_R</code></td>
- <td>R binary executable to use for SparkR shell (default is <code>R</code>).</td>
+ <td>R binary executable to use for SparkR shell (default is <code>R</code>).
+ Property <code>spark.r.shell.command</code> take precedence if it is set</td>
</tr>
<tr>
<td><code>SPARK_LOCAL_IP</code></td>