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

[Hrvoje Matijakovic]

[Alexey Kopytov (akopytov)]

Hrvoje,

- wrt. reference to the kill long queries feature in "New Features". Should we link to the docs. Perhaps create a stub for it until the feature is documented?

- s/coping/copying/

- s/would couldn't/could not/

- for bug 1190716 the actual problem was that innobackupex would terminate with an error if --safe-slave-backup was used to backup a master server. The hanging xtrabackup process is a separate bug.

- I don't see bug #1190779 in the list of fixed bugs. Please make sure all bugfixes not related to regression tests are there.

review: Needs Fixing

[Hrvoje Matijakovic (hrvojem)]

> Hrvoje,
>
> - wrt. reference to the kill long queries feature in "New Features". Should we
> link to the docs. Perhaps create a stub for it until the feature is
> documented?

I'm working on documenting this in different branch, will submit an MP once this gets merged

> - s/coping/copying/
>
> - s/would couldn't/could not/
>
> - for bug 1190716 the actual problem was that innobackupex would terminate
> with an error if --safe-slave-backup was used to backup a master server. The
> hanging xtrabackup process is a separate bug.

Fixed
>
> - I don't see bug #1190779 in the list of fixed bugs. Please make sure all
> bugfixes not related to regression tests are there.

I've documented only Fix Released bugs, this bug is still in Fix Committed state

[Alexey Kopytov (akopytov)]

Hi Hrvoje,

On Thu, 25 Jul 2013 20:03:24 -0000, Hrvoje Matijakovic wrote:
>> Hrvoje,
>>
>> - wrt. reference to the kill long queries feature in "New Features". Should we
>> link to the docs. Perhaps create a stub for it until the feature is
>> documented?
>
> I'm working on documenting this in different branch, will submit an MP once this gets merged
>

OK, my point was that we could create an empty page for the feature and
link it from release notes, so we don't forget it later.

>>
>> - I don't see bug #1190779 in the list of fixed bugs. Please make sure all
>> bugfixes not related to regression tests are there.
>
> I've documented only Fix Released bugs, this bug is still in Fix Committed state
>

Oh, right. Would it be better to wait for Fix Committed bugs to be
merged before merging the release notes?

[Alexey Kopytov (akopytov)]

review: Needs Information

[Alexey Kopytov (akopytov)]

Discussed on IRC.

review: Approve

