remove rest-bench

This is a weak tool; users should look to cosbench or others instead.

Signed-off-by: Sage Weil <[email protected]>

ceph.spec.in

@@ -338,14 +338,6 @@ Obsoletes:	python-ceph < %{epoch}:%{version}-%{release}
 This package contains Python libraries for interacting with Cephs distributed
 file system.
 
-%package -n rest-bench
-Summary:	RESTful benchmark
-Group:		System Environment/Libraries
-License:	LGPL-2.0
-Requires:	ceph-common = %{epoch}:%{version}-%{release}
-%description -n rest-bench
-RESTful bencher that can be used to benchmark radosgw performance.
-
 %package -n ceph-test
 Summary:	Ceph benchmarks and test tools
 Group:		System Environment/Libraries
@@ -495,7 +487,6 @@ export RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed -e 's/i386/i486/'`
 		--mandir="%_mandir" \
 		--with-nss \
 		--without-cryptopp \
-		--with-rest-bench \
 		--with-debug \
 %if 0%{with cephfs_java}
 		--enable-cephfs-java \
@@ -922,11 +913,6 @@ ln -sf %{_libdir}/librbd.so.1 /usr/lib64/qemu/librbd.so.1
 %defattr(-,root,root,-)
 %{python_sitelib}/cephfs.py*
 
-#################################################################################
-%files -n rest-bench
-%defattr(-,root,root,-)
-%{_bindir}/rest-bench
-
 #################################################################################
 %files -n ceph-test
 %defattr(-,root,root,-)

configure.ac

@@ -824,13 +824,6 @@ AS_IF([test "x$with_system_libs3" = xcheck],
             [AC_SEARCH_LIBS([S3_initialize], [s3], [with_system_libs3=yes], [true], [-lpthread])])
 AM_CONDITIONAL(WITH_SYSTEM_LIBS3, [ test "$with_system_libs3" = "yes" ])
 
-# rest-bench?
-AC_ARG_WITH([rest-bench],
-	    [AS_HELP_STRING([--with-rest-bench], [enables rest-bench])],
-	    [],
-	    [with_rest_bench=no])
-AM_CONDITIONAL(WITH_REST_BENCH, [ test "$with_rest_bench" = "yes" ])
-
 # needs libcurl and libxml2
 if test "x$with_rest_bench" = xyes && test "x$with_system_libs3" = xno; then
    AC_CHECK_LIB([curl], [curl_easy_init], [], AC_MSG_ERROR([libcurl not found]))

debian/.gitignore

@@ -27,8 +27,6 @@
 /librbd1
 /radosgw-dbg
 /radosgw
-/rest-bench-dbg
-/rest-bench
 /python-ceph
 /python-rados
 /python-rbd

debian/control

@@ -449,23 +449,6 @@ Description: debugging symbols for radosgw
  .
  This package contains debugging symbols for radosgw.
 
-Package: rest-bench
-Architecture: linux-any
-Depends: ceph-common, curl, xml2, ${misc:Depends}, ${shlibs:Depends}
-Description: RESTful bencher that can be used to benchmark
- radosgw performance.
-
-Package: rest-bench-dbg
-Architecture: linux-any
-Section: debug
-Priority: extra
-Depends: rest-bench (= ${binary:Version}), ceph-common, curl, xml2,
-          ${misc:Depends}, ${shlibs:Depends}
-Description: debugging symbols for rest-bench
- radosgw performance.
- .
- This package contains the debugging symbols for rest-bench.
-
 Package: ceph-test
 Architecture: linux-any
 Depends: ceph-common, curl, xml2, xmlstarlet, ${misc:Depends}, ${shlibs:Depends}

debian/rules

@@ -20,7 +20,7 @@ endif
 
 export DEB_HOST_ARCH      ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
 
-extraopts += --with-ocf --with-rest-bench --with-nss
+extraopts += --with-ocf --with-nss
 extraopts += --with-debug
 extraopts += --enable-cephfs-java
 
@@ -143,7 +143,6 @@ binary-arch: build install
 	dh_strip -plibrbd1 --dbg-package=librbd1-dbg
 	dh_strip -plibcephfs1 --dbg-package=libcephfs1-dbg
 	dh_strip -pradosgw --dbg-package=radosgw-dbg
-	dh_strip -prest-bench --dbg-package=rest-bench-dbg
 	dh_strip -pceph-test --dbg-package=ceph-test-dbg
 
 	dh_compress -a

make-debs.sh

@@ -39,7 +39,7 @@ vers=$(git describe --match "v*" | sed s/^v//)
 # options (otherwise parts of the source tree will be left out).
 #
 ./autogen.sh
-./configure --with-rocksdb --with-ocf --with-rest-bench \
+./configure --with-rocksdb --with-ocf \
     --with-nss --with-debug --enable-cephfs-java \
     --with-lttng --with-babeltrace
 #

qa/qa_scripts/cephscrub.sh

@@ -26,8 +26,6 @@ sudo apt-get -y  purge libcephfs1-dbg
 sudo apt-get -y  purge libcephfs-dev
 sudo apt-get -y  purge radosgw
 sudo apt-get -y  purge radosgw-dbg
-sudo apt-get -y  purge rest-bench
-sudo apt-get -y  purge rest-bench-dbg
 sudo apt-get -y  purge obsync
 sudo apt-get -y  purge python-rados
 sudo apt-get -y  purge python-rbd

src/.gitignore

@@ -74,7 +74,6 @@ Makefile
 /rbd-fuse
 /rbd-replay
 /rbd-replay-prep
-/rest-bench
 /sample.fetch_config
 /simple_client
 /simple_server

src/tools/Makefile.am

@@ -22,21 +22,6 @@ ceph_psim_SOURCES = tools/psim.cc
 ceph_psim_LDADD = $(CEPH_GLOBAL)
 bin_DEBUGPROGRAMS += ceph_psim
 
-if WITH_REST_BENCH
-rest_bench_SOURCES = tools/rest_bench.cc
-rest_bench_SOURCES += common/obj_bencher.cc # needs cleanup so it can go in libcommon.la
-rest_bench_LDADD = $(CEPH_GLOBAL)
-bin_PROGRAMS += rest-bench
-
-if WITH_SYSTEM_LIBS3
-rest_bench_LDADD += -ls3
-else
-rest_bench_LDADD += libs3/build/lib/libs3.a -lcurl -lxml2
-rest_bench_CXXFLAGS = ${AM_CXXFLAGS} -I$(top_srcdir)/src/libs3/inc
-SUBDIRS += libs3
-endif # WITH_SYSTEM_LIBS3
-endif # WITH_REST_BENCH
-
 ceph_conf_SOURCES = tools/ceph_conf.cc
 ceph_conf_LDADD = $(CEPH_GLOBAL) $(LIBCOMMON)
 bin_PROGRAMS += ceph-conf