Repository: spark Updated Branches: refs/heads/branch-1.2 ff9428320 -> c07592e40
[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 <and...@databricks.com> 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 (cherry picked from commit a0fa1ba704355a82e168aa9c16ecfed30128ade0) Signed-off-by: Andrew Or <and...@databricks.com> Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/c07592e4 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/c07592e4 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/c07592e4 Branch: refs/heads/branch-1.2 Commit: c07592e4050d7cc7c7288a4b9909cc28cd5467a3 Parents: ff94283 Author: Andrew Or <and...@databricks.com> Authored: Thu Nov 13 11:54:45 2014 -0800 Committer: Andrew Or <and...@databricks.com> Committed: Thu Nov 13 11:55:08 2014 -0800 ---------------------------------------------------------------------- make-distribution.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/c07592e4/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: commits-unsubscr...@spark.apache.org For additional commands, e-mail: commits-h...@spark.apache.org
