Skip to content

Commit 074450e

Browse files
committed
Merge branch '1.7' into 1.8
2 parents 6610bc3 + 09d282c commit 074450e

File tree

6 files changed

+28
-12
lines changed

6 files changed

+28
-12
lines changed

Dockerfile

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
FROM packpack/packpack:ubuntu-xenial
2+
3+
COPY requirements.txt /requirements.txt
4+
5+
RUN apt-get update && apt-get -y install pkg-config lua5.1-dev python-pip python-setuptools python-dev
6+
RUN pip install -r /requirements.txt --upgrade

Jenkinsfile

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,7 @@ stage("Build") {
99
userRemoteConfigs: scm.userRemoteConfigs
1010
])
1111

12-
docker.image('packpack/packpack:ubuntu-xenial').inside('--user root:root') {
13-
sh "sudo apt-get update && apt-get -y install pkg-config lua5.1-dev python-pip python-setuptools python-dev"
14-
sh "sudo pip install -r requirements.txt --upgrade"
12+
docker.image('tarantool/doc').inside('') {
1513
sh "cmake ."
1614
sh "VERBOSE=1 make sphinx-html sphinx-html-ru"
1715
sh "VERBOSE=1 make sphinx-singlehtml sphinx-singlehtml-ru"

doc/1.8/book/box/data_model.rst

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -333,8 +333,10 @@ Snapshot files can be created even if there is no WAL file.
333333

334334
.. NOTE::
335335

336-
| The memtx engine makes only forced checkpoints.
337-
| The vinyl engine runs checkpointing in the background at all times.
336+
The memtx engine makes only regular checkpoints with the interval set in
337+
:ref:`checkpoint daemon <book_cfg_checkpoint_daemon>` configuration.
338+
339+
The vinyl engine runs checkpointing in the background at all times.
338340

339341
See the :ref:`Internals <internals-data_persistence>` section for more details
340342
about the WAL writer and the recovery process.

doc/1.8/book/replication/index.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ make the original data-change requests, set up the replica instances which
1515
copy data-change requests from masters, and establish procedures for
1616
recovery from a degraded state.
1717

18+
.. _index-replication_architecture:
19+
1820
=====================================================================
1921
Replication architecture
2022
=====================================================================

doc/1.8/reference/configuration/cfg_snapshot_daemon.rst

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,23 @@
22
* :ref:`checkpoint_interval <cfg_checkpoint_daemon-checkpoint_interval>`
33

44
The checkpoint daemon is a fiber which is constantly running. At intervals, it may
5-
make new snapshot (.snap) files and then may remove old snapshot files. If the
6-
checkpoint daemon removes an old snapshot file, it will also remove any
5+
make new snapshot (.snap) files and then may delete old snapshot files. If the
6+
checkpoint daemon deletes an old snapshot file, then it will also delete any
77
write-ahead log (.xlog) files which are older than the snapshot file and which contain
88
information that is present in the snapshot file.
9+
It will also delete obsolete vinyl .run files.
10+
11+
Exceptions: the checkpoint daemon will not delete a file
12+
if a backup is ongoing and the file has not been backed up
13+
(see :ref:`"Hot backup" <admin-backups-hot_backup_vinyl_memtx>`),
14+
or if replication is ongoing and the file has not been relayed to a replica
15+
(see :ref:`"Replication architecture" <index-replication_architecture>`),
16+
or if a replica is connecting.
917

1018
The :ref:`checkpoint_interval <cfg_checkpoint_daemon-checkpoint_interval>` and
1119
:ref:`checkpoint_count <cfg_checkpoint_daemon-checkpoint_count>` configuration
1220
settings determine how long the intervals are, and how many snapshots should
13-
exist before removals occur.
21+
exist before deletions occur.
1422

1523
.. _cfg_checkpoint_daemon-checkpoint_interval:
1624

@@ -41,8 +49,8 @@ exist before removals occur.
4149
.. confval:: checkpoint_count
4250

4351
The maximum number of snapshots that may exist on the ``memtx_dir`` directory
44-
before the checkpoint daemon will remove old snapshots. If ``checkpoint_count``
45-
equals zero, then the checkpoint daemon does not remove old snapshots.
52+
before the checkpoint daemon will delete old snapshots. If ``checkpoint_count``
53+
equals zero, then the checkpoint daemon does not delete old snapshots.
4654
For example:
4755

4856
.. code-block:: lua
@@ -53,7 +61,7 @@ exist before removals occur.
5361
}
5462
5563
will cause the checkpoint daemon to create a new snapshot each hour until
56-
it has created ten snapshots. After that, it will remove the oldest snapshot
64+
it has created ten snapshots. After that, it will delete the oldest snapshot
5765
(and any associated write-ahead-log files) after creating a new one.
5866

5967
| Type: integer

doc/1.8/reference/configuration/index.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ Configuring the storage
199199
.. _book_cfg_checkpoint_daemon:
200200

201201
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
202-
Snapshot daemon
202+
Checkpoint daemon
203203
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
204204

205205
.. include:: cfg_snapshot_daemon.rst

0 commit comments

Comments
 (0)