From fab710a9171932f01ac81d100db8523dbd314925 Mon Sep 17 00:00:00 2001
From: Sun Rui <rui.sun@intel.com>
Date: Fri, 30 Oct 2015 10:51:11 -0700
Subject: [PATCH] [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.
---
core/src/main/scala/org/apache/spark/api/r/RRDD.scala | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
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
--
GitLab