diff options
| author | Sun Rui <rui.sun@intel.com> | 2015-10-30 10:51:11 -0700 |
|---|---|---|
| committer | Shivaram Venkataraman <shivaram@cs.berkeley.edu> | 2015-10-30 10:51:11 -0700 |
| commit | fab710a9171932f01ac81d100db8523dbd314925 (patch) | |
| tree | 81133497e37024a1090bd767488924ca7da5ecbd /core | |
| parent | 0451b00148a294c665146563242d2fe2de943a02 (diff) | |
| download | spark-fab710a9171932f01ac81d100db8523dbd314925.tar.gz spark-fab710a9171932f01ac81d100db8523dbd314925.tar.bz2 spark-fab710a9171932f01ac81d100db8523dbd314925.zip | |
[SPARK-11414][SPARKR] Forgot to update usage of 'spark.sparkr.r.command' in RRDD in the PR for SPARK-10971.
Author: Sun Rui <rui.sun@intel.com>
Closes #9368 from sun-rui/SPARK-11414.
Diffstat (limited to 'core')
| -rw-r--r-- | core/src/main/scala/org/apache/spark/api/r/RRDD.scala | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/core/src/main/scala/org/apache/spark/api/r/RRDD.scala b/core/src/main/scala/org/apache/spark/api/r/RRDD.scala index 9d5bbb5d60..6b418e908c 100644 --- a/core/src/main/scala/org/apache/spark/api/r/RRDD.scala +++ b/core/src/main/scala/org/apache/spark/api/r/RRDD.scala @@ -392,7 +392,12 @@ private[r] object RRDD { } private def createRProcess(port: Int, script: String): BufferedStreamThread = { - val rCommand = SparkEnv.get.conf.get("spark.sparkr.r.command", "Rscript") + // "spark.sparkr.r.command" is deprecated and replaced by "spark.r.command", + // but kept here for backward compatibility. + val sparkConf = SparkEnv.get.conf + var rCommand = sparkConf.get("spark.sparkr.r.command", "Rscript") + rCommand = sparkConf.get("spark.r.command", rCommand) + val rOptions = "--vanilla" val rLibDir = RUtils.sparkRPackagePath(isDriver = false) val rExecScript = rLibDir + "/SparkR/worker/" + script |