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 9d5bbb5d609f37f4020c9e0a5da3c287df273982..6b418e908cb53c3e1b39cfe796120064c9286aab 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