Skip to content

Replace tarantoolctl with tt (CE part) #3706

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 17 commits into from
Sep 21, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Fix build warnings
  • Loading branch information
p7nov committed Sep 21, 2023
commit f77a6161310965dd73d6531e36a4bbfb302ff6ee
4 changes: 2 additions & 2 deletions doc/book/admin/logs.rst
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ Logs
Each Tarantool instance logs important events to its own log file ``<instance-name>.log``.
For instances started with :ref:`tt <tt-cli>`, the log location is defined by
the ``log_dir`` parameter in the :ref:`tt configuration <tt-config>`.
By default, it's ``/var/log/tarantool`` in the ``tt`` :ref:`system mode <config_modes>`,
and the ``var/log/`` subdirectory of the ``tt`` working directory in the :ref:`local mode <config_modes>`.
By default, it's ``/var/log/tarantool`` in the ``tt`` :ref:`system mode <tt-config_modes>`,
and the ``var/log/`` subdirectory of the ``tt`` working directory in the :ref:`local mode <tt-config_modes>`.
In the specified location, ``tt`` creates separate directories for each instance's logs.

To check how logging works, write something to the log using the :ref:`log <log-module>` module:
Expand Down
2 changes: 1 addition & 1 deletion doc/book/admin/upgrades/upgrade_cluster.rst
Original file line number Diff line number Diff line change
Expand Up @@ -329,5 +329,5 @@ Switching the master
the replica set state by calling ``box.cfg{ read_only == false }`` on the master.
Then pick another candidate and restart the procedure.

After switching the master, perform the :ref:`replication check <upgrades-admin-replication-check>`
After switching the master, perform the :ref:`replication check <admin-upgrades-replication-check>`
on each instance of the replica set.
2 changes: 1 addition & 1 deletion doc/dev_guide/building_from_source.rst
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@ Additional steps

``tarantoolctl`` is deprecated in favor of :ref:`tt CLI <tt-cli>`.
Find the instructions on switching from ``tarantoolctl`` to ``tt`` in
:ref:`Migration from tarantoolctl to tt <tarantoolctl-migration-to-tt>``.
:ref:`Migration from tarantoolctl to tt <tarantoolctl-migration-to-tt>`.

The CMake option for hinting that the result will be distributed is
:code:`-DENABLE_DIST=ON`. With this option, ``make install``
Expand Down
1 change: 1 addition & 0 deletions doc/how-to/sql/sql_tutorial.rst
Original file line number Diff line number Diff line change
Expand Up @@ -181,6 +181,7 @@ Retrieve the 4 rows in the table, in descending order by ``column2``, then
.. important::

Tarantool has its own

The result is:

.. code-block:: tarantoolsession
Expand Down
2 changes: 1 addition & 1 deletion doc/how-to/vshard_quick.rst
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ This example includes 5 Tarantool instances and 2 replica sets:
* ``storage_2_a`` – a ``storage`` instance, the **master** of the **second** replica set
* ``storage_2_b`` – a ``storage`` instance, the **replica** of the **second** replica set

All instances are managed using the :ref:`tt <tt_cli>` administrative utility.
All instances are managed using the :ref:`tt <tt-cli>` administrative utility.

Change the directory to ``example/`` and use ``make`` to run the development cluster:

Expand Down
2 changes: 1 addition & 1 deletion doc/reference/reference_lua/box_schema/space_create.rst
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ space_opts

.. NOTE::

These options are also passed to :doc:`/reference/reference_lua/box_space/alter`.
These options are also passed to :doc:`/reference/reference_lua/box_space/alter`.

.. _space_opts_if_not_exists:

Expand Down
4 changes: 2 additions & 2 deletions doc/reference/reference_lua/box_space/create_index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ index_opts

.. NOTE::

These options are also passed to :doc:`/reference/reference_lua/box_index/alter`.
These options are also passed to :doc:`/reference/reference_lua/box_index/alter`.

.. _index_opts_type:

Expand Down Expand Up @@ -289,7 +289,7 @@ key_part

.. NOTE::

To create a key part by a field name, you need to specify :ref:`space_object:format() <box_space-format>` first.
To create a key part by a field name, you need to specify :ref:`space_object:format() <box_space-format>` first.

| Type: string or number

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ It is important to set the desired behavior before the initial ``box.cfg{}`` cal
---
- error: 'builtin/box/load_cfg.lua:253: The compat option ''box_cfg_replication_sync_timeout''
takes effect only before the initial box.cfg() call'
...
...

A fresh Tarantool run:

Expand Down
2 changes: 1 addition & 1 deletion doc/reference/reference_lua/compat/compat_tutorial.rst
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ The options list is serialized in the interactive console with additional detail
- - option_2: old
- - option_default_old: default (old)
- - option_default_new: default (new)
...
...

Listing options details
-----------------------
Expand Down
8 changes: 4 additions & 4 deletions doc/reference/reference_rock/vshard/vshard_router.rst
Original file line number Diff line number Diff line change
Expand Up @@ -864,7 +864,7 @@ Router public API
:param options:

* ``timeout`` — a request timeout, in seconds. If the ``router`` cannot identify a
shard with the specified ``bucket_id``, it will retry until the timeout is reached.
shard with the specified ``bucket_id``, it will retry until the timeout is reached.

* other :ref:`net.box options <net_box-options>`, such as ``is_async``,
``buffer``, ``on_push`` are also supported.
Expand All @@ -891,7 +891,7 @@ Router public API
:param options:

* ``timeout`` — a request timeout, in seconds. If the ``router`` cannot identify a
shard with the specified ``bucket_id``, it will retry until the timeout is reached.
shard with the specified ``bucket_id``, it will retry until the timeout is reached.

* other :ref:`net.box options <net_box-options>`, such as ``is_async``,
``buffer``, ``on_push`` are also supported.
Expand Down Expand Up @@ -929,7 +929,7 @@ Router public API
:param options:

* ``timeout`` — a request timeout, in seconds. If the ``router`` cannot identify a
shard with the specified ``bucket_id``, it will retry until the timeout is reached.
shard with the specified ``bucket_id``, it will retry until the timeout is reached.

* other :ref:`net.box options <net_box-options>`, such as ``is_async``,
``buffer``, ``on_push`` are also supported.
Expand Down Expand Up @@ -957,7 +957,7 @@ Router public API
:param options:

* ``timeout`` — a request timeout, in seconds. If the ``router`` cannot identify a
shard with the specified ``bucket_id``, it will retry until the timeout is reached.
shard with the specified ``bucket_id``, it will retry until the timeout is reached.

* other :ref:`net.box options <net_box-options>`, such as ``is_async``,
``buffer``, ``on_push`` are also supported.
Expand Down
2 changes: 2 additions & 0 deletions doc/reference/tooling/tarantoolctl.rst
Original file line number Diff line number Diff line change
Expand Up @@ -236,6 +236,7 @@ as part of Tarantool distribution -- see OS-specific default paths in
:ref:`Notes for operating systems <admin-os_notes>`):

.. code-block:: lua

default_cfg = {
pid_file = "/var/run/tarantool",
wal_dir = "/var/lib/tarantool",
Expand All @@ -246,6 +247,7 @@ as part of Tarantool distribution -- see OS-specific default paths in
language = "Lua",
}
instance_dir = "/etc/tarantool/instances.enabled"

where:

* | ``pid_file``
Expand Down
2 changes: 1 addition & 1 deletion doc/reference/tooling/tt_cli/logrotate.rst
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
.. _tt-logrotate:

Rotating instance logs
====================
======================

.. code-block:: bash

Expand Down