Merge lp:~akopytov/percona-xtrabackup/bug408803-1.7 into lp:percona-xtrabackup/2.0

[Alexey Kopytov]

[Alexey Kopytov (akopytov)]

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

Lots of failures is a result slaves corruption as described in https://code.launchpad.net/~akopytov/percona-xtrabackup/bug884737-1.6/+merge/80963

[Stewart Smith (stewart)]

review: Approve

=== modified file 'doc/source/innobackupex/how_innobackupex_works.rst'
--- doc/source/innobackupex/how_innobackupex_works.rst	2011-10-21 17:47:31 +0000
+++ doc/source/innobackupex/how_innobackupex_works.rst	2011-11-14 07:14:52 +0000
@@ -59,7 +59,7 @@
 
 Finally, the binary log position will be printed to ``STDERR`` and |innobackupex| will exit returning 0 if all went OK.
 
-Note that the ``STDERR`` of |innobackupex| is not written in any file. You will have to redirect it to a file, e.g., ``innobackupex OPTIONS > backupout.log``.
+Note that the ``STDERR`` of |innobackupex| is not written in any file. You will have to redirect it to a file, e.g., ``innobackupex OPTIONS 2> backupout.log``.
 
 .. _copy-back-ibk:
 
 
=== modified file 'doc/source/innobackupex/privileges.rst'
--- doc/source/innobackupex/privileges.rst	2011-07-28 05:29:04 +0000
+++ doc/source/innobackupex/privileges.rst	2011-11-14 07:14:52 +0000
@@ -8,7 +8,7 @@
 
 Permissions are those which permits a user to perform operations on the system, like reading, writing or executing on a certain directory or start/stop a system service. **They are set at a system level and only apply to system users**.
 
-Whether |xtrabackup| or |innobackupex| is used, there are two actors involved: the user invoking the program - *a system user* - and the user performing action in the database server - *a database server*. Note that these are different users on different places, despite they may have the same username.
+Whether |xtrabackup| or |innobackupex| is used, there are two actors involved: the user invoking the program - *a system user* - and the user performing action in the database server - *a database user*. Note that these are different users on different places, despite they may have the same username.
 
 All the invocations of |innobackupex| and |xtrabackup| in this documentation assumes that the system user has the appropriate permissions and you are providing the relevant options for connecting the database server - besides the options for the action to be performed - and the database user has adequate privileges. 
 
 
=== modified file 'innobackupex'
--- innobackupex	2011-10-21 17:47:31 +0000
+++ innobackupex	2011-11-14 07:14:52 +0000
@@ -54,7 +54,7 @@
 
 # time in seconds after which a dummy query is sent to mysql server
 # in order to keep the database connection alive
-my $mysql_keep_alive_timeout = 1800;
+my $mysql_keep_alive = 5;
 
 ######################################################################
 # end of modifiable parameters
@@ -169,9 +169,6 @@
 # run on a slave server
 my $mysql_slave_position = '';
 
-# time of the most recent mysql_check call. (value returned by time() function)
-my $mysql_last_access_time = 0;
-
 # process id of ibbackup program (runs as a child process of this script)
 my $ibbackup_pid = '';
 
@@ -366,7 +363,6 @@
     # check that we can connect to the database. This done by
     # connecting, issuing a query, and closing the connection.
     mysql_open();
-    mysql_check();
     mysql_close();
 
     # start ibbackup as a child process
@@ -379,19 +375,15 @@
 
     # connect to database
     mysql_open();
-    mysql_check();
 
     if ($option_safe_slave_backup) {
-      mysql_check();
       wait_for_safe_slave();
     }
 
     # flush tables with read lock
-    mysql_check();
     mysql_lockall() if !$option_no_lock;
 
     if ($option_slave_info) {
-        mysql_check();
         write_slave_info();
     }
 
@@ -406,7 +398,6 @@
     mysql_unlockall() if !$option_no_lock;
 
     if ( $option_safe_slave_backup && $host_is_slave ) {
-      mysql_check();
       print STDERR "$prefix: Starting slave SQL thread\n";
       mysql_send('START SLAVE SQL_THREAD;');
     }
@@ -991,35 +982,15 @@
 
 
 #
-# mysql_open subroutine starts mysql as a child process with
-# a pipe connection.
-#
-sub mysql_open {
-    my $options = get_mysql_options();
-    # run mysql as a child process with a pipe connection
-    $now = current_time();
-    (my $prt_options = $options) =~ s/--password=[^ ]+ /--password=xxxxxxxx /g;
-    print STDERR "$now  $prefix Starting mysql with options: $prt_options\n";
-    $mysql_pid = open(*MYSQL_WRITER, "| mysql $options >$mysql_stdout 2>$mysql_stderr ") or Die "Failed to spawn mysql child process: $!";
-    MYSQL_WRITER->autoflush(1);
-    $now = current_time();
-    print STDERR "$now  $prefix Connected to database with mysql child process (pid=$mysql_pid)\n";
-    print MYSQL_WRITER "SET SESSION wait_timeout = 2147000;\n" or die "Connection to mysql child process failed: $!";
-
-    mysql_check();
-}
-
-
-#
-# mysql_check subroutine checks that the connection to mysql child process 
-# is ok.
-#
-sub mysql_check {
+# Check that the server is responding to queries
+#
+sub mysql_ping {
     my $mysql_pid_copy = $mysql_pid;
 
     # send a dummy query to mysql child process
     $hello_id++;
-    my $hello_message = "innobackup hello $hello_id";
+
+    my $hello_message = "xtrabackup ping $hello_id";
     print MYSQL_WRITER "select '$hello_message';\n" 
         or Die "Connection to mysql child process failed: $!";
 
@@ -1051,21 +1022,54 @@
             . " You may adjust time limit by editing the value of parameter"
             . " \"\$mysql_response_timeout\" in this script.)";
     } elsif ($@) { Die $@; }
-    
-    $mysql_last_access_time = time();
-}
-
-
-#
-# mysql_keep_alive subroutine tries to keep connection to the mysqld database
-# server alive by sending a dummy query when the connection has been idle
-# for the specified time.
-#
-sub mysql_keep_alive {
-    if ((time() - $mysql_last_access_time) > $mysql_keep_alive_timeout) {
-        # too long idle, send a dummy query
-        mysql_check();
-    }
+}
+
+
+#
+# SIGALRM handler which sends a keepalive query to the server
+#
+sub catch_sigalrm {
+  mysql_ping();
+  # Reschedule SIGALRM
+  alarm $mysql_keep_alive;
+}
+
+
+#
+# Schedule periodic server pings
+#
+sub start_keepalives {
+  $SIG{ALRM} = \&catch_sigalrm;
+  alarm $mysql_keep_alive;
+}
+
+#
+# Cancel periodic server pings
+#
+sub stop_keepalives {
+  alarm 0;
+  $SIG{ALRM} = "DEFAULT";
+}
+
+#
+# mysql_open subroutine starts mysql as a child process with
+# a pipe connection.
+#
+sub mysql_open {
+    my $options = get_mysql_options();
+    # run mysql as a child process with a pipe connection
+    $now = current_time();
+    (my $prt_options = $options) =~ s/--password=[^ ]+ /--password=xxxxxxxx /g;
+    print STDERR "$now  $prefix Starting mysql with options: $prt_options\n";
+    $mysql_pid = open(*MYSQL_WRITER, "| mysql $options >$mysql_stdout 2>$mysql_stderr ") or Die "Failed to spawn mysql child process: $!";
+    MYSQL_WRITER->autoflush(1);
+    $now = current_time();
+    print STDERR "$now  $prefix Connected to database with mysql child process (pid=$mysql_pid)\n";
+    print MYSQL_WRITER "SET SESSION wait_timeout = 2147000;\n" or die "Connection to mysql child process failed: $!";
+
+    mysql_ping();
+
+    start_keepalives();
 }
 
 
@@ -1079,10 +1083,14 @@
 sub mysql_send {
     my $request = shift;
 
+    stop_keepalives();
+
     $current_mysql_request = $request;
     print MYSQL_WRITER "$request\n";
-    mysql_check();
+    mysql_ping();
     $current_mysql_request = '';
+
+    start_keepalives();
 }
     
 
@@ -1090,6 +1098,8 @@
 # mysql_close subroutine terminates mysql child process gracefully.
 # 
 sub mysql_close {
+    stop_keepalives();
+
     print MYSQL_WRITER "quit\n";
     $now = current_time();
     print STDERR "$now  $prefix Connection to database server closed\n";
@@ -1852,9 +1862,6 @@
                 "'$source_dir/$database/$wildcard' ($file_c files)\n";
         }
         foreach $file (@list) {
-            # copying may take a long time, so we have to prevent
-            # mysql connection from timing out
-            mysql_keep_alive();
             next unless check_if_required($database, $file);
 
 	    if($option_include) {
 
=== added file 'test/t/bug884737.sh'
--- test/t/bug884737.sh	1970-01-01 00:00:00 +0000
+++ test/t/bug884737.sh	2011-11-14 07:14:52 +0000
@@ -0,0 +1,14 @@
+########################################################################
+# Bug #884737: xtrabackup's --parallel option asserts / crashes with a
+#              value of -1
+########################################################################
+
+. inc/common.sh
+
+init
+run_mysqld 
+
+# Check that --parallel=<negative value> doesn't blow up
+vlog "Creating the backup directory: $topdir/backup"
+mkdir -p $topdir/backup
+innobackupex $topdir/backup --parallel=-1  
 
=== modified file 'xtrabackup.c'
--- xtrabackup.c	2011-10-05 02:31:10 +0000
+++ xtrabackup.c	2011-11-14 07:14:52 +0000
@@ -708,7 +708,7 @@
 
 ibool xtrabackup_logfile_is_renamed = FALSE;
 
-uint parallel;
+int parallel;
 
 /* === metadata of backup === */
 #define XTRABACKUP_METADATA_FILENAME "xtrabackup_checkpoints"
@@ -1043,8 +1043,8 @@
   {"parallel", OPT_XTRA_PARALLEL,
    "Number of threads to use for parallel datafiles transfer. Does not have "
    "any effect in the stream mode. The default value is 1.",
-   (G_PTR*) &parallel, (G_PTR*) &parallel, 0, GET_UINT, REQUIRED_ARG,
-   1, 1, UINT_MAX, 0, 0, 0},
+   (G_PTR*) &parallel, (G_PTR*) &parallel, 0, GET_INT, REQUIRED_ARG,
+   1, 1, INT_MAX, 0, 0, 0},
 
   {"innodb_adaptive_hash_index", OPT_INNODB_ADAPTIVE_HASH_INDEX,
    "Enable InnoDB adaptive hash index (enabled by default).  "
@@ -4107,7 +4107,7 @@
 		count = parallel;
 		count_mutex = OS_MUTEX_CREATE();
 
-		for (i = 0; i < parallel; i++) {
+		for (i = 0; i < (uint) parallel; i++) {
 			data_threads[i].it = it;
 			data_threads[i].num = i+1;
 			data_threads[i].count = &count;