Skip to content

[SPARK-6797][SPARKR] Add support for YARN cluster mode. #6743

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
sun-rui wants to merge 17 commits into from
Closed

[SPARK-6797][SPARKR] Add support for YARN cluster mode. #6743

Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
cedfbe2
[SPARK-6797][SPARKR] Add support for YARN cluster mode.
Jun 10, 2015
681afb0
Fix a bug that RRunner does not handle client deployment modes.
Jun 11, 2015
3bed438
Add a comment.
Jun 12, 2015
7b916c5
Use 'rem' consistently.
Jun 14, 2015
49ff948
Invoke jar.exe with full path in install-dev.bat.
Jun 14, 2015
41d4f17
Add support for locating SparkR package for R workers required by RDD…
Jun 29, 2015
0aa1e97
Fix scala style.
Jun 29, 2015
1acefd1
Fix scala style.
Jun 29, 2015
2ca5048
Fix comments.
Jun 30, 2015
b05340c
Fix scala style.
Jun 30, 2015
c38a005
Unzipped SparkR binary package is still required for standalone and M…
Jun 30, 2015
35ecfa3
Fix comments.
Jul 7, 2015
fe25a33
Fix Mima test error.
Jul 8, 2015
193882f
Fix Mima test error.
Jul 8, 2015
72695fb
Fix unit test failures.
Jul 8, 2015
7313374
Fix unit test errors.
Jul 8, 2015
ca63c86
Adjust MimaExcludes after rebase.
Jul 13, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix a bug that RRunner does not handle client deployment modes.
  • Loading branch information
Sun Rui committed Jul 13, 2015
commit 681afb044573d3204f3122cb6eeeda7f3d938215
12 changes: 9 additions & 3 deletions core/src/main/scala/org/apache/spark/deploy/RRunner.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,9 +71,15 @@ object RRunner {
val builder = new ProcessBuilder(Seq(rCommand, rFileNormalized) ++ otherArgs)
val env = builder.environment()
env.put("EXISTING_SPARKR_BACKEND_PORT", sparkRBackendPort.toString)
// The SparkR package distributed as an archive resource should be pointed to
// by a symbol link "sparkr" in the current directory.
val rPackageDir = new File("sparkr").getAbsolutePath
val rPackageDir =
if (System.getProperty("spark.master") == "yarn-cluster") {
// The SparkR package distributed as an archive resource should be pointed to
// by a symbol link "sparkr" in the current directory.
new File("sparkr").getAbsolutePath
} else {
val sparkHome = System.getenv("SPARK_HOME")
Seq(sparkHome, "R", "lib").mkString(File.separator)
}
env.put("SPARKR_PACKAGE_DIR", rPackageDir)
env.put("R_PROFILE_USER",
Seq(rPackageDir, "SparkR", "profile", "general.R").mkString(File.separator))
Expand Down