=== modified file 'doc/source/conf.py'
--- doc/source/conf.py	2013-05-22 11:21:52 +0000
+++ doc/source/conf.py	2013-07-25 20:02:24 +0000
@@ -129,7 +129,8 @@
 '''
 
 extlinks = {'bug': ('https://bugs.launchpad.net/percona-xtrabackup/+bug/%s',
-                      '#')}
+                   '#'), 'mysqlbug': ('http://bugs.mysql.com/bug.php?id=%s',
+                   '#')}
 
 # A list of ignored prefixes for module index sorting.
 #modindex_common_prefix = []

=== modified file 'doc/source/innobackupex/compact_backups_innobackupex.rst'
--- doc/source/innobackupex/compact_backups_innobackupex.rst	2013-05-10 09:29:17 +0000
+++ doc/source/innobackupex/compact_backups_innobackupex.rst	2013-07-25 20:02:24 +0000
@@ -32,7 +32,7 @@
 
   You can use the :option:`innobackupex --no-timestamp` option to override this behavior and the backup will be created in the given directory.
 
-If you check at the :file:`xtrabackup-checkpoints` file in ``BASE-DIR``, you should see something like::
+If you check at the :file:`xtrabackup_checkpoints` file in ``BASE-DIR``, you should see something like::
 
   backup_type = full-backuped
   from_lsn = 0

=== modified file 'doc/source/innobackupex/encrypted_backups_innobackupex.rst'
--- doc/source/innobackupex/encrypted_backups_innobackupex.rst	2013-03-29 10:33:27 +0000
+++ doc/source/innobackupex/encrypted_backups_innobackupex.rst	2013-07-25 20:02:24 +0000
@@ -6,6 +6,10 @@
 
 |Percona XtraBackup| has implemented support for encrypted backups. This feature was introduced in |Percona XtraBackup| 2.1. It can be used to encrypt/decrypt local or streaming backup with |xbstream| option (streaming tar backups are not supported) in order to add another layer of protection to the backups. Encryption is done with the ``libgcrypt`` library.
 
+.. note:: 
+
+  Encryption related options are currently ignored by |innobackupex| when specified in :file:`my.cnf`.
+
 Creating Encrypted Backups
 ===========================
 
@@ -17,13 +21,23 @@
 
  * :option:`--encrypt-key-file=KEYFILE` - the name of a file where the raw key of the appropriate length can be read from. The file must be a simple binary (or text) file that contains exactly the key to be used. 
 
-Both :option:`--encrypt-key` option  and :option:`--encrypt-key-file` option can be used to specify the encryption key.
+Both :option:`--encrypt-key` option  and :option:`--encrypt-key-file` option can be used to specify the encryption key. Encryption key can be generated with command like: ::
+  
+  $ openssl enc -aes-256-cbc -pass pass:Password -P -md sha1
+
+Output of that command should look like this: :: 
+
+  salt=9464A264486EEC69
+  key=DDD3A1B6BC90B9A9B631913CF30E0336A2571BA854E2D65CF92A6D0BDBCBB251
+  iv =A1EDC73815467C083B0869508406637E
+
+In this case we can use ``iv`` value as key.
 
 Using the :option:`--encrypt-key` option
 -----------------------------------------
 Example of the innobackupex command using the :option:`--encrypt-key` should look like this ::
 
-  $ innobackupex --encrypt=AES256 --encrypt-key="secret_key_with_the_length_of_32" /data/backups
+  $ innobackupex --encrypt=AES256 --encrypt-key="A1EDC73815467C083B0869508406637E" /data/backups
 
 
 Using the :option:`--encrypt-key-file` option
@@ -34,7 +48,7 @@
 
 .. note::
 
-  Depending on the text editor used for making the ``KEYFILE``, text file in some cases can contain the CRLF and this will cause the key size to grow and thus making it invalid. Suggested way to do this would be to create the file with: ``echo -n "secret_key_with_the_length_of_32" > /data/backups/keyfile``
+  Depending on the text editor used for making the ``KEYFILE``, text file in some cases can contain the CRLF and this will cause the key size to grow and thus making it invalid. Suggested way to do this would be to create the file with: ``echo -n "A1EDC73815467C083B0869508406637E" > /data/backups/keyfile``
 
 
 Both of these examples will create a timestamped directory in :file:`/data/backups` containing the encrypted backup.

=== modified file 'doc/source/innobackupex/streaming_backups_innobackupex.rst'
--- doc/source/innobackupex/streaming_backups_innobackupex.rst	2013-07-24 09:33:08 +0000
+++ doc/source/innobackupex/streaming_backups_innobackupex.rst	2013-07-25 20:02:24 +0000
@@ -14,7 +14,7 @@
 
 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.
 
-Using |xbstream| as a stream option, backups can be copied and compressed in parallel which can significantly speed up the backup process.  
+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. 
 
 Examples using xbstream
 =======================

=== modified file 'doc/source/installation/apt_repo.rst'
--- doc/source/installation/apt_repo.rst	2013-05-06 13:52:03 +0000
+++ doc/source/installation/apt_repo.rst	2013-07-25 20:02:24 +0000
@@ -46,3 +46,21 @@
   deb http://repo.percona.com/apt VERSION main experimental
   deb-src http://repo.percona.com/apt VERSION main experimental
 
+Ubuntu PPA of daily builds
+==========================
+
+Percona offers a Personal Package Archive (PPA) `percona-daily/percona-xtrabackup <https://launchpad.net/~percona-daily/+archive/percona-xtrabackup>`_. Every time code is pushed to our main source code repository, the PPA gets updated.
+
+.. note:: 
+
+  These packages are directly built from lp:percona-xtrabackup/2.1 trunk and should be considered PRE-RELEASE SOFTWARE.
+
+This PPA can be added to your system manually by copying the lines below and adding them to your system's software sources: :: 
+  
+  deb http://ppa.launchpad.net/percona-daily/percona-xtrabackup/ubuntu YOUR_UBUNTU_VERSION_HERE main 
+  deb-src http://ppa.launchpad.net/percona-daily/percona-xtrabackup/ubuntu YOUR_UBUNTU_VERSION_HERE main
+
+or by simply running: :: 
+
+  $ sudo add-apt-repository ppa:percona-daily/percona-xtrabackup
+

=== added file 'doc/source/release-notes/2.1/2.1.4.rst'
--- doc/source/release-notes/2.1/2.1.4.rst	1970-01-01 00:00:00 +0000
+++ doc/source/release-notes/2.1/2.1.4.rst	2013-07-25 20:02:24 +0000
@@ -0,0 +1,39 @@
+===============================================
+ |Percona XtraBackup| 2.1.4 [not yet released]
+===============================================
+
+
+New Features
+------------
+
+ |Percona XtraBackup| has introduced additional options to handle the locking during the ``FLUSH TABLES WITH READ LOCK``. These options can be used to minimize the amount of the time when |MySQL| operates in the read-only mode.
+
+ |Percona XtraBackup| has now been rebased on |MySQL| versions 5.1.70, 5.5.30, 5.6.11 and |Percona Server| versions 5.1.70-rel14.8 and 5.5.31-rel30.3 server versions.
+
+ In order to speed up the backup process, slave thread is not stopped during copying non-InnoDB data when :option:`innobackupex --no-lock` option is used as using this option requires absence of ``DDL`` or ``DML`` to non-transaction tables during backup.
+
+ Source tarball (and Debian source) now include all |MySQL| source trees required for the build. This means internet connection during package build isn't required anymore.
+
+Bugs Fixed
+----------
+
+ During the backup process loading tablespaces was started before the log copying, this could lead to a race between the datafiles state in the resulting backup and xtrabackup_logfile. Tablespace created at a sensitive time would be missing in both the backup itself and as the corresponding log record in :file:`xtrabackup_logfile`, so it would not be created on :option:`innobackupex --apply-log` either. Bug fixed :bug:`1177206`.
+
+ Difference in behavior between |InnoDB| 5.5 and 5.6 codebases in cases when a newly created tablespace has uninitialized first page at the time when |XtraBackup| opens it while creating a list of tablespaces to backup would cause assertion error. Bug fixed :bug:`1187071`. 
+
+ **xbcrypt** could sometimes fail when reading encrypted stream from a pipe or network. Bug fixed :bug:`1190610`.
+
+ |innobackupex| could not prepare the backup if there was no :file:`xtrabackup_binary` file in the backup directory and the xtrabackup binary was not specified explicitly with :option:`innobackupex --ibbackup` option. Bug fixed :bug:`1199190`.
+
+ |innobackupex| would terminate with an error if :option:`innobackupex --safe-slave-backup` option was used for backing up the master server. Bug fixed :bug:`1190716`.
+
+ |Percona XtraBackup| didn't recognize checkpoint ``#0`` as a valid checkpoint on :option:`xtrabackup --prepare` which would cause an error. Bug fixed :bug:`1196475`.
+ 
+ |innobackupex| would terminate if :option:`innobackupex --galera-info` option was specified when backing up non-galera server. Bug fixed :bug:`1192347`.
+ 
+Other bug fixes: bug fixed :bug:`1097434`, bug fixed :bug:`1201599`, bug fixed :bug:`1198220`, bug fixed :bug:`1097444`, bug fixed :bug:`1042796`, bug fixed :bug:`1204463`, bug fixed :bug:`1197644`, bug fixed :bug:`1197249`, bug fixed :bug:`1196894`, bug fixed :bug:`1194813`, bug fixed :bug:`1183500`, bug fixed :bug:`1181432`, bug fixed :bug:`1201686`, bug fixed :bug:`1182995`.
+
+Known Issues
+------------
+
+ Backups of |MySQL| / |Percona Server| 5.6 versions prior to 5.6.11 cannot be prepared with |Percona XtraBackup| 2.1.4. Until the upstream bug :mysqlbug:`69780` is fixed and merged into |Percona XtraBackup|, |Percona XtraBackup| 2.1.3 should be used to prepare and restore such backups. This issue is reported as bug :bug:`1203669`.