Skip to content

Fixes gh-2185 IPROTO_BALLOT rework and a new field #2241

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.

Sign up for GitHub

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 7 commits into from
Aug 12, 2021
Merged

Fixes gh-2185 IPROTO_BALLOT rework and a new field #2241

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d0ece72
Fixes gh-2185 IPROTO_BALLOT rework and a new field
pgulutzan Jul 13, 2021
fea09e3
Corrected version numbers of IPROTO_BALLOT change
pgulutzan Jul 13, 2021
152d90c
Change iproto_ballot_ro to iproto_ballot_is_ro
pgulutzan Jul 16, 2021
edcc899
Update doc/dev_guide/internals/box_protocol.rst
veod32 Jul 20, 2021
ccdce48
Update translations
patiencedaur Jul 20, 2021
294b56b
Update translations
alexandra-mara Jul 27, 2021
b2113a1
Merge branch 'latest' into pgulutzan-gh-2185
alexandra-mara Aug 12, 2021
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
35 changes: 28 additions & 7 deletions doc/dev_guide/internals/box_protocol.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,11 +168,12 @@ The IPROTO constants that appear within requests or responses that we will descr
IPROTO_EXPR=0x27
IPROTO_OPS=0x28
IPROTO_BALLOT=0x29
IPROTO_BALLOT_IS_RO=0x01
IPROTO_BALLOT_IS_RO_CFG=0x01
IPROTO_BALLOT_VCLOCK=0x02
IPROTO_BALLOT_GC_VCLOCK=0x03
IPROTO_BALLOT_IS_LOADING=0x04
IPROTO_BALLOT_IS_RO=0x04
IPROTO_BALLOT_IS_ANON=0x05
IPROTO_BALLOT_IS_BOOTED=0x06
IPROTO_TUPLE_META=0x2a
IPROTO_OPTIONS=0x2b
IPROTO_DATA=0x30
Expand Down Expand Up @@ -1273,16 +1274,36 @@ The fields within IPROTO_BALLOT are map items:

.. code-block:: none

IPROTO_BALLOT_IS_RO (0x01) + MP_BOOL
IPROTO_BALLOT_IS_RO_CFG (0x01) + MP_BOOL
IPROTO_BALLOT_VCLOCK (0x02) + vclock
IPROTO_BALLOT_GC_VCLOCK (0x03) + vclock
IPROTO_BALLOT_IS_LOADING (0x04) + MP_BOOL
IPROTO_BALLOT_IS_RO (0x04) + MP_BOOL
IPROTO_BALLOT_IS_ANON = 0x05 + MP_BOOL
IPROTO_BALLOT_IS_BOOTED = 0x06 + MP_BOOL

IPROTO_BALLOt-IS_ANON corresponds to :ref:`box.cfg.replication_anon <cfg_replication-replication_anon>`.
IPROTO_BALLOT_IS_RO_CFG and IPRO_BALLOT_VCLOCK and IPROTO_BALLOT_GC_VCLOCK and IPROTO_BALLOT_IS_RO
were added in version :doc:`2.6.1 </release/2.6.1>`.
IPROTO_BALLOT_IS_ANON was added in version :doc:`2.7.1 </release/2.7.1>`.
IPROTO_BALLOT_IS_BOOTED was added in version 2.7.3 and 2.8.2 and 2.9.1.
Copy link
Collaborator

@veod32 veod32 Jul 20, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These versions are not released yet.

Copy link
Contributor Author

@pgulutzan pgulutzan Jul 21, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's an improvement to change "IPROTO_BALLOT_GC_VCLOCK may have the value" to "IPROTO_BALLOT_GC_VCLOCK can be the clock value", yes.

It's true that "These versions are not released yet." In fact the changes have been done already. However, in #2185, in response to the question "@Gerold103 Since which Tarantool version we have these changes?", the answer was "2.9.1, 2.8.2, 2.7.3". I understood this to mean that these are the versions that we should mention.

There have been some name changes starting with version 2.7.3 and 2.8.2 and 2.9.1:
Copy link
Collaborator

@veod32 veod32 Jul 20, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These versions are not released yet.

IPROTO_BALLOT_IS_RO_CFG was formerly called IPROTO_BALLOT_IS_RO,
and IPROTO_BALLOT_IS_RO was formerly called IPROTO_BALLOT_IS_LOADING.

The items other than IPROTO_BALLOT_IS_ANON were added in version :doc:`2.6.1 </release/2.6.1>`.
PROTO_BALLOT_IS_ANON was added in version :doc:`2.7.1 </release/2.7.1>`.
IPROTO_BALLOT_IS_RO_CFG corresponds to :ref:`box.cfg.read_only <cfg_basic-read_only>`.

IPROTO_BALLOT_GC_VCLOCK can be the vclock value of the instance's oldest
WAL entry, which corresponds to :ref:`box.info.gc().vclock <box_info_gc>`.

