You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by an...@apache.org on 2015/01/21 19:57:20 UTC
spark git commit: [SPARK-4161]Spark shell class path is not correctly
set if "spark.driver.extraClassPath" is set in defaults.conf
Repository: spark
Updated Branches:
refs/heads/branch-1.2 1d730170c -> e90f6b5c6
[SPARK-4161]Spark shell class path is not correctly set if "spark.driver.extraClassPath" is set in defaults.conf
Author: GuoQiang Li <wi...@qq.com>
Closes #3050 from witgo/SPARK-4161 and squashes the following commits:
abb6fa4 [GuoQiang Li] move usejavacp opt to spark-shell
89e39e7 [GuoQiang Li] review commit
c2a6f04 [GuoQiang Li] Spark shell class path is not correctly set if "spark.driver.extraClassPath" is set in defaults.conf
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/e90f6b5c
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/e90f6b5c
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/e90f6b5c
Branch: refs/heads/branch-1.2
Commit: e90f6b5c6e27c60219aa0129b50985ebade048a0
Parents: 1d73017
Author: GuoQiang Li <wi...@qq.com>
Authored: Wed Dec 10 12:24:04 2014 -0800
Committer: Andrew Or <an...@databricks.com>
Committed: Wed Jan 21 10:57:15 2015 -0800
----------------------------------------------------------------------
bin/spark-shell | 7 +++++++
1 file changed, 7 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/e90f6b5c/bin/spark-shell
----------------------------------------------------------------------
diff --git a/bin/spark-shell b/bin/spark-shell
index 4a0670f..cca5aa0 100755
--- a/bin/spark-shell
+++ b/bin/spark-shell
@@ -45,6 +45,13 @@ source "$FWDIR"/bin/utils.sh
SUBMIT_USAGE_FUNCTION=usage
gatherSparkSubmitOpts "$@"
+# SPARK-4161: scala does not assume use of the java classpath,
+# so we need to add the "-Dscala.usejavacp=true" flag mnually. We
+# do this specifically for the Spark shell because the scala REPL
+# has its own class loader, and any additional classpath specified
+# through spark.driver.extraClassPath is not automatically propagated.
+SPARK_SUBMIT_OPTS="$SPARK_SUBMIT_OPTS -Dscala.usejavacp=true"
+
function main() {
if $cygwin; then
# Workaround for issue involving JLine and Cygwin
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org