Repository: bigtop Updated Branches: refs/heads/master 093d38659 -> 2e1795361
BIGTOP-2957: Upgrade YCSB to 0.12.0 Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/2e179536 Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/2e179536 Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/2e179536 Branch: refs/heads/master Commit: 2e1795361d55c0a6f15f1bae7ff5cd6714367621 Parents: 093d386 Author: Youngwoo Kim <[email protected]> Authored: Fri Dec 8 11:46:29 2017 +0900 Committer: Youngwoo Kim <[email protected]> Committed: Fri Dec 15 14:53:13 2017 +0900 ---------------------------------------------------------------------- .../src/common/ycsb/do-component-build | 2 +- bigtop-packages/src/common/ycsb/install_ycsb.sh | 19 +++++++++++++++++++ bigtop-packages/src/deb/ycsb/ycsb.install | 1 + bigtop-packages/src/rpm/ycsb/SPECS/ycsb.spec | 2 ++ bigtop.bom | 2 +- 5 files changed, 24 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/bigtop/blob/2e179536/bigtop-packages/src/common/ycsb/do-component-build ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/common/ycsb/do-component-build b/bigtop-packages/src/common/ycsb/do-component-build index dafb220..ba4020d 100644 --- a/bigtop-packages/src/common/ycsb/do-component-build +++ b/bigtop-packages/src/common/ycsb/do-component-build @@ -18,7 +18,7 @@ set -ex . `dirname $0`/bigtop.bom -mvn clean package -DskipTests -Dhbase10.version=$HBASE_VERSION "$@" +mvn clean package -DskipTests "$@" rm -rf build/dist mkdir -p build/dist http://git-wip-us.apache.org/repos/asf/bigtop/blob/2e179536/bigtop-packages/src/common/ycsb/install_ycsb.sh ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/common/ycsb/install_ycsb.sh b/bigtop-packages/src/common/ycsb/install_ycsb.sh index acf54fa..7e24b13 100755 --- a/bigtop-packages/src/common/ycsb/install_ycsb.sh +++ b/bigtop-packages/src/common/ycsb/install_ycsb.sh @@ -74,6 +74,25 @@ for var in PREFIX BUILD_DIR ; do done LIB_DIR=${LIB_DIR:-/usr/lib/ycsb} +BIN_DIR=${BIN_DIR:-$PREFIX/usr/bin} install -d -m 0755 $PREFIX/$LIB_DIR +install -d -m 0755 ${BIN_DIR} + (cd ${BUILD_DIR} && tar -cf - .)|(cd $PREFIX/${LIB_DIR} && tar -xf -) +rm -rf $PREFIX/$LIB_DIR/bin/*.bat + +wrapper=$BIN_DIR/ycsb +cat >>$wrapper <<EOF +#!/bin/bash +BIGTOP_DEFAULTS_DIR=${BIGTOP_DEFAULTS_DIR-/etc/default} +[ -n "${BIGTOP_DEFAULTS_DIR}" -a -r ${BIGTOP_DEFAULTS_DIR}/hadoop ] && . ${BIGTOP_DEFAULTS_DIR}/hadoop + +# Autodetect JAVA_HOME if not defined +if [ -e /usr/lib/bigtop-utils/bigtop-detect-javahome ]; then + . /usr/lib/bigtop-utils/bigtop-detect-javahome +fi + +exec $LIB_DIR/bin/ycsb "\$@" +EOF +chmod 755 $wrapper http://git-wip-us.apache.org/repos/asf/bigtop/blob/2e179536/bigtop-packages/src/deb/ycsb/ycsb.install ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/deb/ycsb/ycsb.install b/bigtop-packages/src/deb/ycsb/ycsb.install index 9cd9b22..132db54 100644 --- a/bigtop-packages/src/deb/ycsb/ycsb.install +++ b/bigtop-packages/src/deb/ycsb/ycsb.install @@ -1 +1,2 @@ +/usr/bin/ycsb /usr/lib/ycsb http://git-wip-us.apache.org/repos/asf/bigtop/blob/2e179536/bigtop-packages/src/rpm/ycsb/SPECS/ycsb.spec ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/rpm/ycsb/SPECS/ycsb.spec b/bigtop-packages/src/rpm/ycsb/SPECS/ycsb.spec index f89bf2e..25bc157 100644 --- a/bigtop-packages/src/rpm/ycsb/SPECS/ycsb.spec +++ b/bigtop-packages/src/rpm/ycsb/SPECS/ycsb.spec @@ -15,6 +15,7 @@ %define ycsb_name ycsb %define lib_ycsb /usr/lib/ycsb +%define usr_bin /usr/bin # disable repacking jars %define __os_install_post %{nil} @@ -56,3 +57,4 @@ sh $RPM_SOURCE_DIR/install_ycsb.sh --build-dir=build/dist --prefix=$RPM_BUILD_RO %files %defattr(-,root,root,755) %{lib_ycsb} +%{usr_bin}/ycsb http://git-wip-us.apache.org/repos/asf/bigtop/blob/2e179536/bigtop.bom ---------------------------------------------------------------------- diff --git a/bigtop.bom b/bigtop.bom index 6143a57..f346d88 100644 --- a/bigtop.bom +++ b/bigtop.bom @@ -414,7 +414,7 @@ bigtop { 'ycsb' { name = 'ycsb' relNotes = 'Yahoo! Cloud Serving Benchmark' - version { base = '0.4.0'; pkg = base; release = 1 } + version { base = '0.12.0'; pkg = base; release = 1 } tarball { destination = "$name-${version.base}.tar.gz" source = "${version.base}.tar.gz" } url { site = "https://github.com/brianfrankcooper/YCSB/archive";
