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

[Alexey Kopytov]

Fixes for bug #514068 and sporadic failures in Jenkins.

[Alexey Kopytov (akopytov)]

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

[Stewart Smith (stewart)]

review: Approve

=== modified file 'innobackupex'
--- innobackupex	2011-12-02 08:37:09 +0000
+++ innobackupex	2011-12-08 10:32:24 +0000
@@ -12,7 +12,6 @@
 use Pod::Usage qw(pod2usage);
 use POSIX "strftime";
 use POSIX ":sys_wait_h";
-# use POSIX "tmpnam";
 use FileHandle;
 use File::Basename;
 use File::Temp;
@@ -235,10 +234,10 @@
 	else {
 		if( $option_ibbackup_binary eq "autodetect" ){
 			# Try to connect MySQL and get the version
-			print "option_ibbackup_binary is autodetect, trying to connect to MySQL\n";
+			print STDERR "option_ibbackup_binary is autodetect, trying to connect to MySQL\n";
 			my $options = get_mysql_options();
 			$mysql_pid = open(*MYSQL_WRITER, "| mysql $options >$mysql_stdout 2>$mysql_stderr ");
-			print "Connected to MySQL with pid $mysql_pid\n";
+			print STDERR "Connected to MySQL with pid $mysql_pid\n";
 			sleep 1;
 			if ($mysql_pid && $mysql_pid == waitpid($mysql_pid, &WNOHANG)) {
 				my $reason = `cat $mysql_stderr`;
@@ -248,7 +247,7 @@
 				}
 			else{
 				mysql_close();
-				print "Connected successfully\n";
+				print STDERR "Connected successfully\n";
 				$option_ibbackup_binary = set_xtrabackup_version();
 				}
 			}
@@ -1009,6 +1008,7 @@
 # Check that the server is responding to queries
 #
 sub mysql_ping {
+    my $alarm_handler = shift;
     my $mysql_pid_copy = $mysql_pid;
 
     # send a dummy query to mysql child process
@@ -1018,6 +1018,12 @@
     print MYSQL_WRITER "select '$hello_message';\n" 
         or Die "Connection to mysql child process failed: $!";
 
+    # Don't check server's response if running in a signal handler
+    # because that breaks system() calls
+    if ($alarm_handler)
+    {
+	return 0;
+    }
     # wait for reply
     eval {
         local $SIG{ALRM} = sub { die "alarm clock restart" };
@@ -1053,7 +1059,7 @@
 # SIGALRM handler which sends a keepalive query to the server
 #
 sub catch_sigalrm {
-  mysql_ping();
+  mysql_ping(1);
   # Reschedule SIGALRM
   alarm $mysql_keep_alive;
 }
@@ -1091,7 +1097,7 @@
     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();
+    mysql_ping(0);
 
     start_keepalives();
 }
@@ -1111,7 +1117,7 @@
 
     $current_mysql_request = $request;
     print MYSQL_WRITER "$request\n";
-    mysql_ping();
+    mysql_ping(0);
     $current_mysql_request = '';
 
     start_keepalives();
@@ -1714,10 +1720,6 @@
             } else {
                 $incremental_basedir = File::Spec->catfile($backup_root, $inc_dir);
             }
-
-            #print STDERR "--incremental_basedir=$incremental_basedir\n";
-            #print STDERR "incremental backup is not supported for now.\n";
-            #exit(1);
         }
     } else {
         # get backup directory
 
=== added file 'test/t/bug514068.sh'
--- test/t/bug514068.sh	1970-01-01 00:00:00 +0000
+++ test/t/bug514068.sh	2011-12-08 10:32:24 +0000
@@ -0,0 +1,30 @@
+##################################################################
+# Bug #514068: Output to STDOUT and STDERR is not conventional	 #
+# Bug #741021: xtrabackup --prepare prints a few lines to stdout #
+##################################################################
+
+. inc/common.sh
+
+init
+run_mysqld
+
+innobackupex  --no-timestamp $topdir/backup >$topdir/stdout 2>$topdir/stderr
+
+stop_mysqld
+# Remove datadir
+rm -r $mysql_datadir
+
+# Restore sakila
+vlog "Applying log"
+innobackupex --apply-log $topdir/backup >>$topdir/stdout 2>>$topdir/stderr
+
+vlog "Restoring MySQL datadir"
+mkdir -p $mysql_datadir
+innobackupex --copy-back $topdir/backup >>$topdir/stdout 2>>$topdir/stderr
+
+if [ "`wc -l $topdir/stdout`" -gt 0 ]
+then
+    vlog "Got the following output on stdout:"
+    cat $topdir/stdout
+    exit -1
+fi
 
=== modified file 'xtrabackup.c'
--- xtrabackup.c	2011-11-28 12:46:36 +0000
+++ xtrabackup.c	2011-12-08 10:32:24 +0000
@@ -6201,10 +6201,17 @@
 	if ((!xtrabackup_prepare) && (strcmp(mysql_data_home, "./") == 0)) {
 		if (!xtrabackup_print_param)
 			usage();
-		printf("\nxtrabackup: Error: Please set parameter 'datadir'\n");
+		fprintf(stderr, "\n"
+		       "xtrabackup: Error: Please set parameter 'datadir'\n");
 		exit(EXIT_FAILURE);
 	}
 
+	/* Redirect stdout to stderr for not doing a streaming backup or dumping
+	configuration for --print-param. */
+	if (!xtrabackup_stream && !xtrabackup_print_param && dup2(2, 1) < 0) {
+		fprintf(stderr, "Failed to redirect standard output.\n");
+	}
+
 	if (xtrabackup_tables) {
 		/* init regexp */
 		char *p, *next;