Merge lp:~sergei.glushchenko/percona-xtrabackup/ST31156-2.0-xb-bug1175860 into lp:percona-xtrabackup/2.0

[Sergei Glushchenko]

Remove orphaned xtrabackup_pid at innobackupex init or bail out if it is impossible to do.
http://jenkins.percona.com/view/XtraBackup/job/percona-xtrabackup-2.0-param/434/
Many bug722638.sh failures can be seen which is known issue https://bugs.launchpad.net/bugs/1098501 and xb_stats_datadir.sh failes on innodb56 debug builds which is also known as https://bugs.launchpad.net/bugs/1175566.

[George Ormond Lorch III (gl-az)]

review: Approve (g2)

[Alexey Kopytov (akopytov)]

Looks good except that the patch uses

"$option_tmpdir/$xtrabackup_pid_file"

and

$option_tmpdir . "/" . $xtrabackup_pid_file

as if they are different things. They are not.

review: Approve

=== modified file 'innobackupex'
--- innobackupex	2013-04-28 18:34:11 +0000
+++ innobackupex	2013-05-03 21:02:34 +0000
@@ -1907,6 +1907,13 @@
         print STDERR "WARNING : A left over instance of suspend file '$suspend_file' was found.\n";
         unlink $suspend_file || Die "Failed to delete '$suspend_file': $!";
     }
+
+    if ( -e "$option_tmpdir/$xtrabackup_pid_file" ) {
+        print STDERR "WARNING : A left over instance of xtrabackup pid file ".
+                     "'$option_tmpdir/$xtrabackup_pid_file' was found.\n";
+        unlink $option_tmpdir . "/" . $xtrabackup_pid_file || 
+            Die "Failed to delete '$option_tmpdir/$xtrabackup_pid_file': $!";
+    }
 }
 
 

=== added file 'test/t/bug1175860.sh'
--- test/t/bug1175860.sh	1970-01-01 00:00:00 +0000
+++ test/t/bug1175860.sh	2013-05-03 21:02:34 +0000
@@ -0,0 +1,14 @@
+############################################################################
+# Bug #1175860: Orphaned xtrabackup_pid file Breaks Cluster SST
+############################################################################
+
+. inc/common.sh
+
+start_server
+
+echo "22993" > $MYSQLD_TMPDIR/xtrabackup_pid
+
+mkdir -p $topdir/backup
+innobackupex --stream=tar $topdir/backup > /dev/null
+
+grep -q "A left over instance of xtrabackup pid file" $OUTFILE