Merge lp:~hrvojem/percona-xtrabackup/bug1239791-2.1 into lp:percona-xtrabackup/2.1

Proposed by Hrvoje Matijakovic on 2013-12-03
Status: Merged
Approved by: Alexey Kopytov on 2013-12-04
Approved revision: 700
Merged at revision: 700
Proposed branch: lp:~hrvojem/percona-xtrabackup/bug1239791-2.1
Merge into: lp:percona-xtrabackup/2.1
Diff against target: 25 lines (+4/-2)
2 files modified
doc/source/innobackupex/streaming_backups_innobackupex.rst (+2/-2)
doc/source/installation.rst (+2/-0)
To merge this branch: bzr merge lp:~hrvojem/percona-xtrabackup/bug1239791-2.1
Reviewer Review Type Date Requested Status
Alexey Kopytov (community) 2013-12-03 Approve on 2013-12-04
Review via email: mp+197499@code.launchpad.net
To post a comment you must log in.
700. By Hrvoje Matijakovic on 2013-12-04

- upmerge of 2.0 branch for Bug #1239791

Alexey Kopytov (akopytov) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'doc/source/innobackupex/streaming_backups_innobackupex.rst'
2--- doc/source/innobackupex/streaming_backups_innobackupex.rst 2013-08-30 09:55:04 +0000
3+++ doc/source/innobackupex/streaming_backups_innobackupex.rst 2013-12-04 13:14:55 +0000
4@@ -12,9 +12,9 @@
5
6 |innobackupex| starts |xtrabackup| in :option:`--log-stream` mode in a child process, and redirects its log to a temporary file. It then uses |xbstream| to stream all of the data files to ``STDOUT``, in a special ``xbstream`` format. See :doc:`../xbstream/xbstream` for details. After it finishes streaming all of the data files to ``STDOUT``, it stops xtrabackup and streams the saved log file too.
7
8-When compression is enabled, |xtrabackup| compresses all output data, including the transaction log file and meta data files, using the specified compression algorithm. The only currently supported algorithm is 'quicklz'. The resulting files have the qpress archive format, i.e. every \*.qp file produced by xtrabackup is essentially a one-file qpress archive and can be extracted and uncompressed by the `qpress file archiver <http://www.quicklz.com/>`_ which is available from `Percona Software repositories <http://www.percona.com/doc/percona-xtrabackup/2.1/installation.html#using-percona-software-repositories>`_. New algorithms (gzip, bzip2, etc.) may be added later with minor efforts.
9+When compression is enabled, |xtrabackup| compresses all output data, except the meta and non-InnoDB files which are not compressed, using the specified compression algorithm. The only currently supported algorithm is ``quicklz``. The resulting files have the qpress archive format, i.e. every \*.qp file produced by xtrabackup is essentially a one-file qpress archive and can be extracted and uncompressed by the `qpress file archiver <http://www.quicklz.com/>`_ which is available from :ref:`Percona Software repositories <installation>`.
10
11-Using |xbstream| as a stream option, backups can be copied and compressed in parallel which can significantly speed up the backup process. In case backups were both compressed and encrypted, they'll need to decrypted first in order to be uncompressed.
12+Using |xbstream| as a stream option, backups can be copied and compressed in parallel which can significantly speed up the backup process. In case backups were both compressed and encrypted, they'll need to decrypted first in order to be uncompressed.
13
14 Examples using xbstream
15 =======================
16
17=== modified file 'doc/source/installation.rst'
18--- doc/source/installation.rst 2013-08-30 09:55:04 +0000
19+++ doc/source/installation.rst 2013-12-04 13:14:55 +0000
20@@ -1,3 +1,5 @@
21+.. _installation:
22+
23 ===============================================
24 Installing |Percona XtraBackup| from Binaries
25 ===============================================

Subscribers

People subscribed via source and target branches