Skip to content

Commit

Permalink
Revert "PS-7764: Implement ZenFS for binary tarballs and create a sep…
Browse files Browse the repository at this point in the history
…arate package for Debian (percona#4368)"

This reverts commit c7798ee.
  • Loading branch information
inikep committed Aug 15, 2023
1 parent 6cde6fe commit 92de309
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 310 deletions.
50 changes: 4 additions & 46 deletions build-ps/build-binary.sh
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@ WITH_JEMALLOC=''
WITH_MECAB_OPTION=''
DEBUG_EXTRA=''
WITH_SSL='/usr'
WITH_ZENFS='OFF'
ZENFS_EXTRA=''
OPENSSL_INCLUDE=''
OPENSSL_LIBRARY=''
CRYPTO_LIBRARY=''
Expand All @@ -41,7 +39,7 @@ TAR=${TAR:-tar}
if ! getopt --test
then
go_out="$(getopt --options=iqdvj:m:t: \
--longoptions=i686,quiet,debug,valgrind,with-jemalloc:,with-zenfs,with-mecab:,with-ssl:,tag: \
--longoptions=i686,quiet,debug,valgrind,with-jemalloc:,with-mecab:,with-ssl:,tag: \
--name="$(basename "$0")" -- "$@")"
test $? -eq 0 || exit 1
eval set -- $go_out
Expand Down Expand Up @@ -106,12 +104,6 @@ do
exit 3
fi
;;
--with-zenfs )
shift
TARBALL_SUFFIX="-zenfs"
WITH_ZENFS="ON"
ZENFS_EXTRA="-DROCKSDB_PLUGINS=zenfs"
;;
-t | --tag )
shift
TAG="$1"
Expand Down Expand Up @@ -262,7 +254,6 @@ fi
cmake $SOURCEDIR ${CMAKE_OPTS:-} -DBUILD_CONFIG=mysql_release \
-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE:-RelWithDebInfo} \
$DEBUG_EXTRA \
$ZENFS_EXTRA \
-DFEATURE_SET=community \
-DCMAKE_INSTALL_PREFIX="/usr/local/$PRODUCT_FULL" \
-DMYSQL_DATADIR="/usr/local/$PRODUCT_FULL/data" \
Expand Down Expand Up @@ -307,29 +298,6 @@ fi
cp COPYING "$INSTALLDIR/usr/local/$PRODUCT_FULL/COPYING-jemalloc"
)
fi
# Build zenfs
if [[ ${WITH_ZENFS} == "ON" ]]; then
if [[ -f $INSTALLDIR/zenfs ]]; then
echo "ZenFS utils is built"
else
SOURCEDIR=${WORKDIR_ABS}/rocksdb-source
INSTALL_ROOT=${WORKDIR_ABS}/rocksdb-root
BUILD_ROOT=${WORKDIR_ABS}/rocksdb-build

mkdir ${WORKDIR_ABS}/rocksdb-root ${WORKDIR_ABS}/rocksdb-build

pushd $SOURCEDIR
CC=clang-12 CXX=clang++-12 make DISABLE_WARNING_AS_ERROR=1 PREFIX=${INSTALL_ROOT}/usr OBJ_DIR=${BUILD_ROOT} ROCKSDB_PLUGINS=zenfs -j$(nproc) install-static
popd

pushd $SOURCEDIR/plugin/zenfs/util
PKG_CONFIG_PATH=$INSTALL_ROOT/usr/lib/pkgconfig make CC=clang-12 CXX=clang++-12 -j$(nproc)
popd

cp $SOURCEDIR/plugin/zenfs/util/zenfs $INSTALLDIR/
rm -rf $INSTALL_ROOT $BUILD_ROOT $SOURCEDIR
fi
fi
)

(
Expand Down Expand Up @@ -456,19 +424,15 @@ fi
fi

# NORMAL TARBALL
if [[ ${WITH_ZENFS} != "ON" ]]; then
cd "$INSTALLDIR/usr/local/$PRODUCT_FULL"
link
fi
cd "$INSTALLDIR/usr/local/$PRODUCT_FULL"
link

# MIN TARBALL
if [[ $CMAKE_BUILD_TYPE != "Debug" ]]; then
cd "$INSTALLDIR/usr/local/minimal/$PRODUCT_FULL-minimal"
rm -rf mysql-test 2> /dev/null
find . -type f -exec file '{}' \; | grep ': ELF ' | cut -d':' -f1 | xargs strip --strip-unneeded
if [[ ${WITH_ZENFS} != "ON" ]]; then
link
fi
link
fi
)

Expand All @@ -477,17 +441,11 @@ fi
cd "$INSTALLDIR/usr/local/"
#PS-4854 Percona Server for MySQL tarball without AGPLv3 dependency/license
find $PRODUCT_FULL -type f -name 'COPYING.AGPLv3' -delete
if [[ ${WITH_ZENFS} == "ON" ]]; then
install -m 0755 $INSTALLDIR/zenfs $PRODUCT_FULL/bin
fi
$TAR --owner=0 --group=0 -czf "$WORKDIR_ABS/$PRODUCT_FULL.tar.gz" $PRODUCT_FULL

if [[ $CMAKE_BUILD_TYPE != "Debug" ]]; then
cd "$INSTALLDIR/usr/local/minimal/"
find $PRODUCT_FULL-minimal -type f -name 'COPYING.AGPLv3' -delete
if [[ ${WITH_ZENFS} == "ON" ]]; then
install -m 0755 $INSTALLDIR/zenfs $PRODUCT_FULL-minimal/bin
fi
$TAR --owner=0 --group=0 -czf "$WORKDIR_ABS/$PRODUCT_FULL-minimal.tar.gz" $PRODUCT_FULL-minimal
fi
)
Expand Down
220 changes: 0 additions & 220 deletions build-ps/debian/rules_zenfs

This file was deleted.

Loading

0 comments on commit 92de309

Please sign in to comment.