From 638b35f8dea3e5e825eff0b1111fbd2adeda4da6 Mon Sep 17 00:00:00 2001 From: Vladimir I Date: Thu, 5 Sep 2019 12:15:54 +0300 Subject: [PATCH 1/3] Fix gh-858 Extend module "tarantool" with the field "package" Added suggested example with package field only to 2.2 specific branch --- doc/2.2/reference/reference_lua/tarantool.rst | 22 +++++++++++-------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/doc/2.2/reference/reference_lua/tarantool.rst b/doc/2.2/reference/reference_lua/tarantool.rst index e78042e362..e254023e8b 100644 --- a/doc/2.2/reference/reference_lua/tarantool.rst +++ b/doc/2.2/reference/reference_lua/tarantool.rst @@ -26,17 +26,21 @@ the tarantool module is recommended. ... tarantool> tarantool --- - - build: + - version: 2.3.0-3-g302bb3241 + build: target: Linux-x86_64-RelWithDebInfo - options: cmake . -DCMAKE_INSTALL_PREFIX=/usr -DENABLE_BACKTRACE=ON + options: cmake . -DCMAKE_INSTALL_PREFIX=/opt/tarantool-install + -DENABLE_BACKTRACE=ON mod_format: so - flags: ' -fno-common -fno-omit-frame-pointer -fno-stack-protector -fexceptions - -funwind-tables -fopenmp -msse2 -std=c11 -Wall -Wextra -Wno-sign-compare -Wno-strict-aliasing - -fno-gnu89-inline' - compiler: /usr/bin/x86_64-linux-gnu-gcc /usr/bin/x86_64-linux-gnu-g++ - uptime: 'function: 0x408668e0' - version: 1.7.0-66-g9093daa - pid: 'function: 0x40866900' + flags: ' -fexceptions -funwind-tables -fno-omit-frame-pointer + -fno-stack-protector + -fno-common -fopenmp -msse2 -std=c11 -Wall -Wextra + -Wno-strict-aliasing -Wno-char-subscripts + -Wno-format-truncation -fno-gnu89-inline -Wno-cast-function-type' + compiler: /usr/bin/cc /usr/bin/c++ + pid: 'function: 0x40016cd0' + package: Tarantool + uptime: 'function: 0x40016cb0' ... tarantool> tarantool.pid() --- From fe9766539b82c2338273cc3a21b138d9ecf704a8 Mon Sep 17 00:00:00 2001 From: Vladimir I Date: Thu, 5 Sep 2019 18:15:43 +0300 Subject: [PATCH 2/3] Fix gh-880 feedback: Using a Docker image Fixed minor issue with version numbers. --- doc/2.2/book/getting_started/using_docker.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/2.2/book/getting_started/using_docker.rst b/doc/2.2/book/getting_started/using_docker.rst index edcc38d34f..3828215477 100644 --- a/doc/2.2/book/getting_started/using_docker.rst +++ b/doc/2.2/book/getting_started/using_docker.rst @@ -39,8 +39,8 @@ options: tarantool/tarantool:2 This command runs a new container named ``mytarantool``. -Docker starts it from an official image named ``tarantool/tarantool:1``, -with Tarantool version ``1.9`` and all external modules already installed. +Docker starts it from an official image named ``tarantool/tarantool:2``, +with Tarantool version ``2.2`` and all external modules already installed. Tarantool will be accepting incoming connections on ``localhost:3301``. You may start using it as a key-value storage right away. From a303e75585a9f7a8c4720811e6781aee397d649d Mon Sep 17 00:00:00 2001 From: Vladimir I Date: Mon, 9 Sep 2019 14:06:15 +0300 Subject: [PATCH 3/3] Fix gh-885 Also gh-886, gh-887, gh-888, gh-889. Translation fix. Few meaningfull changes in trasnlation, rest is just fuzzy removal. Probably subject for proof-reading due to size of the text. --- .../reference/reference_rock/vshard/index.rst | 4 +- locale/ru/LC_MESSAGES/doc.po | 155 +++--------------- 2 files changed, 22 insertions(+), 137 deletions(-) diff --git a/doc/2.2/reference/reference_rock/vshard/index.rst b/doc/2.2/reference/reference_rock/vshard/index.rst index 9235703088..2602a57950 100644 --- a/doc/2.2/reference/reference_rock/vshard/index.rst +++ b/doc/2.2/reference/reference_rock/vshard/index.rst @@ -263,7 +263,7 @@ A **rebalancer** is a background rebalancing process that ensures an even distribution of buckets across the shards. During rebalancing, buckets are being migrated among replica sets. -A replica set from which the bucket is being migrated is called a **source**; a +A replica set from which the bucket is being migrated is called a **source** ; a target replica set to which the bucket is being migrated is called a **destination**. A **replica set lock** makes a replica set invisible to the rebalancer. A locked @@ -277,7 +277,7 @@ While a bucket is being migrated, it can have different states: * SENDING – the bucket is currently being copied to the destination replica set; read requests to the source replica set are still processed. * RECEIVING – the bucket is currently being filled; all requests to it are rejected. -* SENT – the bucket was migrated to the destination replica set. The `router` +* SENT – the bucket was migrated to the destination replica set. The ``router`` uses the SENT state to calculate the new location of the bucket. A bucket in the SENT state goes to the GARBAGE state automatically after BUCKET_SENT_GARBAGE_DELAY seconds, which by default is :ref:`0.5 seconds `. diff --git a/locale/ru/LC_MESSAGES/doc.po b/locale/ru/LC_MESSAGES/doc.po index 68a23918fe..117cd42041 100644 --- a/locale/ru/LC_MESSAGES/doc.po +++ b/locale/ru/LC_MESSAGES/doc.po @@ -74182,7 +74182,6 @@ msgstr "" " которая предоставляет возможность горизонтального масштабирования." #: ../doc/2.2/reference/reference_rock/vshard/index.rst:66 -#, fuzzy msgid "" "With ``vshard``, the tuples of a dataset are distributed across multiple " "nodes, with a Tarantool database server instance on each node. Each " @@ -74196,7 +74195,7 @@ msgstr "" "данных Tarantool'а. Каждый экземпляр обрабатывает лишь подмножество от " "общего количества данных, поэтому увеличение нагрузки можно " "компенсировать добавлением новых серверов. Первоначальный набор данных " -"секционируется на множество частей, то есть каждая часть хранится на " +"секционируется на множество частей, таким образом, что каждая часть хранится на " "отдельном сервере. Секционирование набора данных осуществляется с помощью" " сегментных ключей." @@ -74309,7 +74308,7 @@ msgstr "" "реплик" #: ../doc/2.2/reference/reference_rock/vshard/index.rst:120 -#, fuzzy + msgid "" "All instances are managed using the ``tarantoolctl`` utility which comes " "with Tarantool." @@ -74412,7 +74411,6 @@ msgid "``tarantoolctl enter router_1`` – enter the admin console" msgstr "``tarantoolctl enter router_1`` – вход в административную консоль" #: ../doc/2.2/reference/reference_rock/vshard/index.rst:167 -#, fuzzy msgid "" "The full list of ``tarantoolctl`` commands for managing Tarantool " "instances is available in the :ref:`tarantoolctl reference " @@ -74561,7 +74559,6 @@ msgstr "" "балансировщика." #: ../doc/2.2/reference/reference_rock/vshard/index.rst:232 -#, fuzzy msgid "" "A **storage** is a node storing a subset of a dataset. Multiple " "replicated storages are deployed as replica sets to provide redundancy (a" @@ -74598,7 +74595,6 @@ msgid "Storage" msgstr "Хранилище" #: ../doc/2.2/reference/reference_rock/vshard/index.rst:252 -#, fuzzy msgid "" "**Storage** is a node storing a subset of a dataset. Multiple replicated " "storages comprise a replica set. Each storage in a replica set has a " @@ -74617,7 +74613,6 @@ msgid "Virtual buckets" msgstr "Виртуальные сегменты" #: ../doc/2.2/reference/reference_rock/vshard/index.rst:266 -#, fuzzy msgid "" "The sharded dataset is partitioned into a large number of abstract nodes " "called **virtual buckets** (further referred to as **buckets**)." @@ -74627,7 +74622,6 @@ msgstr "" "тексту **сегменты**)." #: ../doc/2.2/reference/reference_rock/vshard/index.rst:269 -#, fuzzy msgid "" "The dataset is partitioned using the sharding key (or **bucket id**, in " "Tarantool terminology). Bucket id is a number from 1 to N, where N is the" @@ -74682,18 +74676,16 @@ msgstr "" "время балансировки происходит миграция сегментов по наборам реплик." #: ../doc/2.2/reference/reference_rock/vshard/index.rst:300 -#, fuzzy msgid "" "A replica set from which the bucket is being migrated is called a " -"**source**; a target replica set to which the bucket is being migrated is" +"**source** ; a target replica set to which the bucket is being migrated is" " called a **destination**." msgstr "" -"Набор реплик, из которого переносится сегмент, называется \"исходный\" " -"(source); а набор реплик, куда переносится сегмент, называется " -"\"целевой\" (destination). " +"Набор реплик, из которого переносится сегмент, называется **исходный** " +"(source); а набор реплик, куда переносится сегмент, называется" +" **целевой** (destination). " #: ../doc/2.2/reference/reference_rock/vshard/index.rst:303 -#, fuzzy msgid "" "A **replica set lock** makes a replica set invisible to the rebalancer. A" " locked replica set can neither receive new buckets nor migrate its own " @@ -74704,7 +74696,6 @@ msgstr "" "новые сегменты, ни мигрировать свои собственные." #: ../doc/2.2/reference/reference_rock/vshard/index.rst:306 -#, fuzzy msgid "While a bucket is being migrated, it can have different states:" msgstr "Во время миграции у сегмента могут быть разные статусы:" @@ -74713,7 +74704,6 @@ msgid "ACTIVE – the bucket is available for read and write requests." msgstr "ACTIVE (активный) -- сегмент доступен для запросов чтения и записи." #: ../doc/2.2/reference/reference_rock/vshard/index.rst:309 -#, fuzzy msgid "" "PINNED – the bucket is locked for migrating to another replica set. " "Otherwise pinned buckets are similar to buckets in the ACTIVE state." @@ -74723,7 +74713,6 @@ msgstr "" "сегментам." #: ../doc/2.2/reference/reference_rock/vshard/index.rst:311 -#, fuzzy msgid "" "SENDING – the bucket is currently being copied to the destination replica" " set; read requests to the source replica set are still processed." @@ -74742,11 +74731,20 @@ msgstr "" #: ../doc/2.2/reference/reference_rock/vshard/index.rst:314 msgid "" "SENT – the bucket was migrated to the destination replica set. The " -"`router` uses the SENT state to calculate the new location of the bucket." +"``router`` uses the SENT state to calculate the new location of the bucket." " A bucket in the SENT state goes to the GARBAGE state automatically after" " BUCKET_SENT_GARBAGE_DELAY seconds, which by default is :ref:`0.5 seconds" " `." msgstr "" +"SENT (отправленный) -- произошла миграция " +"сегмента в целевой набор реплик. " +"``Роутер`` использует такой статус, чтобы " +"рассчитать новое местоположение сегмента. " +"Отправленный сегмент в статусе SENT " +"автоматически переходит в статус мусора " +"GARBAGE через BUCKET_SENT_GARBAGE_DELAY секунд после миграции" +" (по умолчанию задано 0.5 секунды :ref:`0.5 секунды" +" `)." #: ../doc/2.2/reference/reference_rock/vshard/index.rst:318 msgid "" @@ -74763,7 +74761,6 @@ msgid "Buckets in the GARBAGE state are deleted by the garbage collector." msgstr "Сегменты в статусе мусора GARBAGE удаляются сборщиком мусора." #: ../doc/2.2/reference/reference_rock/vshard/index.rst:327 -#, fuzzy msgid "Migration is performed as follows:" msgstr "В целом, миграция происходит следующим образом:" @@ -74778,7 +74775,6 @@ msgstr "" "отклоняет все запросы." #: ../doc/2.2/reference/reference_rock/vshard/index.rst:331 -#, fuzzy msgid "" "The source bucket in the source replica set is assigned the SENDING " "state, and the bucket continues to process read requests." @@ -74787,7 +74783,6 @@ msgstr "" "продолжает обрабатывать запросы на чтение." #: ../doc/2.2/reference/reference_rock/vshard/index.rst:333 -#, fuzzy msgid "" "Once the data is copied, the bucket on the source replica set is assigned" " the SENT and it starts rejecting all requests." @@ -74796,7 +74791,6 @@ msgstr "" "отправленным в статусе SENT и перестает принимать запросы." #: ../doc/2.2/reference/reference_rock/vshard/index.rst:335 -#, fuzzy msgid "" "The bucket on the destination replica set is assigned the ACTIVE state " "and starts accepting all requests." @@ -74826,7 +74820,6 @@ msgid "``status`` – state of the bucket" msgstr "``status`` -- статус сегмента" #: ../doc/2.2/reference/reference_rock/vshard/index.rst:349 -#, fuzzy msgid "``destination`` – UUID of the destination replica set" msgstr "``destination`` -- UUID целевого набора реплик" @@ -74847,7 +74840,6 @@ msgstr "" "..." #: ../doc/2.2/reference/reference_rock/vshard/index.rst:360 -#, fuzzy msgid "" "Once the bucket is migrated, the destination replica set identified by " "UUID is filled in the table. While the bucket is still located on the " @@ -74957,7 +74949,6 @@ msgstr "" "образом указать в запросе." #: ../doc/2.2/reference/reference_rock/vshard/index.rst:411 -#, fuzzy msgid "" "All requests are forwarded to the ``router`` first. The only operation " "supported by the ``router`` is ``call``. The operation is performed via " @@ -74968,7 +74959,6 @@ msgstr "" "``vshard.router.call()``:" #: ../doc/2.2/reference/reference_rock/vshard/index.rst:415 -#, fuzzy msgid "" "result = vshard.router.call(, , , " "{}, {})" @@ -75041,7 +75031,6 @@ msgid "A minimal viable sharded cluster should consist of:" msgstr "Минимальный рабочий сегментированный кластер должен состоять из:" #: ../doc/2.2/reference/reference_rock/vshard/index.rst:448 -#, fuzzy msgid "" "one or more replica sets, each containing two or more ``storage`` " "instances" @@ -75054,7 +75043,6 @@ msgid "one or more ``router`` instances" msgstr "одного или нескольких ``роутеров``" #: ../doc/2.2/reference/reference_rock/vshard/index.rst:451 -#, fuzzy msgid "" "The number of ``storage`` instances in a replica set defines the " "redundancy factor of the data. The recommended value is 3 or more. The " @@ -75080,7 +75068,6 @@ msgstr "" "одному кластеру." #: ../doc/2.2/reference/reference_rock/vshard/index.rst:460 -#, fuzzy msgid "" "As the ``router`` and ``storage`` applications perform completely " "different sets of functions, they should be deployed to different " @@ -75121,7 +75108,6 @@ msgstr "" "экземпляра (конфигурационных файлов)." #: ../doc/2.2/reference/reference_rock/vshard/index.rst:477 -#, fuzzy msgid "" "All cluster nodes must share a common topology. An administrator must " "ensure that the configurations are identical. We suggest using a " @@ -75134,7 +75120,6 @@ msgstr "" "время развертывания кластера." #: ../doc/2.2/reference/reference_rock/vshard/index.rst:481 -#, fuzzy msgid "" "Sharding is not integrated into any system for centralized configuration " "management. It is expected that the application itself is responsible for" @@ -75327,7 +75312,6 @@ msgstr "" "репликами в наборе реплик." #: ../doc/2.2/reference/reference_rock/vshard/index.rst:579 -#, fuzzy msgid "" "Weights can be used, for example, to define the physical distance between" " the ``router`` and each replica in each replica set. In such a case read" @@ -75338,7 +75322,6 @@ msgstr "" "запросы на чтение будут отправляться на буквально ближайшую реплику." #: ../doc/2.2/reference/reference_rock/vshard/index.rst:583 -#, fuzzy msgid "" "Setting weights can also help to define the most powerful replicas: the " "ones that can process the largest number of requests per second." @@ -75359,7 +75342,6 @@ msgstr "" "одного набора реплик." #: ../doc/2.2/reference/reference_rock/vshard/index.rst:590 -#, fuzzy msgid "" "To set weights, use the zone attribute for each replica during " "configuration:" @@ -75499,7 +75481,6 @@ msgid "Rebalancing process" msgstr "Процесс балансировки" #: ../doc/2.2/reference/reference_rock/vshard/index.rst:660 -#, fuzzy msgid "" "There is an **etalon number** of buckets for a replica set. (Etalon in " "this context means \"ideal\".) If there is no deviation from this number " @@ -75518,7 +75499,6 @@ msgstr "" "сегментов в кластере и веса наборов реплик." #: ../doc/2.2/reference/reference_rock/vshard/index.rst:668 -#, fuzzy msgid "" "For example: The user specified the number of buckets is 3000, and " "weights of 3 replica sets are 1, 0.5, and 1.5. The resulting etalon " @@ -75579,7 +75559,6 @@ msgid "When a new shard is added, the configuration can be updated dynamically:" msgstr "При добавлении нового шарда конфигурацию можно обновить динамически:" #: ../doc/2.2/reference/reference_rock/vshard/index.rst:694 -#, fuzzy msgid "" "The configuration should be updated on all the ``routers`` first, and " "then on all the ``storages``." @@ -75592,7 +75571,6 @@ msgid "The new shard becomes available for rebalancing in the ``storage`` layer. msgstr "Новый шард становится доступен для балансирования на уровне ``хранилища``." #: ../doc/2.2/reference/reference_rock/vshard/index.rst:697 -#, fuzzy msgid "As a result of rebalancing, buckets are migrated to the new shard." msgstr "В результате балансировки происходит миграция сегментов на новый шард." @@ -75617,7 +75595,6 @@ msgid "Replica set lock and bucket pin" msgstr "Блокировка набора реплик и закрепление корзины" #: ../doc/2.2/reference/reference_rock/vshard/index.rst:710 -#, fuzzy msgid "" "A replica set lock makes a replica set invisible to the ``rebalancer``: a" " locked replica set can neither receive new buckets nor migrate its own " @@ -75628,7 +75605,6 @@ msgstr "" "новые сегменты, ни мигрировать собственные сегменты." #: ../doc/2.2/reference/reference_rock/vshard/index.rst:713 -#, fuzzy msgid "" "A bucket pin blocks a specific bucket from migrating: a pinned bucket " "stays on the replica set to which it is pinned, until it is unpinned." @@ -75638,7 +75614,6 @@ msgstr "" "закреплен, до отмены закрепления." #: ../doc/2.2/reference/reference_rock/vshard/index.rst:716 -#, fuzzy msgid "" "Pinning all replica set buckets is not equivalent to locking a replica " "set. Even if you pin all buckets, a non-locked replica set can still " @@ -75662,7 +75637,6 @@ msgstr "" "используется в похожих случаях, но в меньшем масштабе." #: ../doc/2.2/reference/reference_rock/vshard/index.rst:724 -#, fuzzy msgid "" "By both locking a replica set and pinning all buckets, one can isolate an" " entire replica set." @@ -75682,7 +75656,6 @@ msgstr "" "попытке достичь наилучшего возможного баланса." #: ../doc/2.2/reference/reference_rock/vshard/index.rst:731 -#, fuzzy msgid "" "The issue is not trivial as a user can pin too many buckets to a replica " "set, so a perfect balance becomes unreachable. For example, consider the " @@ -75751,7 +75724,6 @@ msgstr "" "вес respected ``rs1`` и ``rs3``." #: ../doc/2.2/reference/reference_rock/vshard/index.rst:763 -#, fuzzy msgid "" "The algorithms for implementing locks and pins are completely different, " "although they look similar in terms of functionality." @@ -75764,7 +75736,6 @@ msgid "Replica set lock and rebalancing" msgstr "Заблокированный набор реплик и балансировка" #: ../doc/2.2/reference/reference_rock/vshard/index.rst:772 -#, fuzzy msgid "" "Locked replica sets simply do not participate in rebalancing. This means " "that even if the actual total number of buckets is not equal to the " @@ -75786,7 +75757,6 @@ msgid "Bucket pin and rebalancing" msgstr "Закрепленный набор реплик и балансировка" #: ../doc/2.2/reference/reference_rock/vshard/index.rst:785 -#, fuzzy msgid "" "Rebalancing replica sets with pinned buckets requires a more complex " "algorithm. Here pinned_count[o] is the number of pinned buckets, and " @@ -75798,7 +75768,6 @@ msgstr "" "реплик:" #: ../doc/2.2/reference/reference_rock/vshard/index.rst:789 -#, fuzzy msgid "" "The ``rebalancer`` calculates the etalon number of buckets as if all " "buckets were not pinned. Then the rebalancer checks each replica set and " @@ -75835,7 +75804,6 @@ msgstr "" "наборов реплик." #: ../doc/2.2/reference/reference_rock/vshard/index.rst:802 -#, fuzzy msgid "" "This procedure is restarted from step 1 for replica sets with " "``pinned_count >= etalon_count`` until ``pinned_count <= etalon_count`` " @@ -75848,7 +75816,6 @@ msgstr "" "Процедура также перезапускается при изменении общего числа сегментов." #: ../doc/2.2/reference/reference_rock/vshard/index.rst:807 -#, fuzzy msgid "Here is the pseudocode for the algorithm:" msgstr "Псевдокод для данного алгоритма будет следующим:" @@ -75927,7 +75894,6 @@ msgstr "" ":ref:`закрепление сегмента ` со следующими отличиями:" #: ../doc/2.2/reference/reference_rock/vshard/index.rst:847 -#, fuzzy msgid "" "Bucket ref is not persistent. Refs are intended for forbidding bucket " "transfer during request execution, but on restart all requests are " @@ -75938,7 +75904,6 @@ msgstr "" "перезапуске все запросы отбрасываются." #: ../doc/2.2/reference/reference_rock/vshard/index.rst:850 -#, fuzzy msgid "There are two types of bucket refs: read-only (RO) and read-write (RW)." msgstr "Есть 2 типа ссылок в сегменте: только чтение (RO) и чтение-запись (RW)." @@ -75974,7 +75939,6 @@ msgid "Bucket ref is countable." msgstr "Ссылки в сегменте исчисляются." #: ../doc/2.2/reference/reference_rock/vshard/index.rst:865 -#, fuzzy msgid "" "The :ref:`vshard.storage.bucket_ref/unref()` " "methods are called automatically when :ref:`vshard.router.call() " @@ -75995,7 +75959,6 @@ msgstr "" "закреплен в хранилище до перезапуска экземпляра." #: ../doc/2.2/reference/reference_rock/vshard/index.rst:873 -#, fuzzy msgid "" "To see how many refs there are for a bucket, use " ":ref:`vshard.storage.buckets_info([bucket_id]) ` section for details." @@ -76604,7 +76548,6 @@ msgid ":ref:`vshard.router.new(name, cfg) `" msgstr ":ref:`vshard.router.new(name, cfg) `" #: ../doc/2.2/reference/reference_rock/vshard/index.rst:1218 -#, fuzzy msgid "" ":ref:`vshard.router.call(bucket_id, mode, function_name, {argument_list}," " {options}) `" @@ -76629,7 +76572,6 @@ msgstr "" "{options}) `" #: ../doc/2.2/reference/reference_rock/vshard/index.rst:1221 -#, fuzzy msgid "" ":ref:`vshard.router.callre(bucket_id, function_name, {argument_list}, " "{options}) `" @@ -76638,7 +76580,6 @@ msgstr "" "{options}) `" #: ../doc/2.2/reference/reference_rock/vshard/index.rst:1222 -#, fuzzy msgid "" ":ref:`vshard.router.callbro(bucket_id, function_name, {argument_list}, " "{options}) `" @@ -76647,7 +76588,6 @@ msgstr "" "{options}) `" #: ../doc/2.2/reference/reference_rock/vshard/index.rst:1223 -#, fuzzy msgid "" ":ref:`vshard.router.callbre(bucket_id, function_name, {argument_list}, " "{options}) `" @@ -76700,7 +76640,6 @@ msgid ":ref:`replicaset.callrw() `" msgstr ":ref:`replicaset.callrw() `" #: ../doc/2.2/reference/reference_rock/vshard/index.rst:1235 -#, fuzzy msgid ":ref:`replicaset.callre() `" msgstr ":ref:`replicaset.callrw() `" @@ -76745,7 +76684,6 @@ msgid "" msgstr "" #: ../doc/2.2/reference/reference_rock/vshard/index.rst:1267 -#, fuzzy msgid "" "A static router can be obtained via the ``vshard.router.static()`` method" " and then used like a router created via the ``vshard.router.new()`` " @@ -76760,7 +76698,6 @@ msgid "``box.cfg`` is shared among all the routers of a single instance." msgstr "``box.cfg`` используется всеми роутерами одного экземпляра." #: ../doc/2.2/reference/reference_rock/vshard/index.rst:1275 -#, fuzzy msgid "" "a router instance name. This name is used as a prefix in logs of the " "router and must be unique within the instance" @@ -76783,7 +76720,6 @@ msgid "" msgstr "экземпляр роутера, если он создан; в противном случае, nil и ошибка" #: ../doc/2.2/reference/reference_rock/vshard/index.rst:1288 -#, fuzzy msgid "" "Call the function identified by function-name on the shard storing the " "bucket identified by bucket_id. See the :ref:`Processing requests " @@ -76834,7 +76770,6 @@ msgid "an array of the function's arguments" msgstr "массив аргументов функции" #: ../doc/2.2/reference/reference_rock/vshard/index.rst:1296 -#, fuzzy msgid "" "* ``timeout`` – a request timeout, in seconds. If the router cannot " "identify a shard with the specified bucket_id, the operation will be " @@ -76845,7 +76780,6 @@ msgstr "" "истечения времени ожидания." #: ../doc/2.2/reference/reference_rock/vshard/index.rst:1298 -#, fuzzy msgid "" "``timeout`` – a request timeout, in seconds. If the router cannot " "identify a shard with the specified bucket_id, the operation will be " @@ -76888,7 +76822,6 @@ msgstr "" " ``SocketError`` и т.д.)." #: ../doc/2.2/reference/reference_rock/vshard/index.rst:1321 -#, fuzzy msgid "" "``ShardingError`` is returned on errors specific for sharding: the " "replica set is not available, the master is missing, wrong bucket id, " @@ -77008,7 +76941,6 @@ msgid "" msgstr "" #: ../doc/2.2/reference/reference_rock/vshard/index.rst:1453 -#, fuzzy msgid "" "Return the replica set object for the bucket with the specified bucket id" " value." @@ -77069,7 +77001,6 @@ msgstr "время ожидания в секундах" #: ../doc/2.2/reference/reference_rock/vshard/index.rst:1514 #: ../doc/2.2/reference/reference_rock/vshard/index.rst:1793 -#, fuzzy msgid "" "``true`` if the dataset was synchronized successfully; or ``nil`` and " "``err`` explaining why the dataset cannot be synchronized." @@ -77082,7 +77013,6 @@ msgid "Force wakeup of the bucket discovery fiber." msgstr "Принудительный запуск файбера обнаружения сегментов." #: ../doc/2.2/reference/reference_rock/vshard/index.rst:1527 -#, fuzzy msgid "Return information about each instance." msgstr "Возврат информации по каждому экземпляру." @@ -77107,17 +77037,14 @@ msgid "Instance parameters:" msgstr "Параметры экземпляра:" #: ../doc/2.2/reference/reference_rock/vshard/index.rst:1539 -#, fuzzy msgid "``uri`` — URI of the instance" msgstr "``uri`` -- URI экземпляра" #: ../doc/2.2/reference/reference_rock/vshard/index.rst:1540 -#, fuzzy msgid "``uuid`` — UUID of the instance" msgstr "``uuid`` -- UUID экземпляра" #: ../doc/2.2/reference/reference_rock/vshard/index.rst:1541 -#, fuzzy msgid "" "``status`` – status of the instance (``available``, ``unreachable``, " "``missing``)" @@ -77164,7 +77091,6 @@ msgstr "" "недоступных для любых запросов" #: ../doc/2.2/reference/reference_rock/vshard/index.rst:1550 -#, fuzzy msgid "" "``unreachable`` – the number of buckets whose replica sets are not known " "to the ``router``" @@ -77231,7 +77157,6 @@ msgstr "" "..." #: ../doc/2.2/reference/reference_rock/vshard/index.rst:1588 -#, fuzzy msgid "" "Return information about each bucket. Since a bucket map can be huge, " "only the required range of buckets can be specified." @@ -77240,24 +77165,20 @@ msgstr "" "быть огромен, можно указать только необходимый ряд сегментов." #: ../doc/2.2/reference/reference_rock/vshard/index.rst:1591 -#, fuzzy msgid "the offset in a bucket map of the first bucket to show" msgstr "начальное значение выборки сегментов" #: ../doc/2.2/reference/reference_rock/vshard/index.rst:1592 -#, fuzzy msgid "the maximum number of buckets to show" msgstr "максимальное количество показываемых сегментов" #: ../doc/2.2/reference/reference_rock/vshard/index.rst:1594 -#, fuzzy msgid "a map of the following type: ``{bucket_id = 'unknown'/replicaset_uuid}``" msgstr "" "ассоциативный массив следующего вида: ``{bucket_id = " "'unknown'/replicaset_uuid}``" #: ../doc/2.2/reference/reference_rock/vshard/index.rst:1600 -#, fuzzy msgid "" "Call a function on a nearest available master (distances are defined " "using ``replica.zone`` and ``cfg.weights`` matrix) with specified " @@ -77275,7 +77196,6 @@ msgstr "Метод ``replicaset.call`` аналогичен ``replicaset.callrw` #: ../doc/2.2/reference/reference_rock/vshard/index.rst:1629 #: ../doc/2.2/reference/reference_rock/vshard/index.rst:1648 #: ../doc/2.2/reference/reference_rock/vshard/index.rst:1670 -#, fuzzy msgid "UUID of a replica set" msgstr "UUID набора реплик" @@ -77284,7 +77204,6 @@ msgstr "UUID набора реплик" #: ../doc/2.2/reference/reference_rock/vshard/index.rst:1649 #: ../doc/2.2/reference/reference_rock/vshard/index.rst:1671 #: ../doc/2.2/reference/reference_rock/vshard/index.rst:1777 -#, fuzzy msgid "function to execute" msgstr "выполняемая функция" @@ -77293,7 +77212,6 @@ msgstr "выполняемая функция" #: ../doc/2.2/reference/reference_rock/vshard/index.rst:1650 #: ../doc/2.2/reference/reference_rock/vshard/index.rst:1672 #: ../doc/2.2/reference/reference_rock/vshard/index.rst:1778 -#, fuzzy msgid "array of the function's arguments" msgstr "массив аргументов функции" @@ -77326,7 +77244,6 @@ msgstr "" "такие функции можно выполнять не только на мастере, но и на репликах." #: ../doc/2.2/reference/reference_rock/vshard/index.rst:1661 -#, fuzzy msgid "" "Call a function on the nearest available replica (distances are defined " "using ``replica.zone`` and ``cfg.weights`` matrix) with specified " @@ -77355,7 +77272,6 @@ msgstr "" "bucket_discovery>`" #: ../doc/2.2/reference/reference_rock/vshard/index.rst:1691 -#, fuzzy msgid "" "Search for the bucket in the whole cluster. If the bucket is not found, " "it is likely that it does not exist. The bucket might also be moved " @@ -77379,7 +77295,6 @@ msgid ":ref:`vshard.storage.info() `" msgstr ":ref:`vshard.storage.info() `" #: ../doc/2.2/reference/reference_rock/vshard/index.rst:1705 -#, fuzzy msgid "" ":ref:`vshard.storage.call(bucket_id, mode, function_name, " "{argument_list}) `" @@ -77484,12 +77399,10 @@ msgid "a ``storage`` configuration" msgstr "конфигурация ``хранилища``" #: ../doc/2.2/reference/reference_rock/vshard/index.rst:1732 -#, fuzzy msgid "UUID of the instance" msgstr "UUID экземпляра" #: ../doc/2.2/reference/reference_rock/vshard/index.rst:1738 -#, fuzzy msgid "Return information about the storage instance in the following format:" msgstr "Возврат информации по экземпляру хранилища в следующем формате:" @@ -77550,12 +77463,10 @@ msgstr "" "..." #: ../doc/2.2/reference/reference_rock/vshard/index.rst:1773 -#, fuzzy msgid "Call the specified function on the current ``storage`` instance." msgstr "Вызов пользовательской функции на текущем экземпляре \"хранилища\"." #: ../doc/2.2/reference/reference_rock/vshard/index.rst:1776 -#, fuzzy msgid "a type of the function: 'read' or 'write'" msgstr "тип функции: чтение или запись" @@ -77566,7 +77477,6 @@ msgid "" msgstr "Исходное возвращаемое значение выполняемой функции или ``nil`` и ошибка." #: ../doc/2.2/reference/reference_rock/vshard/index.rst:1800 -#, fuzzy msgid "" "Pin a bucket to a replica set. A pinned bucket cannot be moved even if it" " breaks the cluster balance." @@ -77595,18 +77505,15 @@ msgstr "" "ошибка ``err`` с объяснением причины невозможности открепления сегмента" #: ../doc/2.2/reference/reference_rock/vshard/index.rst:1823 -#, fuzzy msgid "Create an RO or RW :ref:`ref `." msgstr "Создание :ref:`ссылки ` типа RO/RW." #: ../doc/2.2/reference/reference_rock/vshard/index.rst:1826 #: ../doc/2.2/reference/reference_rock/vshard/index.rst:1852 -#, fuzzy msgid "'read' or 'write'" msgstr "чтение или запись" #: ../doc/2.2/reference/reference_rock/vshard/index.rst:1828 -#, fuzzy msgid "" "``true`` if the bucket ref is created successfully; or ``nil`` and " "``err`` explaining why the ref cannot be created" @@ -77635,7 +77542,6 @@ msgid "Remove a RO/RW :ref:`ref `." msgstr "Удаление :ref:`ссылки ` RO/RW." #: ../doc/2.2/reference/reference_rock/vshard/index.rst:1854 -#, fuzzy msgid "" "``true`` if the bucket ref is removed successfully; or ``nil`` and " "``err`` explaining why the ref cannot be removed" @@ -77660,7 +77566,6 @@ msgstr "" "bucket_unref>` в режиме чтения и записи." #: ../doc/2.2/reference/reference_rock/vshard/index.rst:1875 -#, fuzzy msgid "" "Find a bucket which has data in a space but is not stored in a " "``_bucket`` space; or is in a GARBAGE state." @@ -77687,24 +77592,20 @@ msgstr "" "противном случае, nil" #: ../doc/2.2/reference/reference_rock/vshard/index.rst:1889 -#, fuzzy msgid "Return information about each bucket located in storage. For example:" msgstr "" "Возврат информации по каждому сегменту, расположенному в хранилище. " "Например:" #: ../doc/2.2/reference/reference_rock/vshard/index.rst:1907 -#, fuzzy msgid "Return the number of buckets located in storage." msgstr "Возврат количества сегментов, расположенных в хранилище." #: ../doc/2.2/reference/reference_rock/vshard/index.rst:1913 -#, fuzzy msgid "Immediately wake up a recovery fiber, if it exists." msgstr "Немедленный запуск файбера восстановления, если такой есть." #: ../doc/2.2/reference/reference_rock/vshard/index.rst:1919 -#, fuzzy msgid "" "Return a flag indicating whether rebalancing is in progress. The result " "is true if the node is currently applying routes received from a " @@ -77715,12 +77616,10 @@ msgstr "" "узла балансировки." #: ../doc/2.2/reference/reference_rock/vshard/index.rst:1927 -#, fuzzy msgid "Return a flag indicating whether storage is invisible to the rebalancer." msgstr "Флаг, указывающий на блокировку балансировщика." #: ../doc/2.2/reference/reference_rock/vshard/index.rst:1933 -#, fuzzy msgid "" "Disable rebalancing. A disabled rebalancer sleeps until it is enabled " "again with vshard.storage.rebalancer_enable()." @@ -77733,7 +77632,6 @@ msgid "Enable rebalancing." msgstr "Запуск балансировки." #: ../doc/2.2/reference/reference_rock/vshard/index.rst:1946 -#, fuzzy msgid "" "Show the spaces that are visible to rebalancer and garbage collector " "fibers." @@ -77804,17 +77702,14 @@ msgstr "" "rebalancer_request_state>`" #: ../doc/2.2/reference/reference_rock/vshard/index.rst:1968 -#, fuzzy msgid "Receive a bucket identified by bucket id from a remote replica set." msgstr "Получение идентификатора сегмента из удаленного набора реплик." #: ../doc/2.2/reference/reference_rock/vshard/index.rst:1971 -#, fuzzy msgid "UUID of source replica set" msgstr "UUID исходного набора реплик" #: ../doc/2.2/reference/reference_rock/vshard/index.rst:1972 -#, fuzzy msgid "" "data logically stored in a bucket identified by bucket_id, in the same " "format as the return value from ``bucket_collect() ``" #: ../doc/2.2/reference/reference_rock/vshard/index.rst:1979 -#, fuzzy msgid "Return information about the bucket id:" msgstr "Возврат информации об идентификаторе сегмента:" @@ -77846,7 +77740,6 @@ msgstr "" "..." #: ../doc/2.2/reference/reference_rock/vshard/index.rst:1996 -#, fuzzy msgid "" "Force garbage collection for the bucket identified by bucket_id in case " "the bucket was transferred to a different replica set." @@ -77855,7 +77748,6 @@ msgstr "" "был перемещен в другой набор реплик." #: ../doc/2.2/reference/reference_rock/vshard/index.rst:2005 -#, fuzzy msgid "" "Collect all the data that is logically stored in the bucket identified by" " bucket_id:" @@ -77894,7 +77786,6 @@ msgstr "" "..." #: ../doc/2.2/reference/reference_rock/vshard/index.rst:2030 -#, fuzzy msgid "" "Force creation of the buckets (single or multiple) on the current replica" " set. Use only for manual emergency recovery or for initial bootstrap." @@ -77908,7 +77799,6 @@ msgid "an identifier of the first bucket in a range" msgstr "идентификатор первого сегмента в диапазоне" #: ../doc/2.2/reference/reference_rock/vshard/index.rst:2034 -#, fuzzy msgid "the number of buckets to insert (default = 1)" msgstr "количество вставляемых сегментов (по умолчанию, 1)" @@ -77917,7 +77807,6 @@ msgid "Drop a bucket manually for tests or emergency cases." msgstr "Удаление сегмента вручную для тестирования или в аварийной ситуации." #: ../doc/2.2/reference/reference_rock/vshard/index.rst:2048 -#, fuzzy msgid "" "Send a specified bucket from the current replica set to a remote replica " "set." @@ -77926,12 +77815,10 @@ msgstr "" " набор реплик." #: ../doc/2.2/reference/reference_rock/vshard/index.rst:2050 -#, fuzzy msgid "bucket identifier" msgstr "идентификатор сегмента" #: ../doc/2.2/reference/reference_rock/vshard/index.rst:2051 -#, fuzzy msgid "UUID of a remote replica set" msgstr "UUID удаленного набора реплик" @@ -77982,12 +77869,10 @@ msgstr "" "секционирование и распределение набора данных по серверам." #: ../doc/2.2/reference/reference_rock/vshard/index.rst:2089 -#, fuzzy msgid "**Sharding**" -msgstr "**string**" +msgstr "**Шардинг**" #: ../doc/2.2/reference/reference_rock/vshard/index.rst:2091 -#, fuzzy msgid "" "A database architecture that allows partitioning a dataset using a " "sharding key and distributing a dataset across multiple servers. Sharding" @@ -78080,14 +77965,14 @@ msgid "**Bucket id**" msgstr "**Идентификатор сегмента**" #: ../doc/2.2/reference/reference_rock/vshard/index.rst:2145 -#, fuzzy msgid "" "A sharding key defining which bucket belongs to which replica set. A " "bucket id may be calculated from a :ref:`hash key `." msgstr "" -"Сегментный ключ, который принадлежность сегмента к определенному набору " -"реплик." +"Сегментный ключ, который опеределяет принадлежность сегмента к определенному набору " +"реплик. Идентификатор сегмента может быть вычислен из :ref:`хэш ключа `." #: ../doc/2.2/reference/reference_rock/vshard/index.rst:2149 msgid "**Router**"