Skip to content

Commit

Permalink
tools: remove tarantoolctl utility
Browse files Browse the repository at this point in the history
tarantoolctl has been removed. Systemd, sysvinit and logrotate scripts
based on it were also removed. All this functionality is covered by the
tt utility.

Closes tarantool#9443

@TarantoolBot document
Title: utils: tarantoolctl has been removed.

Tarantoolctl has been removed. You now need to use the `tt` utility.
Documentation for the `tt` utility can be found at
[tarantool.io](https://www.tarantool.io/ru/doc/latest/reference/tooling/tt_cli/)
  • Loading branch information
0x501D committed Jan 29, 2024
1 parent 3fcd83e commit 1acf62f
Show file tree
Hide file tree
Showing 36 changed files with 9 additions and 3,414 deletions.
4 changes: 1 addition & 3 deletions .github/workflows/static_build_pack_test_deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -172,12 +172,10 @@ jobs:
- name: Run tests
run: |
# Tarantool packages don't provide `tarantoolctl` since series 3.
./test-run.py \
--force \
--builddir ../build \
--executable /usr/bin/tarantool \
--exclude app-tap/tarantoolctl.test.lua
--executable /usr/bin/tarantool
working-directory: test

- name: Send VK Teams message on failure
Expand Down
4 changes: 0 additions & 4 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,6 @@ doc/Makefile
doc/*/Makefile
extra/Makefile
extra/*/Makefile
extra/luarocks/hardcoded.lua
extra/luarocks/hardcoded.lua.c
perf/Makefile
test/Makefile
test/*/Makefile
Expand All @@ -57,8 +55,6 @@ extra/txt2c
extra/bin2c
extra/lemon
extra/mkkeywordhash
extra/dist/tarantoolctl
extra/dist/tarantoolctl.1
extra/dist/tarantool.logrotate
extra/dist/tarantool@.service
extra/dist/tarantool.tmpfiles.conf
Expand Down
5 changes: 0 additions & 5 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,6 @@
path = third_party/zstd
url = https://github.com/tarantool/zstd.git
ignore = dirty
[submodule "third_party/luarocks"]
path = third_party/luarocks
url = https://github.com/tarantool/luarocks.git
branch = luarocks-3.9.2-tarantool
ignore = dirty
[submodule "third_party/decNumber"]
path = third_party/decNumber
url = https://github.com/tarantool/decNumber.git
Expand Down
1 change: 0 additions & 1 deletion .luacheckrc
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ ignore = {

include_files = {
"**/*.lua",
"extra/dist/tarantoolctl.in",
}

exclude_files = {
Expand Down
1 change: 0 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -395,7 +395,6 @@ endif(CMAKE_BUILD_TYPE STREQUAL "Debug")
set(BACKUP_STORAGE https://distrib.hb.vkcs.cloud)

set(EMBED_LUAZLIB ${BUILD_STATIC})
set(EMBED_LUAROCKS ${BUILD_STATIC})

#
# Since we *optionally* build bundled libs, a direct build
Expand Down
7 changes: 7 additions & 0 deletions changelogs/unreleased/gh-9443-remove-tarantoolctl.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
## feature/tools

* `tarantoolctl` has been removed. Systemd, sysvinit and logrotate
scripts based on it were also removed. All this functionality is covered by the `tt` utility.
`tarantoolctl` is no longer available in official deb and rpm packages. This change will only
affect the absence of tarantoolctl in future releases of tarball archives.
(gh-9443).
24 changes: 1 addition & 23 deletions debian/rules
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,12 @@
VERSION := $(shell dpkg-parsechangelog|grep ^Version|awk '{print $$2}')
UVERSION := $(shell echo $(VERSION)|sed 's/-[[:digit:]]\+$$//')

ifneq ($(wildcard /usr/bin/dh_systemd_start),)
WITH_SYSTEMD:=ON
else
WITH_SYSTEMD:=OFF
endif

DEB_CMAKE_EXTRA_FLAGS := \
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
-DCMAKE_INSTALL_LIBDIR=lib/$(DEB_HOST_MULTIARCH) \
-DCMAKE_INSTALL_SYSCONFDIR=/etc \
-DCMAKE_INSTALL_LOCALSTATEDIR=/var \
-DENABLE_DIST=ON \
-DWITH_SYSVINIT=ON \
-DWITH_SYSTEMD=$(WITH_SYSTEMD)
-DENABLE_DIST=ON

# Append -DLUAJIT_ENABLE_GC64=ON flag if ${GC64} env variable is 'true'.
ifeq ($(GC64), true)
Expand All @@ -28,12 +20,7 @@ ifneq ($(MAKE_CHECK), false)
DEB_MAKE_CHECK_TARGET := test-force
endif

# Install tarantool.service within tarantool-common package, but does not
# install it within tarantool and tarantool-dev packages.
DEB_DH_INSTALLINIT_ARGS := --name=tarantool
DEB_DH_SYSTEMD_ENABLE_ARGS_tarantool := --name=tarantool
DEB_DH_SYSTEMD_ENABLE_ARGS_tarantool-common := --name=tarantool tarantool.service
DEB_DH_SYSTEMD_START_ARGS_tarantool-common := --no-restart-on-upgrade tarantool.service

# Needed for proper backtraces in fiber.info()
DEB_DH_STRIP_ARGS := -X/usr/bin/tarantool
Expand All @@ -43,15 +30,6 @@ include /usr/share/dpkg/buildflags.mk
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/cmake.mk

debian/tarantool-common.install:
ifneq ($(wildcard /usr/bin/dh_systemd_start),)
cp -p debian/tarantool-common.install.systemd.in $@
else
cp -p debian/tarantool-common.install.sysvinit.in $@
endif

build-indep: debian/tarantool-common.install

tarball: clean
git describe --long --always > VERSION
tar --exclude=.git --exclude=debian \
Expand Down
5 changes: 0 additions & 5 deletions debian/tarantool-common.dirs

This file was deleted.

9 changes: 0 additions & 9 deletions debian/tarantool-common.install.systemd.in

This file was deleted.

5 changes: 0 additions & 5 deletions debian/tarantool-common.install.sysvinit.in

This file was deleted.

1 change: 0 additions & 1 deletion debian/tarantool-common.lintian-overrides

This file was deleted.

1 change: 0 additions & 1 deletion debian/tarantool-common.tarantool.init

This file was deleted.

3 changes: 0 additions & 3 deletions extra/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
add_subdirectory(dist)
add_subdirectory(luarocks)

if (TARGET_OS_DARWIN)
# NOTE: need add execution 'plutil -lint org.tarantool.tarantool.plist
# to check syntax of plist file.
Expand Down
174 changes: 0 additions & 174 deletions extra/dist/CMakeLists.txt

This file was deleted.

29 changes: 0 additions & 29 deletions extra/dist/default/tarantool.in

This file was deleted.

0 comments on commit 1acf62f

Please sign in to comment.