Skip to content
Snippets Groups Projects
Commit c392a9ef authored by Shivaram Venkataraman's avatar Shivaram Venkataraman
Browse files

[SPARK-8637] [SPARKR] [HOTFIX] Fix packages argument, sparkSubmitBinName

cc cafreeman

Author: Shivaram Venkataraman <shivaram@cs.berkeley.edu>

Closes #7022 from shivaram/sparkr-init-hotfix and squashes the following commits:

9178d15 [Shivaram Venkataraman] Fix packages argument, sparkSubmitBinName
parent 2519dcc3
No related branches found
No related tags found
No related merge requests found
...@@ -57,7 +57,7 @@ generateSparkSubmitArgs <- function(args, sparkHome, jars, sparkSubmitOpts, pack ...@@ -57,7 +57,7 @@ generateSparkSubmitArgs <- function(args, sparkHome, jars, sparkSubmitOpts, pack
} }
launchBackend <- function(args, sparkHome, jars, sparkSubmitOpts, packages) { launchBackend <- function(args, sparkHome, jars, sparkSubmitOpts, packages) {
sparkSubmitBin <- determineSparkSubmitBin() sparkSubmitBinName <- determineSparkSubmitBin()
if (sparkHome != "") { if (sparkHome != "") {
sparkSubmitBin <- file.path(sparkHome, "bin", sparkSubmitBinName) sparkSubmitBin <- file.path(sparkHome, "bin", sparkSubmitBinName)
} else { } else {
......
...@@ -132,7 +132,7 @@ sparkR.init <- function( ...@@ -132,7 +132,7 @@ sparkR.init <- function(
sparkHome = sparkHome, sparkHome = sparkHome,
jars = jars, jars = jars,
sparkSubmitOpts = Sys.getenv("SPARKR_SUBMIT_ARGS", "sparkr-shell"), sparkSubmitOpts = Sys.getenv("SPARKR_SUBMIT_ARGS", "sparkr-shell"),
sparkPackages = sparkPackages) packages = sparkPackages)
# wait atmost 100 seconds for JVM to launch # wait atmost 100 seconds for JVM to launch
wait <- 0.1 wait <- 0.1
for (i in 1:25) { for (i in 1:25) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment