Merge branch '1.7' into 1.8

Author: lenkis

Dockerfile

@@ -0,0 +1,6 @@
+FROM packpack/packpack:ubuntu-xenial
+
+COPY requirements.txt /requirements.txt
+
+RUN apt-get update && apt-get -y install pkg-config lua5.1-dev python-pip python-setuptools python-dev
+RUN pip install -r /requirements.txt --upgrade

Jenkinsfile

@@ -9,9 +9,7 @@ stage("Build") {
             userRemoteConfigs: scm.userRemoteConfigs
         ])
 
-        docker.image('packpack/packpack:ubuntu-xenial').inside('--user root:root') {
-            sh "sudo apt-get update && apt-get -y install pkg-config lua5.1-dev python-pip python-setuptools python-dev"
-            sh "sudo pip install -r requirements.txt --upgrade"
+        docker.image('tarantool/doc').inside('') {
             sh "cmake ."
             sh "VERBOSE=1 make sphinx-html sphinx-html-ru"
             sh "VERBOSE=1 make sphinx-singlehtml sphinx-singlehtml-ru"

doc/1.8/book/box/data_model.rst

@@ -333,8 +333,10 @@ Snapshot files can be created even if there is no WAL file.
 
 .. NOTE::
 
-   | The memtx engine makes only forced checkpoints.
-   | The vinyl engine runs checkpointing in the background at all times.
+     The memtx engine makes only regular checkpoints with the interval set in
+     :ref:`checkpoint daemon <book_cfg_checkpoint_daemon>` configuration.
+
+     The vinyl engine runs checkpointing in the background at all times.
 
 See the :ref:`Internals <internals-data_persistence>` section for more details
 about the WAL writer and the recovery process.

doc/1.8/book/replication/index.rst

@@ -15,6 +15,8 @@ make the original data-change requests, set up the replica instances which
 copy data-change requests from masters, and establish procedures for
 recovery from a degraded state.
 
+.. _index-replication_architecture:
+
 =====================================================================
 Replication architecture
 =====================================================================

doc/1.8/reference/configuration/cfg_snapshot_daemon.rst

@@ -2,15 +2,23 @@
 * :ref:`checkpoint_interval <cfg_checkpoint_daemon-checkpoint_interval>`
 
 The checkpoint daemon is a fiber which is constantly running. At intervals, it may
-make new snapshot (.snap) files and then may remove old snapshot files. If the
-checkpoint daemon removes an old snapshot file, it will also remove any
+make new snapshot (.snap) files and then may delete old snapshot files. If the
+checkpoint daemon deletes an old snapshot file, then it will also delete any
 write-ahead log (.xlog) files which are older than the snapshot file and which contain
 information that is present in the snapshot file.
+It will also delete obsolete vinyl .run files.
+
+Exceptions: the checkpoint daemon will not delete a file
+if a backup is ongoing and the file has not been backed up
+(see :ref:`"Hot backup" <admin-backups-hot_backup_vinyl_memtx>`),
+or if replication is ongoing and the file has not been relayed to a replica
+(see :ref:`"Replication architecture" <index-replication_architecture>`),
+or if a replica is connecting.
 
 The :ref:`checkpoint_interval <cfg_checkpoint_daemon-checkpoint_interval>` and
 :ref:`checkpoint_count <cfg_checkpoint_daemon-checkpoint_count>` configuration
 settings determine how long the intervals are, and how many snapshots should
-exist before removals occur.
+exist before deletions occur.
 
 .. _cfg_checkpoint_daemon-checkpoint_interval:
 
@@ -41,8 +49,8 @@ exist before removals occur.
 .. confval:: checkpoint_count
 
     The maximum number of snapshots that may exist on the ``memtx_dir`` directory
-    before the checkpoint daemon will remove old snapshots. If ``checkpoint_count``
-    equals zero, then the checkpoint daemon does not remove old snapshots.
+    before the checkpoint daemon will delete old snapshots. If ``checkpoint_count``
+    equals zero, then the checkpoint daemon does not delete old snapshots.
     For example:
 
     .. code-block:: lua
@@ -53,7 +61,7 @@ exist before removals occur.
         }
 
     will cause the checkpoint daemon to create a new snapshot each hour until
-    it has created ten snapshots. After that, it will remove the oldest snapshot
+    it has created ten snapshots. After that, it will delete the oldest snapshot
     (and any associated write-ahead-log files) after creating a new one.
 
     | Type: integer

doc/1.8/reference/configuration/index.rst

@@ -199,7 +199,7 @@ Configuring the storage
 .. _book_cfg_checkpoint_daemon:
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Snapshot daemon
+Checkpoint daemon
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 .. include:: cfg_snapshot_daemon.rst