This is an automated email from the ASF dual-hosted git repository.
guyuqi pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/bigtop.git
The following commit(s) were added to refs/heads/master by this push:
new d9d08c96e drop YCSB. (#1205)
d9d08c96e is described below
commit d9d08c96e3e31a2d6f440df0cdbcc912afc03902
Author: MacChen01 <[email protected]>
AuthorDate: Fri Nov 3 13:15:49 2023 +0800
drop YCSB. (#1205)
Co-authored-by: MacChen1 <[email protected]>
---
bigtop-deploy/puppet/hieradata/bigtop/cluster.yaml | 2 +-
bigtop-deploy/puppet/hieradata/site.yaml | 1 -
bigtop-deploy/puppet/manifests/cluster.pp | 4 -
.../puppet/modules/ycsb/manifests/init.pp | 29 -------
bigtop-deploy/puppet/modules/ycsb/tests/init.pp | 17 ----
bigtop-packages/src/common/ycsb/do-component-build | 27 ------
bigtop-packages/src/common/ycsb/install_ycsb.sh | 98 ---------------------
.../ycsb/patch0-python-executable-version.diff | 10 ---
bigtop-packages/src/common/ycsb/patch1-log4j.diff | 86 -------------------
.../src/common/ycsb/patch2-repo-url.diff | 85 -------------------
bigtop-packages/src/deb/ycsb/changelog | 1 -
bigtop-packages/src/deb/ycsb/compat | 1 -
bigtop-packages/src/deb/ycsb/control | 30 -------
bigtop-packages/src/deb/ycsb/copyright | 15 ----
bigtop-packages/src/deb/ycsb/rules | 37 --------
bigtop-packages/src/deb/ycsb/source/format | 1 -
bigtop-packages/src/deb/ycsb/ycsb.install | 2 -
bigtop-packages/src/rpm/ycsb/BUILD/.gitignore | 0
bigtop-packages/src/rpm/ycsb/RPMS/.gitignore | 0
bigtop-packages/src/rpm/ycsb/SOURCES/.gitignore | 0
bigtop-packages/src/rpm/ycsb/SPECS/ycsb.spec | 68 ---------------
bigtop-packages/src/rpm/ycsb/SRPMS/.gitignore | 0
bigtop-tests/smoke-tests/ycsb/TestYcsbSmoke.groovy | 99 ----------------------
bigtop-tests/smoke-tests/ycsb/build.gradle | 35 --------
bigtop.bom | 13 +--
provisioner/utils/smoke-tests.sh | 1 -
26 files changed, 3 insertions(+), 659 deletions(-)
diff --git a/bigtop-deploy/puppet/hieradata/bigtop/cluster.yaml
b/bigtop-deploy/puppet/hieradata/bigtop/cluster.yaml
index 8baafadbc..19679be1d 100644
--- a/bigtop-deploy/puppet/hieradata/bigtop/cluster.yaml
+++ b/bigtop-deploy/puppet/hieradata/bigtop/cluster.yaml
@@ -17,7 +17,7 @@
# be installed as usual. Otherwise only a specified list will be set
# Possible elements:
# hadoop,yarn,hbase,alluxio,flink,solr,spark,oozie,hcat,httpfs,
-# pig,hive,zookeeper,ycsb
+# pig,hive,zookeeper
# Example (to deploy only HDFS and YARN server and gateway parts)
# This can be a comma-separated list or an array.
#hadoop_cluster_node::cluster_components:
diff --git a/bigtop-deploy/puppet/hieradata/site.yaml
b/bigtop-deploy/puppet/hieradata/site.yaml
index 094bb8522..124c1c944 100644
--- a/bigtop-deploy/puppet/hieradata/site.yaml
+++ b/bigtop-deploy/puppet/hieradata/site.yaml
@@ -27,7 +27,6 @@ hadoop::hadoop_storage_dirs:
# - spark-standalone
# - tez
# - yarn
-# - ycsb
# - zookeeper
#bigtop::roles_enabled: false
diff --git a/bigtop-deploy/puppet/manifests/cluster.pp
b/bigtop-deploy/puppet/manifests/cluster.pp
index f00ba4649..b14d5511a 100644
--- a/bigtop-deploy/puppet/manifests/cluster.pp
+++ b/bigtop-deploy/puppet/manifests/cluster.pp
@@ -108,9 +108,6 @@ $roles_map = {
worker => ["zookeeper-server"],
client => ["zookeeper-client"],
},
- ycsb => {
- client => ["ycsb-client"],
- },
zeppelin => {
master => ["zeppelin-server"],
},
@@ -194,7 +191,6 @@ class node_with_roles ($roles = hiera("bigtop::roles"))
inherits hadoop_cluster_
"solr",
"spark",
"tez",
- "ycsb",
"kerberos",
"zeppelin",
"kafka",
diff --git a/bigtop-deploy/puppet/modules/ycsb/manifests/init.pp
b/bigtop-deploy/puppet/modules/ycsb/manifests/init.pp
deleted file mode 100644
index ed5c86a78..000000000
--- a/bigtop-deploy/puppet/modules/ycsb/manifests/init.pp
+++ /dev/null
@@ -1,29 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-class ycsb {
-
- class deploy ($roles) {
- if ("ycsb-client" in $roles) {
- include ycsb::client
- }
- }
-
- class client {
- package { ["ycsb"]:
- ensure => latest,
- }
- }
-}
diff --git a/bigtop-deploy/puppet/modules/ycsb/tests/init.pp
b/bigtop-deploy/puppet/modules/ycsb/tests/init.pp
deleted file mode 100644
index da06706a1..000000000
--- a/bigtop-deploy/puppet/modules/ycsb/tests/init.pp
+++ /dev/null
@@ -1,17 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-include ycsb
-ycsb::client { "test-ycsb": }
diff --git a/bigtop-packages/src/common/ycsb/do-component-build
b/bigtop-packages/src/common/ycsb/do-component-build
deleted file mode 100644
index fbda7b360..000000000
--- a/bigtop-packages/src/common/ycsb/do-component-build
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/bash
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-set -ex
-
-. `dirname $0`/bigtop.bom
-
-mvn clean package -DskipTests -pl '!mongodb,!solr,!solr6' "$@"
-
-rm -rf build/dist
-mkdir -p build/dist
-tar -C build/dist --strip-components=1 -xzf
distribution/target/ycsb-$YCSB_VERSION.tar.gz
-
-
diff --git a/bigtop-packages/src/common/ycsb/install_ycsb.sh
b/bigtop-packages/src/common/ycsb/install_ycsb.sh
deleted file mode 100755
index 7e24b136e..000000000
--- a/bigtop-packages/src/common/ycsb/install_ycsb.sh
+++ /dev/null
@@ -1,98 +0,0 @@
-#!/bin/bash
-
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-set -e
-
-usage() {
- echo "
-usage: $0 <options>
- Required not-so-options:
- --build-dir=DIR path to pig dist.dir
- --prefix=PREFIX path to install into
-
- Optional options:
- --lib-dir=DIR path to install pig home [/usr/lib/pig]
- --build-dir=DIR path to pig dist dir
- ... [ see source for more similar options ]
- "
- exit 1
-}
-
-OPTS=$(getopt \
- -n $0 \
- -o '' \
- -l 'prefix:' \
- -l 'lib-dir:' \
- -l 'build-dir:' -- "$@")
-
-if [ $? != 0 ] ; then
- usage
-fi
-
-eval set -- "$OPTS"
-while true ; do
- case "$1" in
- --prefix)
- PREFIX=$2 ; shift 2
- ;;
- --build-dir)
- BUILD_DIR=$2 ; shift 2
- ;;
- --lib-dir)
- LIB_DIR=$2 ; shift 2
- ;;
- --)
- shift ; break
- ;;
- *)
- echo "Unknown option: $1"
- usage
- exit 1
- ;;
- esac
-done
-
-for var in PREFIX BUILD_DIR ; do
- if [ -z "$(eval "echo \$$var")" ]; then
- echo Missing param: $var
- usage
- fi
-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
diff --git
a/bigtop-packages/src/common/ycsb/patch0-python-executable-version.diff
b/bigtop-packages/src/common/ycsb/patch0-python-executable-version.diff
deleted file mode 100644
index 30d14aeb7..000000000
--- a/bigtop-packages/src/common/ycsb/patch0-python-executable-version.diff
+++ /dev/null
@@ -1,10 +0,0 @@
-diff --git a/bin/ycsb b/bin/ycsb
-index 72e218a5..7421e981 100755
---- a/bin/ycsb
-+++ b/bin/ycsb
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python2
- #
- # Copyright (c) 2012 - 2015 YCSB contributors. All rights reserved.
- #
diff --git a/bigtop-packages/src/common/ycsb/patch1-log4j.diff
b/bigtop-packages/src/common/ycsb/patch1-log4j.diff
deleted file mode 100644
index 32c338180..000000000
--- a/bigtop-packages/src/common/ycsb/patch1-log4j.diff
+++ /dev/null
@@ -1,86 +0,0 @@
-diff --git a/elasticsearch5/pom.xml b/elasticsearch5/pom.xml
-index 5d3ff067..77cbe0dd 100644
---- a/elasticsearch5/pom.xml
-+++ b/elasticsearch5/pom.xml
-@@ -165,12 +165,12 @@ LICENSE file.
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-api</artifactId>
-- <version>2.8.2</version>
-+ <version>2.17.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-core</artifactId>
-- <version>2.8.2</version>
-+ <version>2.17.1</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
-diff --git a/ignite/pom.xml b/ignite/pom.xml
-index eabf8d67..f99edf65 100644
---- a/ignite/pom.xml
-+++ b/ignite/pom.xml
-@@ -87,13 +87,13 @@ LICENSE file.
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-api</artifactId>
-- <version>2.11.0</version>
-+ <version>2.17.1</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-core</artifactId>
-- <version>2.11.0</version>
-+ <version>2.17.1</version>
- </dependency>
- </dependencies>
- </project>
-diff --git a/pom.xml b/pom.xml
-index d38c1874..e76f7c9d 100644
---- a/pom.xml
-+++ b/pom.xml
-@@ -81,7 +81,7 @@ LICENSE file.
- <crail.version>1.1-incubating</crail.version>
- <elasticsearch5-version>5.5.1</elasticsearch5-version>
- <foundationdb.version>5.2.5</foundationdb.version>
-- <geode.version>1.2.0</geode.version>
-+ <geode.version>1.14.1</geode.version>
- <googlebigtable.version>1.4.0</googlebigtable.version>
- <griddb.version>4.0.0</griddb.version>
- <hbase098.version>0.98.14-hadoop2</hbase098.version>
-@@ -109,7 +109,7 @@ LICENSE file.
- <tarantool.version>1.6.5</tarantool.version>
- <thrift.version>0.8.0</thrift.version>
- <voldemort.version>0.81</voldemort.version>
-- <tablestore.version>4.8.0</tablestore.version>
-+ <tablestore.version>5.13.6</tablestore.version>
- <voltdb.version>9.1.1</voltdb.version>
- </properties>
-
-diff --git a/voltdb/pom.xml b/voltdb/pom.xml
-index df56baae..1af04016 100644
---- a/voltdb/pom.xml
-+++ b/voltdb/pom.xml
-@@ -44,17 +44,17 @@
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-api</artifactId>
-- <version>2.7</version>
-+ <version>2.17.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-core</artifactId>
-- <version>2.7</version>
-+ <version>2.17.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-slf4j-impl</artifactId>
-- <version>2.7</version>
-+ <version>2.17.1</version>
- </dependency>
- <!-- https://mvnrepository.com/artifact/org.voltdb/voltdbclient
-->
- <dependency>
diff --git a/bigtop-packages/src/common/ycsb/patch2-repo-url.diff
b/bigtop-packages/src/common/ycsb/patch2-repo-url.diff
deleted file mode 100644
index 8cb92a568..000000000
--- a/bigtop-packages/src/common/ycsb/patch2-repo-url.diff
+++ /dev/null
@@ -1,85 +0,0 @@
-diff --git a/cassandra/pom.xml b/cassandra/pom.xml
-index 1b6c1ca..ef3a50d 100644
---- a/cassandra/pom.xml
-+++ b/cassandra/pom.xml
-@@ -97,7 +97,7 @@ LICENSE file.
- <repository>
- <id>central2</id>
- <name>sigar Repository</name>
--
<url>http://repository.jboss.org/nexus/content/groups/public-jboss/</url>
-+
<url>https://repository.jboss.org/nexus/content/groups/public-jboss/</url>
- <layout>default</layout>
- <snapshots>
- <enabled>false</enabled>
-diff --git a/distribution/pom.xml b/distribution/pom.xml
-index f4b1346..4951f37 100644
---- a/distribution/pom.xml
-+++ b/distribution/pom.xml
-@@ -211,11 +211,6 @@
- </dependency>
- <dependency>
- <groupId>site.ycsb</groupId>
-- <artifactId>mongodb-binding</artifactId>
-- <version>${project.version}</version>
-- </dependency>
-- <dependency>
-- <groupId>site.ycsb</groupId>
- <artifactId>nosqldb-binding</artifactId>
- <version>${project.version}</version>
- </dependency>
-@@ -260,16 +255,6 @@
- <version>${project.version}</version>
- </dependency>
- <dependency>
-- <groupId>site.ycsb</groupId>
-- <artifactId>solr-binding</artifactId>
-- <version>${project.version}</version>
-- </dependency>
-- <dependency>
-- <groupId>site.ycsb</groupId>
-- <artifactId>solr6-binding</artifactId>
-- <version>${project.version}</version>
-- </dependency>
-- <dependency>
- <groupId>site.ycsb</groupId>
- <artifactId>tarantool-binding</artifactId>
- <version>${project.version}</version>
-diff --git a/hypertable/pom.xml b/hypertable/pom.xml
-index def12ae..2de1c0c 100644
---- a/hypertable/pom.xml
-+++ b/hypertable/pom.xml
-@@ -52,7 +52,7 @@ LICENSE file.
- <repositories>
- <repository>
- <id>clojars.org</id>
-- <url>http://clojars.org/repo</url>
-+ <url>https://clojars.org/repo</url>
- </repository>
- </repositories>
- </project>
-diff --git a/maprdb/pom.xml b/maprdb/pom.xml
-index 253eca4..e121543 100644
---- a/maprdb/pom.xml
-+++ b/maprdb/pom.xml
-@@ -25,7 +25,7 @@
- <repositories>
- <repository>
- <id>mapr-releases</id>
-- <url>http://repository.mapr.com/maven/</url>
-+ <url>https://repository.mapr.com/maven/</url>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
-diff --git a/maprjsondb/pom.xml b/maprjsondb/pom.xml
-index a9d66d9..0c38afb 100644
---- a/maprjsondb/pom.xml
-+++ b/maprjsondb/pom.xml
-@@ -25,7 +25,7 @@
- <repositories>
- <repository>
- <id>mapr-releases</id>
-- <url>http://repository.mapr.com/maven/</url>
-+ <url>https://repository.mapr.com/maven/</url>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
diff --git a/bigtop-packages/src/deb/ycsb/changelog
b/bigtop-packages/src/deb/ycsb/changelog
deleted file mode 100644
index 547ed021f..000000000
--- a/bigtop-packages/src/deb/ycsb/changelog
+++ /dev/null
@@ -1 +0,0 @@
---- This is auto-generated
diff --git a/bigtop-packages/src/deb/ycsb/compat
b/bigtop-packages/src/deb/ycsb/compat
deleted file mode 100644
index ec635144f..000000000
--- a/bigtop-packages/src/deb/ycsb/compat
+++ /dev/null
@@ -1 +0,0 @@
-9
diff --git a/bigtop-packages/src/deb/ycsb/control
b/bigtop-packages/src/deb/ycsb/control
deleted file mode 100644
index df4232be9..000000000
--- a/bigtop-packages/src/deb/ycsb/control
+++ /dev/null
@@ -1,30 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-Source: ycsb
-Section: misc
-Priority: extra
-Maintainer: Bigtop <[email protected]>
-Build-Depends: debhelper (>= 9)
-Standards-Version: 3.9.4
-Homepage: http://labs.yahoo.com/news/yahoo-cloud-serving-benchmark
-
-Package: ycsb
-Architecture: all
-Depends: python | python2
-Description: The Yahoo! Cloud Serving Benchmark (YCSB) is an open-source
- specification and program suite for evaluating retrieval and
- maintenance capabilities of computer programs. It is often used to
- compare relative performance of NoSQL database management systems.
diff --git a/bigtop-packages/src/deb/ycsb/copyright
b/bigtop-packages/src/deb/ycsb/copyright
deleted file mode 100644
index 10b21102b..000000000
--- a/bigtop-packages/src/deb/ycsb/copyright
+++ /dev/null
@@ -1,15 +0,0 @@
-Format: http://dep.debian.net/deps/dep5
-Source: https://github.com/brianfrankcooper/YCSB
-Upstream-Name: YCSB
-
-Files: *
-Copyright: Yahoo
-License: Apache-2.0
-
-Files debian/*
-Copyright: Yahoo
-License: Apache-2.0
-
-License: Apache-2.0
- On Debian systems, the complete text of the Apache 2.0 license
- can be found in "/usr/share/common-licenses/Apache-2.0".
diff --git a/bigtop-packages/src/deb/ycsb/rules
b/bigtop-packages/src/deb/ycsb/rules
deleted file mode 100755
index 2189bad5b..000000000
--- a/bigtop-packages/src/deb/ycsb/rules
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/usr/bin/make -f
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# -*- makefile -*-
-
-# Uncomment this to turn on verbose mode.
-export DH_VERBOSE=1
-
-# This has to be exported to make some magic below work.
-export DH_OPTIONS
-
-%:
- dh $@
-
-override_dh_auto_build:
- bash debian/do-component-build
-
-override_dh_auto_install:
- sh -x debian/install_ycsb.sh \
- --build-dir=build/dist \
- --prefix=debian/tmp
-
-override_dh_strip_nondeterminism:
diff --git a/bigtop-packages/src/deb/ycsb/source/format
b/bigtop-packages/src/deb/ycsb/source/format
deleted file mode 100644
index 163aaf8d8..000000000
--- a/bigtop-packages/src/deb/ycsb/source/format
+++ /dev/null
@@ -1 +0,0 @@
-3.0 (quilt)
diff --git a/bigtop-packages/src/deb/ycsb/ycsb.install
b/bigtop-packages/src/deb/ycsb/ycsb.install
deleted file mode 100644
index 132db5415..000000000
--- a/bigtop-packages/src/deb/ycsb/ycsb.install
+++ /dev/null
@@ -1,2 +0,0 @@
-/usr/bin/ycsb
-/usr/lib/ycsb
diff --git a/bigtop-packages/src/rpm/ycsb/BUILD/.gitignore
b/bigtop-packages/src/rpm/ycsb/BUILD/.gitignore
deleted file mode 100644
index e69de29bb..000000000
diff --git a/bigtop-packages/src/rpm/ycsb/RPMS/.gitignore
b/bigtop-packages/src/rpm/ycsb/RPMS/.gitignore
deleted file mode 100644
index e69de29bb..000000000
diff --git a/bigtop-packages/src/rpm/ycsb/SOURCES/.gitignore
b/bigtop-packages/src/rpm/ycsb/SOURCES/.gitignore
deleted file mode 100644
index e69de29bb..000000000
diff --git a/bigtop-packages/src/rpm/ycsb/SPECS/ycsb.spec
b/bigtop-packages/src/rpm/ycsb/SPECS/ycsb.spec
deleted file mode 100644
index 752927eda..000000000
--- a/bigtop-packages/src/rpm/ycsb/SPECS/ycsb.spec
+++ /dev/null
@@ -1,68 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-%define ycsb_name ycsb
-%define lib_ycsb /usr/lib/ycsb
-%define usr_bin /usr/bin
-
-# disable repacking jars
-%define __os_install_post %{nil}
-
-Name: ycsb
-Version: %{ycsb_version}
-Release: %{ycsb_release}
-Summary: Yahoo Cloud Serving Benchmark
-URL: http://labs.yahoo.com/news/yahoo-cloud-serving-benchmark
-Group: Development/Libraries
-BuildArch: noarch
-Buildroot: %(mktemp -ud %{_tmppath}/%{ycsb_name}-%{version}-%{release}-XXXXXX)
-License: ASL 2.0
-Source0: %{ycsb_name}-%{ycsb_base_version}.tar.gz
-Source1: do-component-build
-Source2: install_%{ycsb_name}.sh
-Source3: bigtop.bom
-#BIGTOP_PATCH_FILES
-## This package _explicitly_ turns off the auto-discovery of required
dependencies
-## to work around OSGI corner case, added to RPM lately. See BIGTOP-2421 for
more info.
-## python2 be compiled manually and install, not installed by rpm in openEuler
-%if 0%{?openEuler}
-Requires: coreutils, bigtop-utils >= 0.7
-%else
-Requires: coreutils, bigtop-utils >= 0.7, python2
-%endif
-AutoReq: no
-
-%description
-The Yahoo! Cloud Serving Benchmark (YCSB) is an open-source
-specification and program suite for evaluating retrieval and maintenance
-capabilities of computer programs. It is often used to compare relative
-performance of NoSQL database management systems.
-
-%prep
-%setup -n YCSB-%{ycsb_base_version}
-
-#BIGTOP_PATCH_COMMANDS
-
-%build
-bash $RPM_SOURCE_DIR/do-component-build
-
-%install
-%__rm -rf $RPM_BUILD_ROOT
-sh $RPM_SOURCE_DIR/install_ycsb.sh --build-dir=build/dist
--prefix=$RPM_BUILD_ROOT
-
-%files
-%defattr(-,root,root,755)
-%{lib_ycsb}
-%{usr_bin}/ycsb
diff --git a/bigtop-packages/src/rpm/ycsb/SRPMS/.gitignore
b/bigtop-packages/src/rpm/ycsb/SRPMS/.gitignore
deleted file mode 100644
index e69de29bb..000000000
diff --git a/bigtop-tests/smoke-tests/ycsb/TestYcsbSmoke.groovy
b/bigtop-tests/smoke-tests/ycsb/TestYcsbSmoke.groovy
deleted file mode 100644
index a44e4c3c2..000000000
--- a/bigtop-tests/smoke-tests/ycsb/TestYcsbSmoke.groovy
+++ /dev/null
@@ -1,99 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import org.junit.BeforeClass
-import org.junit.AfterClass
-import org.apache.bigtop.itest.shell.Shell
-import static org.junit.Assert.assertNotNull
-import static org.junit.Assert.assertTrue
-import org.junit.Test
-import org.apache.bigtop.itest.JarContent
-import org.apache.bigtop.itest.TestUtils
-import org.junit.runner.RunWith
-import org.apache.bigtop.itest.shell.Shell
-import static org.apache.bigtop.itest.LogErrorsUtils.logError
-import static org.junit.Assert.assertTrue
-
-class TestYcsbSmoke {
- static Shell sh = new Shell("/bin/bash -s");
- static Shell shHBase = new Shell("hbase shell");
-
- static final String YCSB_HOME = System.getenv("YCSB_HOME");
- static final String ycsb_workloadA = YCSB_HOME + "/workloads/workloada ";
-
- static final String create_tbl = "n_splits = 20; create 'usertable', 'cf',
{SPLITS => (1..n_splits).map {|i| \"user#{1000+i*(9999-1000)/n_splits}\"}}";
-
- static final String basic_load = "ycsb load basic ";
- static final String hbase_load = "ycsb load hbase20 ";
- static final String basic_run = "ycsb run basic ";
- static final String hbase_run = "ycsb run hbase20 ";
-
- static final String record_cnt = "recordcount=500000 ";
- static final String op_cnt = "operationcount=500000 ";
-
- @BeforeClass
- static void YcsbSetUp() {
- shHBase.exec(create_tbl);
-
- sh.exec("mkdir -p " + YCSB_HOME + "/hbase20-binding/conf");
- sh.exec("cp /etc/hbase/conf/hbase-site.xml
/usr/lib/ycsb/hbase20-binding/conf");
- }
-
- @Test
- public void BasicDBTest() {
- sh.exec(basic_load
- + "-P " + ycsb_workloadA
- + "-p " + record_cnt
- + "-s >/dev/null 2>load_basic.dat"
- );
- logError(sh);
- assertTrue("YCSB basic load failed." + sh.getOut() + " " + sh.getErr(),
sh.getRet() == 0);
-
- sh.exec(basic_run
- + "-P " + ycsb_workloadA
- + "-p " + record_cnt
- + "-p measurementtype=timeseries "
- + "-p timeseries.granularity=2000 "
- + "-threads 10 -target 100 "
- + "-s >/dev/null 2>transactions_basic.dat"
- );
- logError(sh);
- assertTrue("YCSB basic run failed." + sh.getOut() + " " + sh.getErr(),
sh.getRet() == 0);
- }
-
- @Test
- public void HbaseTest() {
- sh.exec(hbase_load
- + "-P " + ycsb_workloadA
- + "-p table=usertable -p columnfamily=cf "
- + "-p " + record_cnt + "-p " + op_cnt
- + "-threads 10 "
- );
- logError(sh);
- assertTrue("YCSB HBase load failed." + sh.getOut() + " " + sh.getErr(),
sh.getRet() == 0);
-
- sh.exec(hbase_run
- + "-P " + ycsb_workloadA
- + "-p table=usertable -p columnfamily=cf "
- + "-p " + record_cnt + "-p " + op_cnt
- + "-threads 10 "
- );
- logError(sh);
- assertTrue("YCSB HBase run failed." + sh.getOut() + " " + sh.getErr(),
sh.getRet() == 0);
- }
-}
diff --git a/bigtop-tests/smoke-tests/ycsb/build.gradle
b/bigtop-tests/smoke-tests/ycsb/build.gradle
deleted file mode 100644
index 19c6d27ca..000000000
--- a/bigtop-tests/smoke-tests/ycsb/build.gradle
+++ /dev/null
@@ -1,35 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-def tests_to_include() {
- return [
- "TestYcsbSmoke.groovy"
- ];
-}
-
-sourceSets {
- test {
- groovy {
- srcDirs = ["${BIGTOP_HOME}/bigtop-tests/smoke-tests/ycsb/"]
- exclude { FileTreeElement elem -> (doExclude(elem.getName())) }
- }
- }
-}
-
-test.doFirst {
- checkEnv(["YCSB_HOME", "HBASE_HOME", "ZOOKEEPER_HOME", "HADOOP_HOME"])
-}
diff --git a/bigtop.bom b/bigtop.bom
index cc635aa0d..f1e21f80e 100644
--- a/bigtop.bom
+++ b/bigtop.bom
@@ -120,9 +120,9 @@ bigtop {
zookeeper:['hadoop', 'hbase', 'kafka'],
hadoop:['hbase', 'hive', 'tez',
'oozie', 'solr', 'spark', 'ranger',
- 'phoenix', 'alluxio', 'ycsb', 'zeppelin'
+ 'phoenix', 'alluxio', 'zeppelin'
],
- hbase:['phoenix', 'ycsb', 'hive'],
+ hbase:['phoenix', 'hive'],
hive:['oozie', 'zeppelin'],
spark:['livy', 'oozie', 'zeppelin'],
]
@@ -308,15 +308,6 @@ bigtop {
site = "${apache.APACHE_MIRROR}/${download_path}"
archive = "${apache.APACHE_ARCHIVE}/${download_path}" }
}
- 'ycsb' {
- name = 'ycsb'
- relNotes = 'Yahoo! Cloud Serving Benchmark'
- version { base = '0.17.0'; pkg = base; release = 2 }
- tarball { destination = "$name-${version.base}.tar.gz"
- source = "${version.base}.tar.gz" }
- url { site = "https://github.com/brianfrankcooper/YCSB/archive";
- archive = site }
- }
'zeppelin' {
name = 'zeppelin'
rpm_pkg_suffix = "_" + bigtop.base_version.replace(".", "_")
diff --git a/provisioner/utils/smoke-tests.sh b/provisioner/utils/smoke-tests.sh
index 9ce639fac..51de2e9b2 100755
--- a/provisioner/utils/smoke-tests.sh
+++ b/provisioner/utils/smoke-tests.sh
@@ -52,7 +52,6 @@ export RANGER_URL=${RANGER_URL:-http://localhost:6080}
export SPARK_HOME=${SPARK_HOME:-/usr/lib/spark}
export TEZ_HOME=${TEZ_HOME:-/usr/lib/tez}
export WEBHDFS_URL=${WEBHDFS_URL:-$(hostname):50070/webhdfs/v1}
-export YCSB_HOME=${YCSB_HOME:-/usr/lib/ycsb}
export ZEPPELIN_HOME=${ZEPPELIN_HOME:-/usr/lib/zeppelin}
export ZOOKEEPER_HOME=${ZOOKEEPER_HOME:-/usr/lib/zookeeper}
