You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by pw...@apache.org on 2013/10/26 20:39:22 UTC
[1/2] git commit: Adding improved error message when multiple
assembly jars are present.
Updated Branches:
refs/heads/master 662ee9f32 -> e018f2d0a
Adding improved error message when multiple assembly jars are present.
This can happen easily if building different hadoop versions.
Project: http://git-wip-us.apache.org/repos/asf/incubator-spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-spark/commit/4ba32678
Tree: http://git-wip-us.apache.org/repos/asf/incubator-spark/tree/4ba32678
Diff: http://git-wip-us.apache.org/repos/asf/incubator-spark/diff/4ba32678
Branch: refs/heads/master
Commit: 4ba32678e04dc687a9f574eeeb1450e4d291ae1f
Parents: af4a529
Author: Patrick Wendell <pw...@gmail.com>
Authored: Fri Oct 25 18:57:42 2013 -0700
Committer: Patrick Wendell <pw...@gmail.com>
Committed: Fri Oct 25 19:01:15 2013 -0700
----------------------------------------------------------------------
spark-class | 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/4ba32678/spark-class
----------------------------------------------------------------------
diff --git a/spark-class b/spark-class
index e111ef6..fb9d1a4 100755
--- a/spark-class
+++ b/spark-class
@@ -95,10 +95,17 @@ export JAVA_OPTS
if [ ! -f "$FWDIR/RELEASE" ]; then
# Exit if the user hasn't compiled Spark
- ls "$FWDIR"/assembly/target/scala-$SCALA_VERSION/spark-assembly*hadoop*.jar >& /dev/null
- if [[ $? != 0 ]]; then
- echo "Failed to find Spark assembly in $FWDIR/assembly/target" >&2
- echo "You need to build Spark with sbt/sbt assembly before running this program" >&2
+ num_jars=$(ls "$FWDIR"/assembly/target/scala-$SCALA_VERSION/ | grep "spark-assembly.*hadoop.*.jar" | wc -l)
+ jars_list=$(ls "$FWDIR"/assembly/target/scala-$SCALA_VERSION/ | grep "spark-assembly.*hadoop.*.jar")
+ if [ "$num_jars" -eq "0" ]; then
+ echo "Failed to find Spark assembly in $FWDIR/assembly/target/scala-$SCALA_VERSION/" >&2
+ echo "You need to build Spark with 'sbt/sbt assembly' before running this program." >&2
+ exit 1
+ fi
+ if [ "$num_jars" -gt "1" ]; then
+ echo "Found multiple Spark assembly jars in $FWDIR/assembly/target/scala-$SCALA_VERSION:" >&2
+ echo "$jars_list"
+ echo "Please remove all but one jar."
exit 1
fi
fi
[2/2] git commit: Merge pull request #113 from pwendell/master
Posted by pw...@apache.org.
Merge pull request #113 from pwendell/master
Improve error message when multiple assembly jars are present.
This can happen easily if building different hadoop versions. Right now it gives a class not found exception.
Project: http://git-wip-us.apache.org/repos/asf/incubator-spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-spark/commit/e018f2d0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-spark/tree/e018f2d0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-spark/diff/e018f2d0
Branch: refs/heads/master
Commit: e018f2d0ae826b682dda30c1ecfb0c51ad7edf58
Parents: 662ee9f 4ba3267
Author: Patrick Wendell <pw...@gmail.com>
Authored: Sat Oct 26 11:39:15 2013 -0700
Committer: Patrick Wendell <pw...@gmail.com>
Committed: Sat Oct 26 11:39:15 2013 -0700
----------------------------------------------------------------------
spark-class | 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)
----------------------------------------------------------------------