aboutsummaryrefslogtreecommitdiff
path: root/make-distribution.sh
diff options
context:
space:
mode:
authorReynold Xin <rxin@databricks.com>2016-02-26 22:35:12 -0800
committerReynold Xin <rxin@databricks.com>2016-02-26 22:35:12 -0800
commit59e3e10be2f9a1c53979ca72c038adb4fa17ca64 (patch)
tree3d6b2246738484273d36d0ccbec66b733930a3e0 /make-distribution.sh
parentf77dc4e1e202942aa8393fb5d8f492863973fe17 (diff)
downloadspark-59e3e10be2f9a1c53979ca72c038adb4fa17ca64.tar.gz
spark-59e3e10be2f9a1c53979ca72c038adb4fa17ca64.tar.bz2
spark-59e3e10be2f9a1c53979ca72c038adb4fa17ca64.zip
[SPARK-13521][BUILD] Remove reference to Tachyon in cluster & release scripts
## What changes were proposed in this pull request? We provide a very limited set of cluster management script in Spark for Tachyon, although Tachyon itself provides a much better version of it. Given now Spark users can simply use Tachyon as a normal file system and does not require extensive configurations, we can remove this management capabilities to simplify Spark bash scripts. Note that this also reduces coupling between a 3rd party external system and Spark's release scripts, and would eliminate possibility for failures such as Tachyon being renamed or the tar balls being relocated. ## How was this patch tested? N/A Author: Reynold Xin <rxin@databricks.com> Closes #11400 from rxin/release-script.
Diffstat (limited to 'make-distribution.sh')
-rwxr-xr-xmake-distribution.sh50
1 files changed, 1 insertions, 49 deletions
diff --git a/make-distribution.sh b/make-distribution.sh
index 327659298e..20998144f0 100755
--- a/make-distribution.sh
+++ b/make-distribution.sh
@@ -32,11 +32,6 @@ set -x
SPARK_HOME="$(cd "`dirname "$0"`"; pwd)"
DISTDIR="$SPARK_HOME/dist"
-SPARK_TACHYON=false
-TACHYON_VERSION="0.8.2"
-TACHYON_TGZ="tachyon-${TACHYON_VERSION}-bin.tar.gz"
-TACHYON_URL="http://tachyon-project.org/downloads/files/${TACHYON_VERSION}/${TACHYON_TGZ}"
-
MAKE_TGZ=false
NAME=none
MVN="$SPARK_HOME/build/mvn"
@@ -45,7 +40,7 @@ function exit_with_usage {
echo "make-distribution.sh - tool for making binary distributions of Spark"
echo ""
echo "usage:"
- cl_options="[--name] [--tgz] [--mvn <mvn-command>] [--with-tachyon]"
+ cl_options="[--name] [--tgz] [--mvn <mvn-command>]"
echo "./make-distribution.sh $cl_options <maven build options>"
echo "See Spark's \"Building Spark\" doc for correct Maven options."
echo ""
@@ -69,9 +64,6 @@ while (( "$#" )); do
echo "Error: '--with-hive' is no longer supported, use Maven options -Phive and -Phive-thriftserver"
exit_with_usage
;;
- --with-tachyon)
- SPARK_TACHYON=true
- ;;
--tgz)
MAKE_TGZ=true
;;
@@ -150,12 +142,6 @@ else
echo "Making distribution for Spark $VERSION in $DISTDIR..."
fi
-if [ "$SPARK_TACHYON" == "true" ]; then
- echo "Tachyon Enabled"
-else
- echo "Tachyon Disabled"
-fi
-
# Build uber fat JAR
cd "$SPARK_HOME"
@@ -219,40 +205,6 @@ if [ -d "$SPARK_HOME"/R/lib/SparkR ]; then
cp "$SPARK_HOME/R/lib/sparkr.zip" "$DISTDIR"/R/lib
fi
-# Download and copy in tachyon, if requested
-if [ "$SPARK_TACHYON" == "true" ]; then
- TMPD=`mktemp -d 2>/dev/null || mktemp -d -t 'disttmp'`
-
- pushd "$TMPD" > /dev/null
- echo "Fetching tachyon tgz"
-
- TACHYON_DL="${TACHYON_TGZ}.part"
- if [ $(command -v curl) ]; then
- curl --silent -k -L "${TACHYON_URL}" > "${TACHYON_DL}" && mv "${TACHYON_DL}" "${TACHYON_TGZ}"
- elif [ $(command -v wget) ]; then
- wget --quiet "${TACHYON_URL}" -O "${TACHYON_DL}" && mv "${TACHYON_DL}" "${TACHYON_TGZ}"
- else
- printf "You do not have curl or wget installed. please install Tachyon manually.\n"
- exit -1
- fi
-
- tar xzf "${TACHYON_TGZ}"
- cp "tachyon-${TACHYON_VERSION}/assembly/target/tachyon-assemblies-${TACHYON_VERSION}-jar-with-dependencies.jar" "$DISTDIR/lib"
- mkdir -p "$DISTDIR/tachyon/src/main/java/tachyon/web"
- cp -r "tachyon-${TACHYON_VERSION}"/{bin,conf,libexec} "$DISTDIR/tachyon"
- cp -r "tachyon-${TACHYON_VERSION}"/servers/src/main/java/tachyon/web "$DISTDIR/tachyon/src/main/java/tachyon/web"
-
- if [[ `uname -a` == Darwin* ]]; then
- # need to run sed differently on osx
- nl=$'\n'; sed -i "" -e "s|export TACHYON_JAR=\$TACHYON_HOME/target/\(.*\)|# This is set for spark's make-distribution\\$nl export TACHYON_JAR=\$TACHYON_HOME/../lib/\1|" "$DISTDIR/tachyon/libexec/tachyon-config.sh"
- else
- sed -i "s|export TACHYON_JAR=\$TACHYON_HOME/target/\(.*\)|# This is set for spark's make-distribution\n export TACHYON_JAR=\$TACHYON_HOME/../lib/\1|" "$DISTDIR/tachyon/libexec/tachyon-config.sh"
- fi
-
- popd > /dev/null
- rm -rf "$TMPD"
-fi
-
if [ "$MAKE_TGZ" == "true" ]; then
TARDIR_NAME=spark-$VERSION-bin-$NAME
TARDIR="$SPARK_HOME/$TARDIR_NAME"