Merge lp:~akopytov/percona-xtrabackup/bug1170806-2.1 into lp:percona-xtrabackup/2.1

[Alexey Kopytov]

    Bug #1170806: innobackupex continuing with FTWRL even when xtrabackup
                  failed

    The problem was that when the log copying thread failed, it did not
    terminate the xtrabackup process immediately. Instead only the log
    copying thread was terminated. The main xtrabackup thread would later
    check if the 'log_copying_succeed' flag is FALSE, and terminated the
    process, but that happened later, after xtrabackup was done with copying
    InnoDB files and signaled innobackupex to lock tables and proceed with
    copying non-InnoDB files.

    The fix is to terminate the entire xtrabackup process immediately on log
    copying failure. There is no reasons to delay checking its status
    and fail much later.

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

[George Ormond Lorch III (gl-az)]

See 2.0 review.

review: Approve (g2)

[Laurynas Biveinis (laurynas-biveinis)]

review: Approve

=== modified file 'src/xtrabackup.cc'
--- src/xtrabackup.cc	2013-04-24 12:46:07 +0000
+++ src/xtrabackup.cc	2013-04-24 14:21:53 +0000
@@ -142,7 +142,6 @@
 lsn_t log_copy_scanned_lsn;
 ibool log_copying = TRUE;
 ibool log_copying_running = FALSE;
-ibool log_copying_succeed = FALSE;
 
 ibool xtrabackup_logfile_is_renamed = FALSE;
 
@@ -2173,17 +2172,22 @@
 
 		counter++;
 		if(counter >= SLEEPING_PERIOD * 5) {
-			if(xtrabackup_copy_logfile(log_copy_scanned_lsn, FALSE))
-				goto end;
+
+			if(xtrabackup_copy_logfile(log_copy_scanned_lsn,
+						   FALSE)) {
+				exit(EXIT_FAILURE);
+			}
+
 			counter = 0;
 		}
 	}
 
 	/* last copying */
-	if(xtrabackup_copy_logfile(log_copy_scanned_lsn, TRUE))
-		goto end;
-
-	log_copying_succeed = TRUE;
+	if(xtrabackup_copy_logfile(log_copy_scanned_lsn, TRUE)) {
+
+		exit(EXIT_FAILURE);
+	}
+
 end:
 	log_copying_running = FALSE;
 	my_thread_end();
@@ -3176,11 +3180,6 @@
 	}
 	msg("\n");
 
-	if (!log_copying_succeed) {
-		msg("xtrabackup: Error: log_copying_thread failed.\n");
-		exit(EXIT_FAILURE);
-	}
-
 	/* Signal innobackupex that log copying has stopped and it may now
 	unlock tables, so we can possibly stream xtrabackup_logfile later
 	without holding the lock. */