aboutsummaryrefslogtreecommitdiff
path: root/spark-class
diff options
context:
space:
mode:
authorPatrick Wendell <pwendell@gmail.com>2013-10-25 18:57:42 -0700
committerPatrick Wendell <pwendell@gmail.com>2013-10-25 19:01:15 -0700
commit4ba32678e04dc687a9f574eeeb1450e4d291ae1f (patch)
tree06dfd27cbc0edbbe60a68e31ba396d266963f1b5 /spark-class
parentaf4a529f6efae7d0f7e5915f0221f31ea755a374 (diff)
downloadspark-4ba32678e04dc687a9f574eeeb1450e4d291ae1f.tar.gz
spark-4ba32678e04dc687a9f574eeeb1450e4d291ae1f.tar.bz2
spark-4ba32678e04dc687a9f574eeeb1450e4d291ae1f.zip
Adding improved error message when multiple assembly jars are present.
This can happen easily if building different hadoop versions.
Diffstat (limited to 'spark-class')
-rwxr-xr-xspark-class15
1 files changed, 11 insertions, 4 deletions
diff --git a/spark-class b/spark-class
index e111ef6da7..fb9d1a4f8e 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