Repository: spark Updated Branches: refs/heads/master ca26a212f -> a0fa1ba70
[HOT FIX] make-distribution.sh fails if Yarn shuffle jar DNE This is introduced in #3147 and is failing builds without the `-Pyarn` profile. Author: Andrew Or <[email protected]> Closes #3250 from andrewor14/fix-yarn-shuffle-build and squashes the following commits: 42b3d37 [Andrew Or] Do not fail fast if Yarn shuffle jar does not exist Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/a0fa1ba7 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/a0fa1ba7 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/a0fa1ba7 Branch: refs/heads/master Commit: a0fa1ba704355a82e168aa9c16ecfed30128ade0 Parents: ca26a21 Author: Andrew Or <[email protected]> Authored: Thu Nov 13 11:54:45 2014 -0800 Committer: Andrew Or <[email protected]> Committed: Thu Nov 13 11:54:45 2014 -0800 ---------------------------------------------------------------------- make-distribution.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/a0fa1ba7/make-distribution.sh ---------------------------------------------------------------------- diff --git a/make-distribution.sh b/make-distribution.sh index 55cbdc1..2267b1a 100755 --- a/make-distribution.sh +++ b/make-distribution.sh @@ -181,7 +181,9 @@ echo "Spark $VERSION$GITREVSTRING built for Hadoop $SPARK_HADOOP_VERSION" > "$DI # Copy jars cp "$FWDIR"/assembly/target/scala*/*assembly*hadoop*.jar "$DISTDIR/lib/" cp "$FWDIR"/examples/target/scala*/spark-examples*.jar "$DISTDIR/lib/" -cp "$FWDIR"/network/yarn/target/scala*/spark-*-yarn-shuffle.jar "$DISTDIR/lib/" +# This will fail if the -Pyarn profile is not provided +# In this case, silence the error and ignore the return code of this command +cp "$FWDIR"/network/yarn/target/scala*/spark-*-yarn-shuffle.jar "$DISTDIR/lib/" &> /dev/null || : # Copy example sources (needed for python and SQL) mkdir -p "$DISTDIR/examples/src/main" --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
