Merge lp:~sergei.glushchenko/percona-xtrabackup/bug691090-1.6 into lp:percona-xtrabackup/1.6

[Sergei Glushchenko]

Bug 691090
Files xtrabackup_checkpoints and xtrabackup_suspended should be kept in tmp
dir, since user running innobackupex may not have permissions to write mysql
datadir.

Modified xb_basic and xb_stream tests to make datadir readonly while
innobackupex is running.

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

[Alexey Kopytov (akopytov)]

OK to merge.

review: Approve

[Alexey Kopytov (akopytov)]

But in future please add the bug # and bug summary to revision comments.

=== modified file 'innobackupex'
--- innobackupex	2012-01-09 05:26:49 +0000
+++ innobackupex	2012-01-27 11:32:03 +0000
@@ -409,17 +409,17 @@
             and Die "Failed to scp file '$option_remote_host:$backup_dir/xtrabackup_logfile': $!";
         unlink $tmp_logfile || Die "Failed to delete '$tmp_logfile': $!";
 
-        system("scp $option_scp_opt '$orig_datadir/xtrabackup_checkpoints' '$option_remote_host:$backup_dir/xtrabackup_checkpoints'")
+        system("scp $option_scp_opt '$option_tmpdir/xtrabackup_checkpoints' '$option_remote_host:$backup_dir/xtrabackup_checkpoints'")
             and Die "Failed to scp file '$option_remote_host:$backup_dir/xtrabackup_checkpoints': $!";
-        unlink "$orig_datadir/xtrabackup_checkpoints" || Die "Failed to delete '$orig_datadir/xtrabackup_checkpoints': $!";
+        unlink "$option_tmpdir/xtrabackup_checkpoints" || Die "Failed to delete '$option_tmpdir/xtrabackup_checkpoints': $!";
     } elsif ($option_stream eq 'tar') {
         system("cd $option_tmpdir; tar chf - xtrabackup_logfile")
             and Die "Failed to stream 'xtrabackup_logfile': $!";
         unlink $tmp_logfile || Die "Failed to delete '$tmp_logfile': $!";
 
-        system("cd $orig_datadir; tar chf - xtrabackup_checkpoints")
+        system("cd $option_tmpdir; tar chf - xtrabackup_checkpoints")
             and Die "Failed to stream 'xtrabackup_checkpoints': $!";
-        unlink "$orig_datadir/xtrabackup_checkpoints" || Die "Failed to delete '$orig_datadir/xtrabackup_checkpoints': $!";
+        unlink "$option_tmpdir/xtrabackup_checkpoints" || Die "Failed to delete '$option_tmpdir/xtrabackup_checkpoints': $!";
     }
 
     print STDERR "\n$prefix Backup created in directory '$backup_dir'\n";
@@ -785,7 +785,7 @@
         $options = $options . " --target-dir=$backup_dir";
     } else {
         #(datadir) for 'xtrabackup_suspended' and 'xtrabackup_checkpoints'
-        $options = $options . " --log-stream --target-dir=./";
+        $options = $options . " --log-stream --target-dir=" . $option_tmpdir;
     }
 
     # prepare command line for running ibbackup
@@ -1519,7 +1519,7 @@
         $binlog_info = $backup_dir . '/xtrabackup_binlog_info';
         $slave_info = $backup_dir . '/xtrabackup_slave_info';
         } else {
-        $suspend_file = get_option(\%config, 'mysqld', 'datadir') . '/xtrabackup_suspended';
+        $suspend_file = $option_tmpdir . '/xtrabackup_suspended';
         $tmp_logfile = $option_tmpdir . '/xtrabackup_logfile';
         if ($option_stream) {
             $backup_config_file = $option_tmpdir . '/backup-my.cnf';

=== added file 'test/t/xb_perm_basic.sh'
--- test/t/xb_perm_basic.sh	1970-01-01 00:00:00 +0000
+++ test/t/xb_perm_basic.sh	2012-01-27 11:32:03 +0000
@@ -0,0 +1,10 @@
+# Test for fix of https://bugs.launchpad.net/percona-xtrabackup/+bug/691090
+. inc/common.sh
+
+init
+run_mysqld
+
+chmod -R 500 $mysql_datadir
+trap "vlog restoring permissions on datadir $mysql_datadir ; \
+chmod -R 700 $mysql_datadir" INT TERM EXIT
+innobackupex  --no-timestamp $topdir/backup

=== added file 'test/t/xb_perm_stream.sh'
--- test/t/xb_perm_stream.sh	1970-01-01 00:00:00 +0000
+++ test/t/xb_perm_stream.sh	2012-01-27 11:32:03 +0000
@@ -0,0 +1,12 @@
+# Test for fix of https://bugs.launchpad.net/percona-xtrabackup/+bug/691090
+. inc/common.sh
+
+init
+run_mysqld
+
+# Take backup
+chmod -R 500 $mysql_datadir
+trap "vlog restoring permissions on datadir $mysql_datadir ; \
+chmod -R 700 $mysql_datadir" INT TERM EXIT
+mkdir -p $topdir/backup
+innobackupex --stream=tar $topdir/backup > $topdir/backup/out.tar