Merge lp:~lachlan-mulcahy/percona-xtrabackup/1.7-bug903984 into lp:percona-xtrabackup/2.0

[Lachlan Mulcahy]

Fixed bug 903984.
When applying incremental deltas to a backup dir:

If a new xtrabackup_slave_info exists in the incremental delta dir, we update the target dir with the new file
If there is no xtrabackup_slave_info file in the incremental delta dir, we simply remove the xtrabackup_slave_info file from the target dir, to prevent the slave position information being used incorrectly.

Fixed bug 903984.
When applying incremental deltas to a backup dir:

If a new xtrabackup_slave_info exists in the incremental delta dir, we update the target dir with the new file
If there is no xtrabackup_slave_info file in the incremental delta dir, we simply remove the xtrabackup_slave_info file from the target dir, to prevent the slave position information being used incorrectly.

[Alexey Kopytov (akopytov)]

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

=== modified file 'innobackupex'
--- innobackupex	2011-12-14 05:52:46 +0000
+++ innobackupex	2011-12-16 23:03:23 +0000
@@ -705,14 +705,40 @@
     # We should not create ib_logfile files if we prepare for following incremental applies
     # Also we do not prepare ib_logfile if we applied incremental changes
     if (!( ($option_redo_only) or ($option_incremental_dir))) { 
-    $now = current_time();
-    print STDERR "\n$now  $prefix Restarting xtrabackup with command: $cmdline\nfor creating ib_logfile*\n\n";
-    $rcode = system("$cmdline");
-    if ($rcode) {
-        # failure
-        Die "\n$prefix xtrabackup (2nd execution) failed";
-    }
-    }
+        $now = current_time();
+        print STDERR "\n$now  $prefix Restarting xtrabackup with command: $cmdline\nfor creating ib_logfile*\n\n";
+        $rcode = system("$cmdline");
+        if ($rcode) {
+            # failure
+            Die "\n$prefix xtrabackup (2nd execution) failed";
+        }
+    }
+
+    # If we were applying an incremental change set, we need to make sure the xtrabackup_slave_info is still correct
+    if ( $option_incremental_dir ) {
+
+        # If the latest backup has this file, then update the target dir with the new file
+        if ( -e "$option_incremental_dir/xtrabackup_slave_info" ) {
+            print STDERR "\n$now  $prefix Updating xtrabackup_slave_info with new slave position info...";
+            $cmdline = "cp $option_incremental_dir/xtrabackup_slave_info $backup_dir/xtrabackup_slave_info";
+            $rcode = system("$cmdline");
+            if ($rcode) {
+                # failure
+                Die "\n$prefix Failed to update xtrabackup_slave_info in $backup_dir";
+            }
+        # If the latest backup has no file, we need to remove the old xtrabackup_slave_info file, because it is out of date
+        } elsif ( -e "$backup_dir/xtrabackup_slave_info" ) {
+            print STDERR "\n$now  $prefix No updated xtrabackup_slave_info found in incremental dir, removing stale xtrabackup_slave_info file from target dir.";
+            $cmdline = "rm $backup_dir/xtrabackup_slave_info";
+            $rcode = system("$cmdline");
+            if ($rcode) {
+                # failure
+                Die "\n$prefix Failed to remove stale xtrabackup_slave_info in $backup_dir";
+            }
+
+        }
+    }
+
 }