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

[Hrvoje Matijakovic]

[Alexey Kopytov (akopytov)]

review: Approve

=== modified file 'doc/source/howtos/recipes_ibkx_stream.rst'
--- doc/source/howtos/recipes_ibkx_stream.rst	2012-04-21 07:12:28 +0000
+++ doc/source/howtos/recipes_ibkx_stream.rst	2013-03-19 15:34:19 +0000
@@ -12,37 +12,51 @@
 
   * Stream the backup into a tar archived named 'backup.tar' :: 
 
-      innobackupex --stream=tar ./ > backup.tar
+      $ innobackupex --stream=tar ./ > backup.tar
 
   * The same, but compress it ::
 
-      innobackupex --stream=tar ./ | gzip - > backup.tar.gz
+      $ innobackupex --stream=tar ./ | gzip - > backup.tar.gz
 
   * Encrypt the backup ::
 
-      innobackupex --stream=tar . | gzip - | openssl des3 -salt -k "password" > backup.tar.gz.des3
+      $ innobackupex --stream=tar . | gzip - | openssl des3 -salt -k "password" > backup.tar.gz.des3
 
   * Send it to another server instead of storing it locally ::
 
-      innobackupex --stream=tar ./ | ssh user@desthost "cat - > /data/backups/backup.tar"
+      $ innobackupex --stream=tar ./ | ssh user@desthost "cat - > /data/backups/backup.tar"
 
   * The same thing with can be done with the ''netcat''.  ::
 
       ## On the destination host:
-      nc -l 9999 | cat - > /data/backups/backup.tar
+      $ nc -l 9999 | cat - > /data/backups/backup.tar
       ## On the source host:
-      innobackupex --stream=tar ./ | nc desthost 9999
+      $ innobackupex --stream=tar ./ | nc desthost 9999
 
   * The same thing, but done as a one-liner: ::
 
-      ssh user@desthost "( nc -l 9999 > /data/backups/backup.tar & )" \
+      $ ssh user@desthost "( nc -l 9999 > /data/backups/backup.tar & )" \
       && innobackupex --stream=tar ./  |  nc desthost 9999
 
   * Throttling the throughput to 10MB/sec. This requires the 'pv' tools; you can find them at the `official site <http://www.ivarch.com/programs/quickref/pv.shtml>`_ or install it from the distribution package ("apt-get install pv") :: 
 
-      innobackupex --stream=tar ./ | pv -q -L10m \
+      $ innobackupex --stream=tar ./ | pv -q -L10m \
       | ssh user@desthost "cat - > /data/backups/backup.tar"
 
+  * Checksumming the backup during the streaming ::
+ 
+      ## On the destination host:
+      $ nc -l 9999 | tee >(sha1sum > destination_checksum) > /data/backups/backup.tar
+      ## On the source host:
+      $ innobackupex --stream=tar ./ | tee >(sha1sum > source_checksum) | nc desthost 9999
+      ## compare the checksums
+      ## On the source host:
+      $ cat source_checksum 
+      65e4f916a49c1f216e0887ce54cf59bf3934dbad  -
+      ## On the destination host:
+      $ destination_checksum 
+      65e4f916a49c1f216e0887ce54cf59bf3934dbad  -
+ 
 Examples using |xbstream| option for streaming:
 
   * Stream the backup into a tar archived named 'backup.xbstream :: 

=== modified file 'doc/source/innobackupex/importing_exporting_tables_ibk.rst'
--- doc/source/innobackupex/importing_exporting_tables_ibk.rst	2011-07-28 05:29:04 +0000
+++ doc/source/innobackupex/importing_exporting_tables_ibk.rst	2013-03-19 15:34:19 +0000
@@ -27,6 +27,10 @@
 
 Each :term:`.exp` file will be used for importing that table.
 
+.. note::
+
+  InnoDB does a slow shutdown (i.e. full purge + change buffer merge) on --export, otherwise the tablespaces wouldn't be consistent and thus couldn't be imported. All the usual performance considerations apply: sufficient buffer pool (i.e. --use-memory, 100MB by default) and fast enough storage, otherwise it can take a prohibitive amount of time for export to complete.
+
 Importing tables
 ================
 

=== modified file 'doc/source/innobackupex/parallel_copy_ibk.rst'
--- doc/source/innobackupex/parallel_copy_ibk.rst	2012-06-04 10:29:26 +0000
+++ doc/source/innobackupex/parallel_copy_ibk.rst	2013-03-19 15:34:19 +0000
@@ -4,7 +4,7 @@
  Accelerating with :option:`--parallel` copy and `--compress-threads`
 =====================================================================
 
