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

[Alexey Kopytov]

    Bug #1294782: Innobackupex hangs on fatal error in some cases

    The problem was that the code in both innobackupex and xtrabackup, that
    was supposed to make sure no child processes are left running in case
    innobackupex got killed or failed with an error, relied on the fact the
    SIGTERM and SIGINT signals were not blocked by the xtrabackup process
    (or any other child processes spawned by innobackupex).

    When innobackupex terminates gracefully, it calls kill_child_processes()
    to send SIGTERM to its children.

    There’s also (Linux-specific) auto-termination logic in xtrabackup for
    cases when innobackupex is killed or terminates ungracefully. It worked
    as follows: the xtrabackup process called prctl(PR_SET_PDEATHSIG,
    SIGINT) on start, so that SIGINT is sent automatically in case the parent
    process (innobackupex) dies.

    However, both SIGTERM and SIGINT might be blocked by the
    process that had invoked innobackupex, for example, by the PXC server
    processes doing an SST, in which case they were also blocked by the
    xtrabackup process, since the signal mask is inherited by child
    processes.

    Fixed by replacing SIGTERM in innobackupex and SIGINT in xtrabackup
    auto-termination with SIGKILL.

    Also removed some ancient code around FTWRL. It has been unnecessary for
    a long time, which has been reported in duplicate bug #1311120.

    No test case, as it is impossible in Bash to create a signal mask that
    would be inherited by child processes. Signal masks created by ‘trap’
    are only inherited by built-in commands according to the manual.

http://jenkins.percona.com/view/PXB 2.1/job/percona-xtrabackup-2.1-param/565/

[Alexey Kopytov (akopytov)]

review: Approve

=== modified file 'innobackupex.pl'
--- innobackupex.pl	2014-03-01 13:29:34 +0000
+++ innobackupex.pl	2014-04-30 09:33:56 +0000
@@ -242,7 +242,7 @@
                             's' => ' ');
 
 # signal that is sent to child processes when they are killed
-my $kill_signal = 15;
+my $kill_signal = 9;
 
 # current local time
 my $now;
@@ -3376,16 +3376,9 @@
             usleep(1);
         }
     }
-    if (compare_versions($mysql_server_version, '4.0.22') == 0
-        || compare_versions($mysql_server_version, '4.1.7') == 0) {
-        # MySQL server version is 4.0.22 or 4.1.7
-        mysql_query($con, "COMMIT");
-        mysql_query($con, "FLUSH TABLES WITH READ LOCK");
-    } else {
-        # MySQL server version is other than 4.0.22 or 4.1.7
-        mysql_query($con, "FLUSH TABLES WITH READ LOCK");
-        mysql_query($con, "COMMIT");
-    }
+
+    mysql_query($con, "FLUSH TABLES WITH READ LOCK");
+
     # stop query killer process
     if ($option_kill_long_queries_timeout) {
         stop_query_killer();
 
=== modified file 'src/xtrabackup.cc'
--- src/xtrabackup.cc	2014-04-27 11:31:56 +0000
+++ src/xtrabackup.cc	2014-04-30 09:33:56 +0000
@@ -5836,7 +5836,7 @@
 	/* Ensure xtrabackup process is killed when the parent one
 	(innobackupex) is terminated with an unhandled signal */
 
-	if (prctl(PR_SET_PDEATHSIG, SIGINT)) {
+	if (prctl(PR_SET_PDEATHSIG, SIGKILL)) {
 		msg("prctl() failed with errno = %d\n", errno);
 		exit(EXIT_FAILURE);
 	}