File tree Expand file tree Collapse file tree 1 file changed +6
-1
lines changed
core/src/main/scala/org/apache/spark/api/r Expand file tree Collapse file tree 1 file changed +6
-1
lines changed Original file line number Diff line number Diff line change @@ -392,7 +392,12 @@ private[r] object RRDD {
392392 }
393393
394394 private def createRProcess (port : Int , script : String ): BufferedStreamThread = {
395- val rCommand = SparkEnv .get.conf.get(" spark.sparkr.r.command" , " Rscript" )
395+ // "spark.sparkr.r.command" is deprecated and replaced by "spark.r.command",
396+ // but kept here for backward compatibility.
397+ val sparkConf = SparkEnv .get.conf
398+ var rCommand = sparkConf.get(" spark.sparkr.r.command" , " Rscript" )
399+ rCommand = sparkConf.get(" spark.r.command" , rCommand)
400+
396401 val rOptions = " --vanilla"
397402 val rLibDir = RUtils .sparkRPackagePath(isDriver = false )
398403 val rExecScript = rLibDir + " /SparkR/worker/" + script
You can’t perform that action at this time.
0 commit comments