Merge lp:~sergei.glushchenko/percona-xtrabackup/bug983720 into lp:percona-xtrabackup/2.0

[Sergei Glushchenko]

Bug #983720: ib_lru_dump and --galera-info fail with --stream=xbstream
innobackupex called the tar utility unconditionally when streaming
ib_lru_dump and xtrabackup_galera_info. Which led to a broken stream
when the xbstream format is used.
Fix is to use $stream_cmd instead of calling the hard-coded "tar" utility.

Jenkins:
http://jenkins.percona.com/view/Percona%20Xtrabackup/job/percona-xtrabackup-param/177/

[Alexey Kopytov (akopytov)]

OK to merge. Thanks!

review: Approve

=== modified file 'innobackupex'
--- innobackupex	2012-03-27 01:08:22 +0000
+++ innobackupex	2012-04-20 17:23:20 +0000
@@ -440,7 +440,7 @@
                 and Die "Failed to scp file 'ib_lru_dump': $!";
         } elsif ($option_stream) {
             print STDERR "$prefix Backing up as tar stream 'ib_lru_dump'\n";
-            system("cd $orig_datadir; tar chf - ib_lru_dump")
+            system("cd $orig_datadir; $stream_cmd ib_lru_dump")
                 and Die "Failed to stream 'ib_lru_dump': $!";
         } elsif (!$option_rsync) {
             my $src_name = escape_path("$orig_datadir/ib_lru_dump");
@@ -1277,8 +1277,8 @@
 
     close(FILE);
 
-    if ($option_stream eq 'tar') {
-        system("cd $option_tmpdir; tar chf - xtrabackup_galera_info")
+    if ($option_stream) {
+        system("cd $option_tmpdir; $stream_cmd xtrabackup_galera_info")
             and Die "Failed to stream 'xtrabackup_galera_info': $!";
         unlink $galera_info || Die "Failed to delete '$galera_info': $!";
     }

=== added file 'test/t/bug983720_galerainfo.sh'
--- test/t/bug983720_galerainfo.sh	1970-01-01 00:00:00 +0000
+++ test/t/bug983720_galerainfo.sh	2012-04-20 17:23:20 +0000
@@ -0,0 +1,32 @@
+############################################################################
+# Bug983720: ib_lru_dump and --galera-info fail with --stream=xbstream
+############################################################################
+
+. inc/common.sh
+
+set +e
+${MYSQLD} --basedir=$MYSQL_BASEDIR --user=$USER --help --verbose --wsrep-sst-method=rsync| grep -q wsrep
+probe_result=$?
+if [[ "$probe_result" == "0" ]]
+    then
+        vlog "Server supports wsrep"
+    else
+        echo "Requires WSREP enabled" > $SKIPPED_REASON
+        exit $SKIPPED_EXIT_CODE
+fi
+set -e
+
+init
+run_mysqld --log-bin=`hostname`-bin --binlog-format=ROW --wsrep-provider=${MYSQL_BASEDIR}/libgalera_smm.so --wsrep_cluster_address=gcomm://
+
+# take a backup with stream mode
+mkdir -p $topdir/backup
+innobackupex --galera-info --stream=xbstream $topdir/backup > $topdir/backup/stream.xbs
+
+xbstream -xv -C $topdir/backup < $topdir/backup/stream.xbs
+if [ -f $topdir/backup/xtrabackup_galera_info ] ; then
+    vlog "galera info has been backed up"
+else
+    vlog "galera info has not been backed up"
+    exit -1
+fi

=== added file 'test/t/bug983720_lrudump.sh'
--- test/t/bug983720_lrudump.sh	1970-01-01 00:00:00 +0000
+++ test/t/bug983720_lrudump.sh	2012-04-20 17:23:20 +0000
@@ -0,0 +1,28 @@
+############################################################################
+# Bug983720: ib_lru_dump and --galera-info fail with --stream=xbstream
+############################################################################
+
+. inc/common.sh
+
+if [ -z "$XTRADB_VERSION" ]; then
+    echo "Requires XtraDB" > $SKIPPED_REASON
+    exit $SKIPPED_EXIT_CODE
+fi
+
+init
+run_mysqld
+
+# produce ib_lru_dump
+${MYSQL} ${MYSQL_ARGS} -e "select * from information_schema.XTRADB_ADMIN_COMMAND /*!XTRA_LRU_DUMP*/;"
+
+# take a backup with stream mode
+mkdir -p $topdir/backup
+innobackupex --stream=xbstream $topdir/backup > $topdir/backup/stream.xbs
+
+xbstream -xv -C $topdir/backup < $topdir/backup/stream.xbs
+if [ -f $topdir/backup/ib_lru_dump ] ; then
+    vlog "LRU dump has been backed up"
+else
+    vlog "LRU dump has not been backed up"
+    exit -1
+fi