Merge lp:~sergei.glushchenko/percona-xtrabackup/ST-29497-bug1123335-21 into lp:percona-xtrabackup/2.1

[Sergei Glushchenko]

Bug 1123335
innobackupex fails when --no-lock and --rsync are used in conjunction.
With rsync copy mode copying being done in two stages. During the first
stage files copied without holding a lock. During the second stage we
run rsync once again with tables locked. By doing this we minimize
the time when tables locked (as second rsync pass is shorter then
doing full copy). If If --no-lock is specified, there is no need to
perform two passes and we don't.
The bug is that we only perform second pass (backup_files(0)), and
doesn't tale into account that we don't performed the first one.
Solution is to take into account that with --no-lock option specified
first pass hadn't been performed.
Also adds testcase for --rsync --no-lock combination.

[Sergei Glushchenko (sergei.glushchenko)]

http://jenkins.percona.com/view/XtraBackup/job/percona-xtrabackup-2.1-param/159/

[Laurynas Biveinis (laurynas-biveinis)]

review: Approve

=== modified file 'innobackupex'
--- innobackupex	2013-01-22 01:23:45 +0000
+++ innobackupex	2013-02-13 12:56:34 +0000
@@ -2108,7 +2108,7 @@
 	# Remove from $backup_dir files that have been removed between first and
 	# second passes. Cannot use "rsync --delete" because it does not work
 	# with --files-from.
-	if (!$prep_mode) {
+	if (!$prep_mode && !$option_no_lock) {
 	    open(RSYNC, "<$rsync_tmpfile_pass1")
 		|| Die "Can't open $rsync_tmpfile_pass1 for reading: $!\n";
 

=== added file 'test/t/ib_rsync_nolock.sh'
--- test/t/ib_rsync_nolock.sh	1970-01-01 00:00:00 +0000
+++ test/t/ib_rsync_nolock.sh	2013-02-13 12:56:34 +0000
@@ -0,0 +1,25 @@
+. inc/common.sh
+
+if ! which rsync > /dev/null 2>&1
+then
+    echo "Requires rsync to be installed" > $SKIPPED_REASON
+    exit $SKIPPED_EXIT_CODE
+fi
+
+start_server --innodb_file_per_table
+load_sakila
+
+innobackupex --rsync --no-lock --no-timestamp $topdir/backup
+
+stop_server
+
+run_cmd rm -r $mysql_datadir
+
+innobackupex --apply-log $topdir/backup
+
+run_cmd mkdir -p $mysql_datadir
+
+innobackupex --copy-back $topdir/backup
+
+start_server
+run_cmd ${MYSQL} ${MYSQL_ARGS} -e "SELECT COUNT(*) FROM actor" sakila