-When performing a local backup, multiple files can be copied concurrently by using the :option:`--parallel` option. This option specifies the number of threads created by |xtrabackup| to copy data files.
+When performing a local backup or the streaming backup with |xbstream| option, multiple files can be copied concurrently by using the :option:`--parallel` option. This option specifies the number of threads created by |xtrabackup| to copy data files.
 
 To take advantage of this option whether the multiple tablespaces option must be enabled (:term:`innodb_file_per_table`) or the shared tablespace must be stored in multiple :term:`ibdata` files with the :term:`innodb_data_file_path` option.  Having multiple files for the database (or splitting one into many) doesn't have a measurable impact on performance.
 

=== modified file 'doc/source/innobackupex/partial_backups_innobackupex.rst'
--- doc/source/innobackupex/partial_backups_innobackupex.rst	2012-09-19 11:35:43 +0000
+++ doc/source/innobackupex/partial_backups_innobackupex.rst	2013-03-19 15:34:19 +0000
@@ -86,7 +86,9 @@
 
 Restoring should be done by :doc:`importing the tables <importing_exporting_tables_ibk>` in the partial backup to the server. 
 
-Although it can be done by copying back the prepared backup to a "clean" :term:`datadir` (in that case, make sure of having included the ``mysql`` database)...
-
-
+It can also be done by copying back the prepared backup to a "clean" :term:`datadir` (in that case, make sure of having included the ``mysql`` database). System database can be created with: ::
+
+ $ sudo mysql_install_db --user=mysql
+
+Last method can be later used for creating a dump of the specific table that needs to be restored.
 

=== modified file 'doc/source/percona-theme/layout.html'
--- doc/source/percona-theme/layout.html	2013-03-13 09:07:49 +0000
+++ doc/source/percona-theme/layout.html	2013-03-19 15:34:19 +0000
@@ -90,7 +90,7 @@
 			            {%- block serverseries %}
 		<div class="side-column-block">
 			<h3>Percona XtraBackup Series</h3>
-			     <ul><li><a href="http://www.percona.com/doc/percona-xtrabackup/1.6/">Percona XtraBackup 1.6</a></li><li><a href="http://www.percona.com/doc/percona-xtrabackup/2.0/">Percona XtraBackup 2.0</a></li></ul>
+			     <ul><li><a href="http://www.percona.com/doc/percona-xtrabackup/1.6/">Percona XtraBackup 1.6</a></li><li><a href="http://www.percona.com/doc/percona-xtrabackup/2.0/">Percona XtraBackup 2.0</a></li><li><a href="http://www.percona.com/doc/percona-xtrabackup/2.1/">Percona XtraBackup 2.1</a></li></ul>
 			</div>
 			            {%- endblock %}
             {%- block sidebartoc %}

=== modified file 'doc/source/xtrabackup_bin/creating_a_backup.rst'
--- doc/source/xtrabackup_bin/creating_a_backup.rst	2012-02-13 12:07:03 +0000
+++ doc/source/xtrabackup_bin/creating_a_backup.rst	2013-03-19 15:34:19 +0000
@@ -14,9 +14,9 @@
 
 An example command to perform a backup follows:
 
-.. code-block:: guess
+.. code-block:: bash
 
-  xtrabackup --backup --datadir=/var/lib/mysql/ --target-dir=/data/backups/mysql/
+  $ xtrabackup --backup --datadir=/var/lib/mysql/ --target-dir=/data/backups/mysql/
 
 This takes a backup of :file:`/var/lib/mysql` and stores it at :file:`/data/backups/mysql/`. If you specify a relative path, the target directory will be relative to the current directory.
 
@@ -39,6 +39,10 @@
 
   xtrabackup: Transaction log of lsn (<SLN>) to (<LSN>) was copied.
 
+.. note:: 
+
+  Log copying thread checks the transactional log every second to see if there were any new log records written that need to be copied, but there is a chance that the log copying thread might not be able to keep up with the amount of writes that go to the transactional logs, and will hit an error when the log records are overwritten before they could be read.
+
 After the backup is finished, the target directory will contain files such as the following, assuming you have a single InnoDB table :file:`test.tbl1` and you are using MySQL's :term:`innodb_file_per_table` option: ::
 
   /data/backups/mysql/ibdata1