Merge lp:~gl-az/percona-xtrabackup/2.0-bug1007446 into lp:percona-xtrabackup/2.0

[George Ormond Lorch III]

Fixed https://bugs.launchpad.net/percona-xtrabackup/+bug/1007446
innobackupex should remove stale xtrabackup_suspended file on start

In innobackupex init, added test for existance of suspend file, then report and attempt to remove if the file exists.

Created new test case bug1007466.sh that creates a fake suspend file before launching innobackupex and tests for warning in output file.

[George Ormond Lorch III (gl-az)]

http://jenkins.percona.com/view/XtraBackup/job/percona-xtrabackup-2.0-param/316/

[Alexey Kopytov (akopytov)]

review: Approve

=== modified file 'innobackupex'
--- innobackupex	2012-11-29 23:32:59 +0000
+++ innobackupex	2012-12-27 16:03:21 +0000
@@ -1753,7 +1753,12 @@
     } elsif ($option_copy_back || $option_move_back) {
         #$backup_config_file = $backup_dir . '/backup-my.cnf';
         #read_config_file($backup_config_file, \%backup_config);
-    }         
+    }
+
+    if ( -e "$suspend_file" ) {
+        print STDERR "WARNING : A left over instance of suspend file '$suspend_file' was found.\n";
+        unlink $suspend_file || Die "Failed to delete '$suspend_file': $!";
+    }
 }
 
 

=== added file 'test/t/bug1007446.sh'
--- test/t/bug1007446.sh	1970-01-01 00:00:00 +0000
+++ test/t/bug1007446.sh	2012-12-27 16:03:21 +0000
@@ -0,0 +1,14 @@
+############################################################################
+# Bug #1007446: innobackupex should remove stale xtrabackup_suspended file
+############################################################################
+
+. inc/common.sh
+
+start_server
+
+echo "" > $MYSQLD_TMPDIR/xtrabackup_suspended
+
+mkdir -p $topdir/backup
+innobackupex --stream=tar $topdir/backup > /dev/null
+
+grep -q "A left over instance of suspend file" $OUTFILE