Skip to content

Multiple minor bug fixes version specific to 2.2 from feedback #898

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 3 commits into from
Sep 9, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
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
4 changes: 2 additions & 2 deletions doc/2.2/book/getting_started/using_docker.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
22 changes: 13 additions & 9 deletions doc/2.2/reference/reference_lua/tarantool.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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()
---
Expand Down
4 changes: 2 additions & 2 deletions doc/2.2/reference/reference_rock/vshard/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 <cfg_basic-collect_bucket_garbage_interval>`.
Expand Down
Loading