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

Proposed by Hrvoje Matijakovic on 2014-11-06
Status: Merged
Approved by: Alexey Kopytov on 2014-11-06
Approved revision: 5038
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) 2014-11-06 Approve on 2014-11-06
Review via email: mp+240823@code.launchpad.net
To post a comment you must log in.
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 'storage/innobase/xtrabackup/doc/source/conf.py'
2--- storage/innobase/xtrabackup/doc/source/conf.py 2014-09-30 09:43:35 +0000
3+++ storage/innobase/xtrabackup/doc/source/conf.py 2014-11-06 09:00:04 +0000
4@@ -51,9 +51,9 @@
5 # built documents.
6 #
7 # The short X.Y version.
8-version = '2.2.5'
9+version = '2.3.0'
10 # The full version, including alpha/beta/rc tags.
11-release = '2.2.5'
12+release = '2.3.0-alpha1'
13
14 # The language for content autogenerated by Sphinx. Refer to documentation
15 # for a list of supported languages.
16@@ -126,6 +126,8 @@
17
18 .. |tar| replace:: :program:`tar`
19
20+.. |xbcloud| replace:: *xbcloud*
21+
22 '''
23
24 extlinks = {'bug': ('https://bugs.launchpad.net/percona-xtrabackup/+bug/%s',
25@@ -152,10 +154,10 @@
26
27 # The name for this set of Sphinx documents. If None, it defaults to
28 # "<project> v<release> documentation".
29-html_title = 'Percona XtraBackup 2.2 Documentation'
30+html_title = 'Percona XtraBackup 2.3 Documentation'
31
32 # A shorter title for the navigation bar. Default is the same as html_title.
33-html_short_title = 'Percona XtraBackup 2.2 Documentation'
34+html_short_title = 'Percona XtraBackup 2.3 Documentation'
35
36 # The name of an image file (relative to this directory) to place at the top
37 # of the sidebar.
38@@ -227,7 +229,7 @@
39 # Grouping the document tree into LaTeX files. List of tuples
40 # (source start file, target name, title, author, documentclass [howto/manual]).
41 latex_documents = [
42- ('index', 'PerconaXtraBackup-2.2.tex', u'Percona XtraBackup 2.2 Documentation',
43+ ('index', 'PerconaXtraBackup-2.3.tex', u'Percona XtraBackup 2.3 Documentation',
44 u'Percona LLC and/or its affiliates', 'manual'),
45 ]
46
47@@ -260,7 +262,7 @@
48 # One entry per manual page. List of tuples
49 # (source start file, name, description, authors, manual section).
50 man_pages = [
51- ('xtrabackup_bin/xtrabackup_binary', 'xtrabackup', u'Percona XtraBackup 2.2 Documentation',
52+ ('xtrabackup_bin/xtrabackup_binary', 'xtrabackup', u'Percona XtraBackup 2.3 Documentation',
53 [u'Percona LLC and/or its affiliates'], 1),
54 ('innobackupex/innobackupex_script', 'innobackupex', u'innobackupex Documentation',
55 [u'Percona LLC and/or its affiliates'], 1),
56
57=== modified file 'storage/innobase/xtrabackup/doc/source/index.rst'
58--- storage/innobase/xtrabackup/doc/source/index.rst 2014-09-30 09:43:35 +0000
59+++ storage/innobase/xtrabackup/doc/source/index.rst 2014-11-06 09:00:04 +0000
60@@ -15,6 +15,9 @@
61
62 |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.
63
64+.. warning::
65+
66+ This release is considered **ALPHA** quality and not inteded for production.
67
68 Introduction
69 ============
70
71=== modified file 'storage/innobase/xtrabackup/doc/source/installation/apt_repo.rst'
72--- storage/innobase/xtrabackup/doc/source/installation/apt_repo.rst 2014-09-25 16:10:20 +0000
73+++ storage/innobase/xtrabackup/doc/source/installation/apt_repo.rst 2014-11-06 09:00:04 +0000
74@@ -37,10 +37,10 @@
75
76 * 10.04LTS (lucid)
77 * 12.04LTS (precise)
78- * 13.10 (saucy)
79 * 14.04LTS (trusty)
80+ * 14.10 (utopic)
81
82-.. _debian_experimental:
83+.. _debian_testing:
84
85 Percona `apt` Testing repository
86 =================================
87
88=== modified file 'storage/innobase/xtrabackup/doc/source/manual.rst'
89--- storage/innobase/xtrabackup/doc/source/manual.rst 2013-08-30 09:55:04 +0000
90+++ storage/innobase/xtrabackup/doc/source/manual.rst 2014-11-06 09:00:04 +0000
91@@ -12,6 +12,7 @@
92 xtrabackup_bin/xtrabackup_binary
93 xbstream/xbstream
94 xbcrypt/xbcrypt
95+ xbcloud/xbcloud
96 how_xtrabackup_works
97
98 |Percona XtraBackup| is a set of following tools:
99@@ -28,4 +29,7 @@
100 :doc:`xbstream <xbstream/xbstream>`
101 utility that allows streaming and extracting files to/from the :term:`xbstream` format.
102
103+:doc:`xbcloud <xbcloud/xbcloud>`
104+ utility used for downloading and uploading full or part of |xbstream| archive from/to cloud.
105+
106 It 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.
107
108=== modified file 'storage/innobase/xtrabackup/doc/source/release-notes.rst'
109--- storage/innobase/xtrabackup/doc/source/release-notes.rst 2014-03-26 07:39:36 +0000
110+++ storage/innobase/xtrabackup/doc/source/release-notes.rst 2014-11-06 09:00:04 +0000
111@@ -48,3 +48,12 @@
112 :glob:
113
114 release-notes/2.2/*
115+
116+Percona |XtraBackup| 2.3
117+=========================
118+
119+.. toctree::
120+ :maxdepth: 1
121+ :glob:
122+
123+ release-notes/2.3/*
124
125=== modified file 'storage/innobase/xtrabackup/doc/source/release-notes/2.2/2.2.1-alpha1.rst'
126--- storage/innobase/xtrabackup/doc/source/release-notes/2.2/2.2.1-alpha1.rst 2014-03-28 11:46:09 +0000
127+++ storage/innobase/xtrabackup/doc/source/release-notes/2.2/2.2.1-alpha1.rst 2014-11-06 09:00:04 +0000
128@@ -2,7 +2,7 @@
129 |Percona XtraBackup| 2.2.1-alpha1
130 =======================================
131
132-Percona 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.
133+Percona 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.
134
135 This 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).
136
137
138=== modified file 'storage/innobase/xtrabackup/doc/source/release-notes/2.2/2.2.2-beta1.rst'
139--- storage/innobase/xtrabackup/doc/source/release-notes/2.2/2.2.2-beta1.rst 2014-05-06 17:08:06 +0000
140+++ storage/innobase/xtrabackup/doc/source/release-notes/2.2/2.2.2-beta1.rst 2014-11-06 09:00:04 +0000
141@@ -2,7 +2,7 @@
142 |Percona XtraBackup| 2.2.2-beta1
143 =======================================
144
145-Percona 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.
146+Percona 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.
147
148 This 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).
149
150
151=== added directory 'storage/innobase/xtrabackup/doc/source/release-notes/2.3'
152=== added file 'storage/innobase/xtrabackup/doc/source/release-notes/2.3/2.3.0-alpha1.rst'
153--- storage/innobase/xtrabackup/doc/source/release-notes/2.3/2.3.0-alpha1.rst 1970-01-01 00:00:00 +0000
154+++ storage/innobase/xtrabackup/doc/source/release-notes/2.3/2.3.0-alpha1.rst 2014-11-06 09:00:04 +0000
155@@ -0,0 +1,16 @@
156+===================================
157+ |Percona XtraBackup| 2.3.0-alpha1
158+===================================
159+
160+Percona 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.
161+
162+This 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).
163+
164+New features
165+------------
166+
167+ |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.
168+
169+.. note::
170+
171+ 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.
172
173=== added directory 'storage/innobase/xtrabackup/doc/source/xbcloud'
174=== added file 'storage/innobase/xtrabackup/doc/source/xbcloud/xbcloud.rst'
175--- storage/innobase/xtrabackup/doc/source/xbcloud/xbcloud.rst 1970-01-01 00:00:00 +0000
176+++ storage/innobase/xtrabackup/doc/source/xbcloud/xbcloud.rst 2014-11-06 09:00:04 +0000
177@@ -0,0 +1,87 @@
178+.. _xbcloud_binary:
179+
180+======================
181+ The xbcloud Binary
182+======================
183+
184+.. note::
185+
186+ This feature implementation is considered **ALPHA** quality.
187+
188+|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.
189+
190+Usage
191+-----
192+
193+Backup: ::
194+
195+ innobackupex --stream=xbstream /tmp | xbcloud [options] put <name>
196+
197+Following example shows how to make a full backup and upload it to Swift: ::
198+
199+ innobackupex --stream=xbstream --extra-lsndir=/tmp /tmp | \
200+ xbcloud put --storage=Swift \
201+ --swift-container=test \
202+ --swift-user=test:tester \
203+ --swift-url=http://192.168.8.80:8080/ \
204+ --swift-key=testing \
205+ --parallel=10 \
206+ full_backup
207+
208+Restore: ::
209+
210+ xbcloud [options] get <name> [<list-of-files>] | xbstream -x
211+
212+Following example shows how to fetch and restore the backup from Swift: ::
213+
214+ xbcloud get --storage=Swift \
215+ --swift-container=test \
216+ --swift-user=test:tester \
217+ --swift-url=http://192.168.8.80:8080/ \
218+ --swift-key=testing \
219+ full_backup | xbstream -xv -C /tmp/downloaded_full
220+
221+ innobackupex --apply-log /tmp/downloaded_full
222+ innobackupex --copy-back /tmp/downloaded_full
223+
224+Limitations
225+-----------
226+
227+Restoring individual tables from full cloud backup isn't possible without downloading the entire backup.
228+
229+Command-line options
230+--------------------
231+
232+|xbcloud| has following command line options:
233+
234+.. option:: --storage
235+
236+ Cloud storage option. Only support for Swift is currently implemented. Default is Swift
237+
238+.. option:: --swift-url
239+
240+ URL of Swift cluster
241+
242+.. option:: --swift-user
243+
244+ Swift username (X-Auth-User, specific to Swift)
245+
246+.. option:: --swift-key
247+
248+ Swift key/password (X-Auth-Key, specific to Swift)
249+
250+.. option:: --swift-container
251+
252+ Container to backup into (specific to Swift)
253+
254+.. option:: --parallel=N
255+
256+ Maximum number of concurrent upload/download threads. Default is 1.
257+
258+.. option:: --cacert
259+
260+ Path to the file with CA certificates
261+
262+.. option:: --insecure
263+
264+ Do not verify servers certificate

Subscribers

People subscribed via source and target branches