IPROTO_BALLOT_IS_RO is true if the instance is not writable,
which may happen for a variety of reasons, such as:
it was configured as :ref:`read_only <cfg_basic-read_only>`,
or it has :ref:`orphan status <replication-orphan_status>`,
or it is a :ref:`Raft <repl_leader_elect>` follower.

IPROTO_BALLOT_IS_ANON corresponds to :ref:`box.cfg.replication_anon <cfg_replication-replication_anon>`.

IPROTO_BALLOT_IS_BOOTED is true if the instance has finished its
bootstrap or recovery process.

.. _box_protocol-flags:

Expand Down
89 changes: 68 additions & 21 deletions locale/ru/LC_MESSAGES/dev_guide/internals/box_protocol.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,11 +289,12 @@ msgid ""
"IPROTO_EXPR=0x27\n"
"IPROTO_OPS=0x28\n"
"IPROTO_BALLOT=0x29\n"
"IPROTO_BALLOT_IS_RO=0x01\n"
"IPROTO_BALLOT_IS_RO_CFG=0x01\n"
"IPROTO_BALLOT_VCLOCK=0x02\n"
"IPROTO_BALLOT_GC_VCLOCK=0x03\n"
"IPROTO_BALLOT_IS_LOADING=0x04\n"
"IPROTO_BALLOT_IS_RO=0x04\n"
"IPROTO_BALLOT_IS_ANON=0x05\n"
"IPROTO_BALLOT_IS_BOOTED=0x06\n"
"IPROTO_TUPLE_META=0x2a\n"
"IPROTO_OPTIONS=0x2b\n"
"IPROTO_DATA=0x30\n"
Expand Down Expand Up @@ -337,11 +338,12 @@ msgstr ""
"IPROTO_EXPR=0x27\n"
"IPROTO_OPS=0x28\n"
"IPROTO_BALLOT=0x29\n"
"IPROTO_BALLOT_IS_RO=0x01\n"
"IPROTO_BALLOT_IS_RO_CFG=0x01\n"
"IPROTO_BALLOT_VCLOCK=0x02\n"
"IPROTO_BALLOT_GC_VCLOCK=0x03\n"
"IPROTO_BALLOT_IS_LOADING=0x04\n"
"IPROTO_BALLOT_IS_RO=0x04\n"
"IPROTO_BALLOT_IS_ANON=0x05\n"
"IPROTO_BALLOT_IS_BOOTED=0x06\n"
"IPROTO_TUPLE_META=0x2a\n"
"IPROTO_OPTIONS=0x2b\n"
"IPROTO_DATA=0x30\n"
Expand Down Expand Up @@ -2291,33 +2293,78 @@ msgstr ""
"в IPROTO_BALLOT — это элементы ассоциативного массива:"

msgid ""
"IPROTO_BALLOT_IS_RO (0x01) + MP_BOOL\n"
"IPROTO_BALLOT_IS_RO_CFG (0x01) + MP_BOOL\n"
"IPROTO_BALLOT_VCLOCK (0x02) + vclock\n"
"IPROTO_BALLOT_GC_VCLOCK (0x03) + vclock\n"
"IPROTO_BALLOT_IS_LOADING (0x04) + MP_BOOL\n"
"IPROTO_BALLOT_IS_ANON = 0x05 + MP_BOOL"
"IPROTO_BALLOT_IS_RO (0x04) + MP_BOOL\n"
"IPROTO_BALLOT_IS_ANON = 0x05 + MP_BOOL\n"
"IPROTO_BALLOT_IS_BOOTED = 0x06 + MP_BOOL"
msgstr ""
"IPROTO_BALLOT_IS_RO (0x01) + MP_BOOL\n"
"IPROTO_BALLOT_IS_RO_CFG (0x01) + MP_BOOL\n"
"IPROTO_BALLOT_VCLOCK (0x02) + vclock\n"
"IPROTO_BALLOT_GC_VCLOCK (0x03) + vclock\n"
"IPROTO_BALLOT_IS_LOADING (0x04) + MP_BOOL\n"
"IPROTO_BALLOT_IS_ANON = 0x05 + MP_BOOL"
"IPROTO_BALLOT_IS_RO (0x04) + MP_BOOL\n"
"IPROTO_BALLOT_IS_ANON = 0x05 + MP_BOOL\n"
"IPROTO_BALLOT_IS_BOOTED = 0x06 + MP_BOOL"

