Merge lp:~hrvojem/percona-xtrabackup/rn-2.3.0-alpha1-2.3 into lp:percona-xtrabackup/2.3

Proposed by Hrvoje Matijakovic
Status: Merged
Approved by: Alexey Kopytov
Approved revision: no longer in the source branch.
Merged at revision: 5040
Proposed branch: lp:~hrvojem/percona-xtrabackup/rn-2.3.0-alpha1-2.3
Merge into: lp:percona-xtrabackup/2.3
Diff against target: 264 lines (+131/-10)
9 files modified
storage/innobase/xtrabackup/doc/source/conf.py (+8/-6)
storage/innobase/xtrabackup/doc/source/index.rst (+3/-0)
storage/innobase/xtrabackup/doc/source/installation/apt_repo.rst (+2/-2)
storage/innobase/xtrabackup/doc/source/manual.rst (+4/-0)
storage/innobase/xtrabackup/doc/source/release-notes.rst (+9/-0)
storage/innobase/xtrabackup/doc/source/release-notes/2.2/2.2.1-alpha1.rst (+1/-1)
storage/innobase/xtrabackup/doc/source/release-notes/2.2/2.2.2-beta1.rst (+1/-1)
storage/innobase/xtrabackup/doc/source/release-notes/2.3/2.3.0-alpha1.rst (+16/-0)
storage/innobase/xtrabackup/doc/source/xbcloud/xbcloud.rst (+87/-0)
To merge this branch: bzr merge lp:~hrvojem/percona-xtrabackup/rn-2.3.0-alpha1-2.3
Reviewer Review Type Date Requested Status
Alexey Kopytov (community) Approve
Review via email: mp+240823@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Alexey Kopytov (akopytov) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'storage/innobase/xtrabackup/doc/source/conf.py'
--- storage/innobase/xtrabackup/doc/source/conf.py 2014-09-30 09:43:35 +0000
+++ storage/innobase/xtrabackup/doc/source/conf.py 2014-11-06 09:00:04 +0000
@@ -51,9 +51,9 @@
51# built documents.51# built documents.
52#52#
53# The short X.Y version.53# The short X.Y version.
54version = '2.2.5'54version = '2.3.0'
55# The full version, including alpha/beta/rc tags.55# The full version, including alpha/beta/rc tags.
56release = '2.2.5'56release = '2.3.0-alpha1'
5757
58# The language for content autogenerated by Sphinx. Refer to documentation58# The language for content autogenerated by Sphinx. Refer to documentation
59# for a list of supported languages.59# for a list of supported languages.
@@ -126,6 +126,8 @@
126126
127.. |tar| replace:: :program:`tar`127.. |tar| replace:: :program:`tar`
128128
129.. |xbcloud| replace:: *xbcloud*
130
129'''131'''
130132
131extlinks = {'bug': ('https://bugs.launchpad.net/percona-xtrabackup/+bug/%s',133extlinks = {'bug': ('https://bugs.launchpad.net/percona-xtrabackup/+bug/%s',
@@ -152,10 +154,10 @@
152154
153# The name for this set of Sphinx documents. If None, it defaults to155# The name for this set of Sphinx documents. If None, it defaults to
154# "<project> v<release> documentation".156# "<project> v<release> documentation".
155html_title = 'Percona XtraBackup 2.2 Documentation'157html_title = 'Percona XtraBackup 2.3 Documentation'
156158
157# A shorter title for the navigation bar. Default is the same as html_title.159# A shorter title for the navigation bar. Default is the same as html_title.
158html_short_title = 'Percona XtraBackup 2.2 Documentation'160html_short_title = 'Percona XtraBackup 2.3 Documentation'
159161
160# The name of an image file (relative to this directory) to place at the top162# The name of an image file (relative to this directory) to place at the top
161# of the sidebar.163# of the sidebar.
@@ -227,7 +229,7 @@
227# Grouping the document tree into LaTeX files. List of tuples229# Grouping the document tree into LaTeX files. List of tuples
228# (source start file, target name, title, author, documentclass [howto/manual]).230# (source start file, target name, title, author, documentclass [howto/manual]).
229latex_documents = [231latex_documents = [
230 ('index', 'PerconaXtraBackup-2.2.tex', u'Percona XtraBackup 2.2 Documentation',232 ('index', 'PerconaXtraBackup-2.3.tex', u'Percona XtraBackup 2.3 Documentation',
231 u'Percona LLC and/or its affiliates', 'manual'),233 u'Percona LLC and/or its affiliates', 'manual'),
232]234]
233235
@@ -260,7 +262,7 @@
260# One entry per manual page. List of tuples262# One entry per manual page. List of tuples
261# (source start file, name, description, authors, manual section).263# (source start file, name, description, authors, manual section).
262man_pages = [264man_pages = [
263 ('xtrabackup_bin/xtrabackup_binary', 'xtrabackup', u'Percona XtraBackup 2.2 Documentation',265 ('xtrabackup_bin/xtrabackup_binary', 'xtrabackup', u'Percona XtraBackup 2.3 Documentation',
264 [u'Percona LLC and/or its affiliates'], 1),266 [u'Percona LLC and/or its affiliates'], 1),
265 ('innobackupex/innobackupex_script', 'innobackupex', u'innobackupex Documentation',267 ('innobackupex/innobackupex_script', 'innobackupex', u'innobackupex Documentation',
266 [u'Percona LLC and/or its affiliates'], 1),268 [u'Percona LLC and/or its affiliates'], 1),
267269
=== modified file 'storage/innobase/xtrabackup/doc/source/index.rst'
--- storage/innobase/xtrabackup/doc/source/index.rst 2014-09-30 09:43:35 +0000
+++ storage/innobase/xtrabackup/doc/source/index.rst 2014-11-06 09:00:04 +0000
@@ -15,6 +15,9 @@
1515
16|Percona XtraBackup| is a combination of the |xtrabackup| *C* program, and the |innobackupex| *Perl* script. The |xtrabackup| program copies and manipulates |InnoDB| and |XtraDB| data files, and the *Perl* script enables enhanced functionality, such as interacting with a running |MySQL| server and backing up |MyISAM| tables. 16|Percona XtraBackup| is a combination of the |xtrabackup| *C* program, and the |innobackupex| *Perl* script. The |xtrabackup| program copies and manipulates |InnoDB| and |XtraDB| data files, and the *Perl* script enables enhanced functionality, such as interacting with a running |MySQL| server and backing up |MyISAM| tables.
1717
18.. warning::
19
20 This release is considered **ALPHA** quality and not inteded for production.
1821
19Introduction22Introduction
20============23============
2124
=== modified file 'storage/innobase/xtrabackup/doc/source/installation/apt_repo.rst'
--- storage/innobase/xtrabackup/doc/source/installation/apt_repo.rst 2014-09-25 16:10:20 +0000
+++ storage/innobase/xtrabackup/doc/source/installation/apt_repo.rst 2014-11-06 09:00:04 +0000
@@ -37,10 +37,10 @@
3737
38 * 10.04LTS (lucid)38 * 10.04LTS (lucid)
39 * 12.04LTS (precise) 39 * 12.04LTS (precise)
40 * 13.10 (saucy)
41 * 14.04LTS (trusty)40 * 14.04LTS (trusty)
41 * 14.10 (utopic)
4242
43.. _debian_experimental: 43.. _debian_testing:
4444
45Percona `apt` Testing repository45Percona `apt` Testing repository
46=================================46=================================
4747
=== modified file 'storage/innobase/xtrabackup/doc/source/manual.rst'
--- storage/innobase/xtrabackup/doc/source/manual.rst 2013-08-30 09:55:04 +0000
+++ storage/innobase/xtrabackup/doc/source/manual.rst 2014-11-06 09:00:04 +0000
@@ -12,6 +12,7 @@
12 xtrabackup_bin/xtrabackup_binary12 xtrabackup_bin/xtrabackup_binary
13 xbstream/xbstream13 xbstream/xbstream
14 xbcrypt/xbcrypt14 xbcrypt/xbcrypt
15 xbcloud/xbcloud
15 how_xtrabackup_works16 how_xtrabackup_works
1617
17|Percona XtraBackup| is a set of following tools:18|Percona XtraBackup| is a set of following tools:
@@ -28,4 +29,7 @@
28:doc:`xbstream <xbstream/xbstream>`29:doc:`xbstream <xbstream/xbstream>`
29 utility that allows streaming and extracting files to/from the :term:`xbstream` format.30 utility that allows streaming and extracting files to/from the :term:`xbstream` format.
3031
32:doc:`xbcloud <xbcloud/xbcloud>`
33 utility used for downloading and uploading full or part of |xbstream| archive from/to cloud.
34
31It is possible to use the |xtrabackup| binary alone, however, the recommend way is using it through the |innobackupex| wrapper script and let it execute |xtrabackup| for you. It might be helpful to first learn :doc:`how to use innobackupex <innobackupex/innobackupex_script>`, and then learn :doc:`how to use xtrabackup <xtrabackup_bin/xtrabackup_binary>` for having a better low-level understanding or control of the tool if needed.35It is possible to use the |xtrabackup| binary alone, however, the recommend way is using it through the |innobackupex| wrapper script and let it execute |xtrabackup| for you. It might be helpful to first learn :doc:`how to use innobackupex <innobackupex/innobackupex_script>`, and then learn :doc:`how to use xtrabackup <xtrabackup_bin/xtrabackup_binary>` for having a better low-level understanding or control of the tool if needed.
3236
=== modified file 'storage/innobase/xtrabackup/doc/source/release-notes.rst'
--- storage/innobase/xtrabackup/doc/source/release-notes.rst 2014-03-26 07:39:36 +0000
+++ storage/innobase/xtrabackup/doc/source/release-notes.rst 2014-11-06 09:00:04 +0000
@@ -48,3 +48,12 @@
48 :glob:48 :glob:
4949
50 release-notes/2.2/*50 release-notes/2.2/*
51
52Percona |XtraBackup| 2.3
53=========================
54
55.. toctree::
56 :maxdepth: 1
57 :glob:
58
59 release-notes/2.3/*
5160
=== modified file 'storage/innobase/xtrabackup/doc/source/release-notes/2.2/2.2.1-alpha1.rst'
--- storage/innobase/xtrabackup/doc/source/release-notes/2.2/2.2.1-alpha1.rst 2014-03-28 11:46:09 +0000
+++ storage/innobase/xtrabackup/doc/source/release-notes/2.2/2.2.1-alpha1.rst 2014-11-06 09:00:04 +0000
@@ -2,7 +2,7 @@
2 |Percona XtraBackup| 2.2.1-alpha12 |Percona XtraBackup| 2.2.1-alpha1
3=======================================3=======================================
44
5Percona is glad to announce the release of |Percona XtraBackup| 2.2.1-alpha1 on March 28th 2014. Downloads are available from our download site `here <http://www.percona.com/downloads/XtraBackup/2.2.1/>`_. This **ALPHA** release, will be available in :ref:`Debian experimental <debian_experimental>` and :ref:`CentOS testing <yum_testing>` repositories. 5Percona is glad to announce the release of |Percona XtraBackup| 2.2.1-alpha1 on March 28th 2014. Downloads are available from our download site `here <http://www.percona.com/downloads/XtraBackup/2.2.1/>`_. This **ALPHA** release, will be available in :ref:`Debian experimental <debian_testing>` and :ref:`CentOS testing <yum_testing>` repositories.
66
7This is an **ALPHA** quality release and it is not intended for production. If you want a high quality, Generally Available release, the current Stable version should be used (currently 2.1.8 in the 2.1 series at the time of writing).7This is an **ALPHA** quality release and it is not intended for production. If you want a high quality, Generally Available release, the current Stable version should be used (currently 2.1.8 in the 2.1 series at the time of writing).
88
99
=== modified file 'storage/innobase/xtrabackup/doc/source/release-notes/2.2/2.2.2-beta1.rst'
--- storage/innobase/xtrabackup/doc/source/release-notes/2.2/2.2.2-beta1.rst 2014-05-06 17:08:06 +0000
+++ storage/innobase/xtrabackup/doc/source/release-notes/2.2/2.2.2-beta1.rst 2014-11-06 09:00:04 +0000
@@ -2,7 +2,7 @@
2 |Percona XtraBackup| 2.2.2-beta12 |Percona XtraBackup| 2.2.2-beta1
3=======================================3=======================================
44
5Percona is glad to announce the release of |Percona XtraBackup| 2.2.2-beta1 on May 8th 2014. Downloads are available from our download site `here <http://www.percona.com/downloads/XtraBackup/2.2.2/>`_. This **BETA** release will be available in :ref:`Debian experimental <debian_experimental>` and :ref:`CentOS testing <yum_testing>` repositories. 5Percona is glad to announce the release of |Percona XtraBackup| 2.2.2-beta1 on May 8th 2014. Downloads are available from our download site `here <http://www.percona.com/downloads/XtraBackup/2.2.2/>`_. This **BETA** release will be available in :ref:`Debian experimental <debian_testing>` and :ref:`CentOS testing <yum_testing>` repositories.
66
7This is a **BETA** quality release and it is not intended for production. If you want a high quality, Generally Available release, the current Stable version should be used (currently 2.1.9 in the 2.1 series at the time of writing).7This is a **BETA** quality release and it is not intended for production. If you want a high quality, Generally Available release, the current Stable version should be used (currently 2.1.9 in the 2.1 series at the time of writing).
88
99
=== added directory 'storage/innobase/xtrabackup/doc/source/release-notes/2.3'
=== added file 'storage/innobase/xtrabackup/doc/source/release-notes/2.3/2.3.0-alpha1.rst'
--- storage/innobase/xtrabackup/doc/source/release-notes/2.3/2.3.0-alpha1.rst 1970-01-01 00:00:00 +0000
+++ storage/innobase/xtrabackup/doc/source/release-notes/2.3/2.3.0-alpha1.rst 2014-11-06 09:00:04 +0000
@@ -0,0 +1,16 @@
1===================================
2 |Percona XtraBackup| 2.3.0-alpha1
3===================================
4
5Percona is glad to announce the release of |Percona XtraBackup| 2.3.0-alpha1 on October 30th 2014. Downloads are available from our download site `here <http://www.percona.com/downloads/TESTING/XtraBackup/xtrabackup-2.3.0alpha1/>`_. This **ALPHA** release, will be available in :ref:`Debian testing <debian_testing>` and :ref:`CentOS testing <yum_testing>` repositories.
6
7This is an **ALPHA** quality release and it is not intended for production. If you want a high quality, Generally Available release, the current Stable version should be used (currently 2.2.5 in the 2.2 series at the time of writing).
8
9New features
10------------
11
12 |Percona XtraBackup| has implemented new tool, :ref:`xbcloud_binary`, which can be used to upload/download full or part of |xbstream| archive from/to cloud.
13
14.. note::
15
16 In order to sucessfully install Percona Xtrabackup 2.3.0-alpha1 on *CentOS*, ``libev.so.4`` package will need to be installed first. ``libev.so.4`` package can be installed from the `EPEL <https://fedoraproject.org/wiki/EPEL>`_ repositories.
017
=== added directory 'storage/innobase/xtrabackup/doc/source/xbcloud'
=== added file 'storage/innobase/xtrabackup/doc/source/xbcloud/xbcloud.rst'
--- storage/innobase/xtrabackup/doc/source/xbcloud/xbcloud.rst 1970-01-01 00:00:00 +0000
+++ storage/innobase/xtrabackup/doc/source/xbcloud/xbcloud.rst 2014-11-06 09:00:04 +0000
@@ -0,0 +1,87 @@
1.. _xbcloud_binary:
2
3======================
4 The xbcloud Binary
5======================
6
7.. note::
8
9 This feature implementation is considered **ALPHA** quality.
10
11|xbcloud| is a new tool which is part of the |Percona XtraBackup| 2.3.0-alpha1 release. The purpose of |xbcloud| is to download and upload full or part of |xbstream| archive from/to cloud. Archive uploading will employ multipart upload for Amazon and Large Objects on Swift. Along with |xbstream| archive index file will be uploaded which contains list of files and their parts and offsets of those parts in the |xbstream| archive. This index is needed for downloading only part of archive (one or several tables from backups) on demand.
12
13Usage
14-----
15
16Backup: ::
17
18 innobackupex --stream=xbstream /tmp | xbcloud [options] put <name>
19
20Following example shows how to make a full backup and upload it to Swift: ::
21
22 innobackupex --stream=xbstream --extra-lsndir=/tmp /tmp | \
23 xbcloud put --storage=Swift \
24 --swift-container=test \
25 --swift-user=test:tester \
26 --swift-url=http://192.168.8.80:8080/ \
27 --swift-key=testing \
28 --parallel=10 \
29 full_backup
30
31Restore: ::
32
33 xbcloud [options] get <name> [<list-of-files>] | xbstream -x
34
35Following example shows how to fetch and restore the backup from Swift: ::
36
37 xbcloud get --storage=Swift \
38 --swift-container=test \
39 --swift-user=test:tester \
40 --swift-url=http://192.168.8.80:8080/ \
41 --swift-key=testing \
42 full_backup | xbstream -xv -C /tmp/downloaded_full
43
44 innobackupex --apply-log /tmp/downloaded_full
45 innobackupex --copy-back /tmp/downloaded_full
46
47Limitations
48-----------
49
50Restoring individual tables from full cloud backup isn't possible without downloading the entire backup.
51
52Command-line options
53--------------------
54
55|xbcloud| has following command line options:
56
57.. option:: --storage
58
59 Cloud storage option. Only support for Swift is currently implemented. Default is Swift
60
61.. option:: --swift-url
62
63 URL of Swift cluster
64
65.. option:: --swift-user
66
67 Swift username (X-Auth-User, specific to Swift)
68
69.. option:: --swift-key
70
71 Swift key/password (X-Auth-Key, specific to Swift)
72
73.. option:: --swift-container
74
75 Container to backup into (specific to Swift)
76
77.. option:: --parallel=N
78
79 Maximum number of concurrent upload/download threads. Default is 1.
80
81.. option:: --cacert
82
83 Path to the file with CA certificates
84
85.. option:: --insecure
86
87 Do not verify servers certificate

Subscribers

People subscribed via source and target branches