diff --git a/dist/debian/changelog.template b/dist/debian/changelog.template index 7ce475135d..99fcaaa3c6 100644 --- a/dist/debian/changelog.template +++ b/dist/debian/changelog.template @@ -1,4 +1,4 @@ -%{product}-tools (%{version}-%{release}-%{revision}) %{codename}; urgency=medium +%{product}-cassandra-stress (%{version}-%{release}-%{revision}) %{codename}; urgency=medium * New release diff --git a/dist/debian/control.template b/dist/debian/control.template index 06b7338db3..ccb1fda9ba 100644 --- a/dist/debian/control.template +++ b/dist/debian/control.template @@ -1,4 +1,4 @@ -Source: %{product}-tools +Source: %{product}-cassandra-stress Section: misc Priority: extra Maintainer: Takuya ASADA @@ -7,16 +7,35 @@ Standards-Version: 3.9.5 Rules-Requires-Root: no Package: %{product}-tools +Depends: %{product}-cassandra-stress, ${misc:Depends} Architecture: all -Depends: %{product}-conf, %{product}-tools-core, ${misc:Depends} +Priority: optional +Section: oldlibs +Description: transitional package + This is a transitional package. It can safely be removed. + +Package: %{product}-tools-core +Depends: %{product}-cassandra-stress-core, ${misc:Depends} +Architecture: all +Priority: optional +Section: oldlibs +Description: transitional package + This is a transitional package. It can safely be removed. + +Package: %{product}-cassandra-stress +Architecture: all +Depends: %{product}-conf, %{product}-cassandra-stress-core, ${misc:Depends} Recommends: ntp | time-daemon -Conflicts: cassandra -Description: Scylla database tools +Replaces: %{product}-tools (<< 5.5) +Breaks: %{product}-tools (<< 5.5) +Description: Scylla Cassandra Stress Scylla is a highly scalable, eventually consistent, distributed, partitioned row DB. -Package: %{product}-tools-core +Package: %{product}-cassandra-stress-core Architecture: all Depends: openjdk-8-jre-headless | openjdk-8-jre | oracle-java8-set-default | adoptopenjdk-8-hotspot-jre | openjdk-11-jre-headless | openjdk-11-jre | oracle-java11-set-default, procps -Description: Scylla database tools core files - Core files for scylla database tools +Replaces: %{product}-tools-core (<< 5.5) +Breaks: %{product}-tools-core (<< 5.5) +Description: Scylla Cassadra Stress core files + Core files for Scylla Cassadra Stress diff --git a/dist/debian/debian/rules b/dist/debian/debian/rules index 00b516ca73..da25f82b9d 100755 --- a/dist/debian/debian/rules +++ b/dist/debian/debian/rules @@ -10,7 +10,7 @@ override_dh_auto_clean: override_dh_auto_install: dh_auto_install - cd scylla-tools; ./install.sh --root "$(CURDIR)/debian/tmp" + cd scylla-cassandra-stress; ./install.sh --root "$(CURDIR)/debian/tmp" override_dh_makeshlibs: diff --git a/dist/debian/debian/scylla-tools-core.install b/dist/debian/debian/scylla-cassandra-stress-core.install similarity index 79% rename from dist/debian/debian/scylla-tools-core.install rename to dist/debian/debian/scylla-cassandra-stress-core.install index df5a48cd1f..ae93e13f95 100644 --- a/dist/debian/debian/scylla-tools-core.install +++ b/dist/debian/debian/scylla-cassandra-stress-core.install @@ -2,9 +2,7 @@ etc/scylla/cassandra/cassandra-env.sh etc/scylla/cassandra/logback.xml etc/scylla/cassandra/logback-tools.xml etc/scylla/cassandra/jvm*.options -usr/bin/scylla-sstableloader opt/scylladb/share/cassandra/bin/cassandra.in.sh opt/scylladb/share/cassandra/lib/*.jar opt/scylladb/share/cassandra/doc/cql3/CQL.css opt/scylladb/share/cassandra/doc/cql3/CQL.html -opt/scylladb/share/cassandra/bin/scylla-sstableloader diff --git a/dist/debian/debian/scylla-cassandra-stress.install b/dist/debian/debian/scylla-cassandra-stress.install new file mode 100644 index 0000000000..0f6280720e --- /dev/null +++ b/dist/debian/debian/scylla-cassandra-stress.install @@ -0,0 +1,4 @@ +opt/scylladb/share/cassandra/bin/cassandra-stress +opt/scylladb/share/cassandra/bin/cassandra-stressd +usr/bin/cassandra-stress +usr/bin/cassandra-stressd diff --git a/dist/debian/debian/scylla-tools.install b/dist/debian/debian/scylla-tools.install deleted file mode 100644 index 20a86bcdc8..0000000000 --- a/dist/debian/debian/scylla-tools.install +++ /dev/null @@ -1,19 +0,0 @@ -etc/bash_completion.d/nodetool-completion -opt/scylladb/share/cassandra/bin/nodetool -opt/scylladb/share/cassandra/bin/nodetool-java -opt/scylladb/share/cassandra/bin/sstableloader -opt/scylladb/share/cassandra/bin/cassandra-stress -opt/scylladb/share/cassandra/bin/cassandra-stressd -opt/scylladb/share/cassandra/bin/sstabledump -opt/scylladb/share/cassandra/bin/sstablelevelreset -opt/scylladb/share/cassandra/bin/sstablemetadata -opt/scylladb/share/cassandra/bin/sstablerepairedset -usr/bin/nodetool -usr/bin/nodetool-java -usr/bin/sstableloader -usr/bin/cassandra-stress -usr/bin/cassandra-stressd -usr/bin/sstabledump -usr/bin/sstablelevelreset -usr/bin/sstablemetadata -usr/bin/sstablerepairedset diff --git a/dist/redhat/scylla-tools.spec b/dist/redhat/scylla-cassandra-stress.spec similarity index 60% rename from dist/redhat/scylla-tools.spec rename to dist/redhat/scylla-cassandra-stress.spec index c203f9d95a..0b1b0791ef 100644 --- a/dist/redhat/scylla-tools.spec +++ b/dist/redhat/scylla-cassandra-stress.spec @@ -1,16 +1,17 @@ -Name: %{product}-tools +Name: %{product}-cassandra-stress Version: %{version} Release: %{release}%{?dist} -Summary: Scylla Tools +Summary: Scylla Cassandra Stress Group: Applications/Databases License: Apache URL: http://www.scylladb.com/ Source0: %{reloc_pkg} BuildArch: noarch -Requires: %{product}-conf %{product}-tools-core +Requires: %{product}-conf %{product}-cassandra-stress-core AutoReqProv: no Conflicts: cassandra +Obsoletes: %{product}-tools < 5.5 %description @@ -18,19 +19,20 @@ Conflicts: cassandra License: Apache URL: http://www.scylladb.com/ BuildArch: noarch -Summary: Core files for Scylla tools +Summary: Core files for Scylla Cassandra Stress Version: %{version} Release: %{release}%{?dist} Requires: jre-11-headless +Obsoletes: %{product}-tools-core < 5.5 %global __brp_python_bytecompile %{nil} %global __brp_mangle_shebangs %{nil} %description core -Core files for scylla tools. +Core files for scylla casssandra stress. %prep -%setup -q -n scylla-tools +%setup -q -n scylla-cassandra-stress %build @@ -40,37 +42,20 @@ rm -rf $RPM_BUILD_ROOT ./install.sh --root "$RPM_BUILD_ROOT" %files -%{_sysconfdir}/bash_completion.d/nodetool-completion -/opt/scylladb/share/cassandra/bin/nodetool -/opt/scylladb/share/cassandra/bin/nodetool-java -/opt/scylladb/share/cassandra/bin/sstableloader /opt/scylladb/share/cassandra/bin/cassandra-stress /opt/scylladb/share/cassandra/bin/cassandra-stressd -/opt/scylladb/share/cassandra/bin/sstabledump -/opt/scylladb/share/cassandra/bin/sstablelevelreset -/opt/scylladb/share/cassandra/bin/sstablemetadata -/opt/scylladb/share/cassandra/bin/sstablerepairedset -%{_bindir}/nodetool -%{_bindir}/nodetool-java -%{_bindir}/sstableloader %{_bindir}/cassandra-stress %{_bindir}/cassandra-stressd -%{_bindir}/sstabledump -%{_bindir}/sstablelevelreset -%{_bindir}/sstablemetadata -%{_bindir}/sstablerepairedset %files core %{_sysconfdir}/scylla/cassandra/cassandra-env.sh %{_sysconfdir}/scylla/cassandra/logback.xml %{_sysconfdir}/scylla/cassandra/logback-tools.xml %{_sysconfdir}/scylla/cassandra/jvm*.options -%{_bindir}/scylla-sstableloader /opt/scylladb/share/cassandra/bin/cassandra.in.sh /opt/scylladb/share/cassandra/lib/*.jar /opt/scylladb/share/cassandra/doc/cql3/CQL.css /opt/scylladb/share/cassandra/doc/cql3/CQL.html -/opt/scylladb/share/cassandra/bin/scylla-sstableloader %changelog * Fri Aug 7 2015 Takuya ASADA Takuya ASADA diff --git a/install.sh b/install.sh index c28305e6b5..f07576e95b 100755 --- a/install.sh +++ b/install.sh @@ -97,7 +97,7 @@ b=\"\$(basename \"\$0\")\" bindir=\"$prefix/share/cassandra/bin\" exec -a \"\$0\" \"\$bindir/\$b\" \"\$@\"" -# scylla-tools-core +# scylla-cassandra-stress-core install -d -m755 "$retc"/scylla/cassandra install -d -m755 "$rprefix"/share/cassandra/lib install -d -m755 "$rprefix"/share/cassandra/doc @@ -131,12 +131,7 @@ install_tool_bin () { fi } -# scylla-tools -install -d -m755 "$retc"/bash_completion.d -install -m644 dist/common/nodetool-completion "$retc"/bash_completion.d -for i in bin/{sstableloader,scylla-sstableloader} tools/bin/{cassandra-stress,cassandra-stressd,sstabledump,sstablelevelreset,sstablemetadata,sstablerepairedset}; do +# scylla-cassandra-stress +for i in tools/bin/{cassandra-stress,cassandra-stressd}; do install_tool_bin "$i" done - -install_tool_bin bin/nodetool-wrapper nodetool -install_tool_bin bin/nodetool nodetool-java diff --git a/reloc/build_deb.sh b/reloc/build_deb.sh index 8f66a7a2e0..3a1211ec8d 100755 --- a/reloc/build_deb.sh +++ b/reloc/build_deb.sh @@ -2,13 +2,13 @@ . /etc/os-release print_usage() { - echo "build_deb.sh --reloc-pkg build/scylla-tools-package.tar.gz" + echo "build_deb.sh --reloc-pkg build/scylla-cassandra-stress-package.tar.gz" echo " --reloc-pkg specify relocatable package path" echo " --builddir specify Debian package build path" exit 1 } -RELOC_PKG=build/scylla-tools-package.tar.gz +RELOC_PKG=build/scylla-cassandra-stress-package.tar.gz BUILDDIR=build/debian while [ $# -gt 0 ]; do case "$1" in @@ -32,7 +32,7 @@ mkdir -p "$BUILDDIR"/scylla-package tar -C "$BUILDDIR"/scylla-package -xpf $RELOC_PKG cd "$BUILDDIR"/scylla-package -mv scylla-tools/debian debian +mv scylla-cassandra-stress/debian debian PKG_NAME=$(dpkg-parsechangelog --show-field Source) # XXX: Drop revision number from version string. # Since it always '1', this should be okay for now. diff --git a/reloc/build_reloc.sh b/reloc/build_reloc.sh index a5ca53060b..cc5aaa5593 100755 --- a/reloc/build_reloc.sh +++ b/reloc/build_reloc.sh @@ -37,7 +37,7 @@ VERSION=$(./SCYLLA-VERSION-GEN ${VERSION_OVERRIDE:+ --version "$VERSION_OVERRIDE # the former command should generate build/SCYLLA-PRODUCT-FILE and some other version # related files PRODUCT=`cat build/SCYLLA-PRODUCT-FILE` -DEST="build/$PRODUCT-tools-$VERSION.noarch.tar.gz" +DEST="build/$PRODUCT-cassandra-stress-$VERSION.noarch.tar.gz" is_redhat_variant() { [ -f /etc/redhat-release ] diff --git a/reloc/build_rpm.sh b/reloc/build_rpm.sh index 63fae20d62..fc161a2622 100755 --- a/reloc/build_rpm.sh +++ b/reloc/build_rpm.sh @@ -2,12 +2,12 @@ . /etc/os-release print_usage() { - echo "build_rpm.sh --reloc-pkg build/scylla-tools-package.tar.gz" + echo "build_rpm.sh --reloc-pkg build/scylla-cassandra-stress-package.tar.gz" echo " --reloc-pkg specify relocatable package path" echo " --builddir specify rpmbuild directory" exit 1 } -RELOC_PKG=build/scylla-tools-package.tar.gz +RELOC_PKG=build/scylla-cassadra-stress-package.tar.gz BUILDDIR=build/redhat while [ $# -gt 0 ]; do case "$1" in @@ -28,8 +28,8 @@ done RELOC_PKG=$(readlink -f $RELOC_PKG) RPMBUILD=$(readlink -f $BUILDDIR) mkdir -p "$BUILDDIR" -tar -C "$BUILDDIR" -xpf $RELOC_PKG scylla-tools/SCYLLA-RELEASE-FILE scylla-tools/SCYLLA-RELOCATABLE-FILE scylla-tools/SCYLLA-VERSION-FILE scylla-tools/SCYLLA-PRODUCT-FILE scylla-tools/dist/redhat -cd "$BUILDDIR"/scylla-tools +tar -C "$BUILDDIR" -xpf $RELOC_PKG scylla-cassandra-stress/SCYLLA-RELEASE-FILE scylla-cassandra-stress/SCYLLA-RELOCATABLE-FILE scylla-cassandra-stress/SCYLLA-VERSION-FILE scylla-cassandra-stress/SCYLLA-PRODUCT-FILE scylla-cassandra-stress/dist/redhat +cd "$BUILDDIR"/scylla-cassandra-stress RELOC_PKG_BASENAME=$(basename "$RELOC_PKG") SCYLLA_VERSION=$(cat SCYLLA-VERSION-FILE) @@ -48,6 +48,6 @@ parameters=( -D"reloc_pkg $RELOC_PKG_BASENAME" ) -cp dist/redhat/scylla-tools.spec $RPMBUILD/SPECS +cp dist/redhat/scylla-cassandra-stress.spec $RPMBUILD/SPECS # this rpm can be install on both fedora / centos7, so drop distribution name from the file name -rpmbuild -ba "${parameters[@]}" --define '_binary_payload w2.xzdio' --define "_topdir $RPMBUILD" --undefine "dist" $RPMBUILD/SPECS/scylla-tools.spec +rpmbuild -ba "${parameters[@]}" --define '_binary_payload w2.xzdio' --define "_topdir $RPMBUILD" --undefine "dist" $RPMBUILD/SPECS/scylla-cassandra-stress.spec diff --git a/scripts/create-relocatable-package.py b/scripts/create-relocatable-package.py index 5e4f550f35..2c56d7889d 100755 --- a/scripts/create-relocatable-package.py +++ b/scripts/create-relocatable-package.py @@ -27,7 +27,7 @@ import tarfile import pathlib -RELOC_PREFIX='scylla-tools' +RELOC_PREFIX='scylla-cassandra-stress' def reloc_add(self, name, arcname=None, recursive=True, *, filter=None): if arcname: return self.add(name, arcname="{}/{}".format(RELOC_PREFIX, arcname))