Skip to content

Commit f9268d9

Browse files
committed
Fix code review comments
1 parent e6ad12d commit f9268d9

File tree

2 files changed

+8
-9
lines changed

2 files changed

+8
-9
lines changed

pkg/R/sparkRClient.R

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,22 +47,22 @@ launchBackendSparkSubmit <- function(
4747
sparkHome,
4848
sparkSubmitOpts) {
4949
if (.Platform$OS.type == "unix") {
50-
spark_submit_bin_name = "spark-submit"
50+
sparkSubmitBinName = "spark-submit"
5151
} else {
52-
spark_submit_bin_name = "spark-submit.cmd"
52+
sparkSubmitBinName = "spark-submit.cmd"
5353
}
5454

5555
if (sparkHome != "") {
56-
spark_submit_bin <- file.path(sparkHome, "bin", spark_submit_bin_name)
56+
sparkSubmitBin <- file.path(sparkHome, "bin", sparkSubmitBinName)
5757
} else {
58-
spark_submit_bin <- spark_submit_bin_name
58+
sparkSubmitBin <- sparkSubmitBinName
5959
}
6060

6161
# Since this function is only used while launching R shell using spark-submit,
6262
# the format we need to construct is
6363
# spark-submit --class <mainClass> <sparkSubmitOpts> <jarFile> <appOpts>
6464

6565
combinedArgs <- paste("--class", mainClass, sparkSubmitOpts, appJar, args, sep = " ")
66-
cat("Launching java with spark-submit command ", spark_submit_bin, " ", combinedArgs, "\n")
67-
invisible(system2(spark_submit_bin, combinedArgs, wait = F))
66+
cat("Launching java with spark-submit command ", sparkSubmitBin, " ", combinedArgs, "\n")
67+
invisible(system2(sparkSubmitBin, combinedArgs, wait = F))
6868
}

pkg/src/src/main/scala/edu/berkeley/cs/amplab/sparkr/SparkRRunner.scala

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,7 @@ object SparkRRunner {
3737
// Java system properties etc.
3838
val sparkRBackend = new SparkRBackend()
3939
val sparkRBackendThread = new Thread() {
40-
val finishedInit = new Semaphore(1)
41-
finishedInit.acquire()
40+
val finishedInit = new Semaphore(0)
4241

4342
override def run() {
4443
sparkRBackend.init(sparkRBackendPort)
@@ -58,7 +57,7 @@ object SparkRRunner {
5857
// Launch R
5958
val builder = new ProcessBuilder(Seq(rCommand, rFileNormalized) ++ otherArgs)
6059
val env = builder.environment()
61-
env.put("EXISTING_SPARKR_BACKEND_PORT", "" + sparkRBackendPort)
60+
env.put("EXISTING_SPARKR_BACKEND_PORT", sparkRBackendPort.toString)
6261
builder.redirectErrorStream(true) // Ugly but needed for stdout and stderr to synchronize
6362
val process = builder.start()
6463

0 commit comments

Comments
 (0)