msgid ""
"IPROTO_BALLOt-IS_ANON corresponds to :ref:`box.cfg.replication_anon "
"<cfg_replication-replication_anon>`."
"IPROTO_BALLOT_IS_RO_CFG and IPRO_BALLOT_VCLOCK and IPROTO_BALLOT_GC_VCLOCK "
"and IPROTO_BALLOT_IS_RO were added in version :doc:`2.6.1 </release/2.6.1>`."
" IPROTO_BALLOT_IS_ANON was added in version :doc:`2.7.1 </release/2.7.1>`. "
"IPROTO_BALLOT_IS_BOOTED was added in version 2.7.3 and 2.8.2 and 2.9.1. "
"There have been some name changes starting with version 2.7.3 and 2.8.2 and "
"2.9.1: IPROTO_BALLOT_IS_RO_CFG was formerly called IPROTO_BALLOT_IS_RO, and "
"IPROTO_BALLOT_IS_RO was formerly called IPROTO_BALLOT_IS_LOADING."
msgstr ""
"IPROTO_BALLOT_IS_RO_CFG, IPRO_BALLOT_VCLOCK, IPROTO_BALLOT_GC_VCLOCK и "
"IPROTO_BALLOT_IS_RO добавлены в версии :doc:`2.6.1 </release/2.6.1>`. "
"Константа IPROTO_BALLOT_IS_ANON добавлена в версии :doc:`2.7.1 "
"</release/2.7.1>`. Константа IPROTO_BALLOT_IS_BOOTED добавлена в версиях "
"2.7.3, 2.8.2 и 2.9.1. В версиях 2.7.3, 2.8.2, 2.9.1 и более поздних "
"константа IPROTO_BALLOT_IS_RO переименована в IPROTO_BALLOT_IS_RO_CFG, а "
"IPROTO_BALLOT_IS_LOADING — в IPROTO_BALLOT_IS_RO."

msgid ""
"IPROTO_BALLOT_IS_RO_CFG corresponds to :ref:`box.cfg.read_only <cfg_basic-"
"read_only>`."
msgstr ""
"Значение IPROTO_BALLOT_IS_RO_CFG соответствует значению "
":ref:`box.cfg.read_only <cfg_basic-read_only>`."

msgid ""
"IPROTO_BALLOT_GC_VCLOCK can be the vclock value of the instance's oldest WAL"
" entry, which corresponds to :ref:`box.info.gc().vclock <box_info_gc>`."
msgstr ""
"IPROTO_BALLOT_IS_ANON соответствует :ref:`box.cfg.replication_anon "
"IPROTO_BALLOT_GC_VCLOCK может принимать значение vclock самой старой записи "
"журнала WAL на экземпляре. Это соответствует значению "
":ref:`box.info.gc().vclock <box_info_gc>`."

msgid ""
"IPROTO_BALLOT_IS_RO is true if the instance is not writable, which may "
"happen for a variety of reasons, such as: it was configured as "
":ref:`read_only <cfg_basic-read_only>`, or it has :ref:`orphan status "
"<replication-orphan_status>`, or it is a :ref:`Raft <repl_leader_elect>` "
"follower."
msgstr ""
"IPROTO_BALLOT_IS_RO принимает значение ``true``, если экземпляр недоступен "
"для записи. Причины у этого могут быть разные: например, экземпляр настроен "
"как :ref:`read_only <cfg_basic-read_only>`, :ref:`имеет статус orphan "
"<replication-orphan_status>` или является последователем (follower) при "
":ref:`выполнении алгоритма Raft <repl_leader_elect>`."

msgid ""
"IPROTO_BALLOT_IS_ANON corresponds to :ref:`box.cfg.replication_anon "
"<cfg_replication-replication_anon>`."
msgstr ""
"Значение IPROTO_BALLOT_IS_ANON соответствует значению "
":ref:`box.cfg.replication_anon <cfg_replication-replication_anon>`."

msgid ""
"The items other than IPROTO_BALLOT_IS_ANON were added in version :doc:`2.6.1"
" </release/2.6.1>`. PROTO_BALLOT_IS_ANON was added in version :doc:`2.7.1 "
"</release/2.7.1>`."
"IPROTO_BALLOT_IS_BOOTED is true if the instance has finished its bootstrap "
"or recovery process."
msgstr ""
"Элементы, отличные от IPROTO_BALLOT_IS_ANON, были добавлены в версии "
":doc:`2.6.1 </release/2.6.1>`. PROTO_BALLOT_IS_ANON был добавлен в версии "
":doc:`2.7.1 </release/2.7.1>`."
"IPROTO_BALLOT_IS_BOOTED принимает значение ``true``, если экземпляр завершил"
" инициализацию или восстановление."

msgid "**FLAGS**"
msgstr "**ФЛАГИ**"
Expand Down Expand Up @@ -2377,8 +2424,8 @@ msgid ""
"To follow the examples in this section, get a single Linux computer and "
"start three command-line shells (\"terminals\")."
msgstr ""
"Чтобы выполнить примеры, приведенные в этом разделе, возьмите компьютер с "
"Linux и запустите три командных оболочки (\"терминалы\")."
"Чтобы выполнить примеры, приведенные в этом разделе, запустите на компьютере"
" с Linux три командных оболочки (терминала)."

msgid ""
"-- On terminal #1, Start monitoring port 3302 with `tcpdump "
Expand Down