Merge lp:~akopytov/percona-xtrabackup/bug1372679 into lp:percona-xtrabackup/2.2

[Alexey Kopytov]

    Bug #1372679: innobackupex --slave-info doesn't handle
    slave_parallel_workers>0

    Changed innobackupex to fail with an error when --slave-info is used on
    a multi-threaded non-GTID slave, because Exec_Master_Log_Pos cannot be
    trusted for a multi-threaded slave.

http://jenkins.percona.com/view/PXB%202.2/job/percona-xtrabackup-2.2-param/245/

[Alexey Kopytov (akopytov)]

review: Approve

=== modified file 'storage/innobase/xtrabackup/innobackupex.pl'
--- storage/innobase/xtrabackup/innobackupex.pl	2014-10-27 10:31:20 +0000
+++ storage/innobase/xtrabackup/innobackupex.pl	2014-10-27 14:49:12 +0000
@@ -77,6 +77,8 @@
 my $have_backup_locks = 0;
 my $have_galera_enabled = 0;
 my $have_flush_engine_logs = 0;
+my $have_multi_threaded_slave = 0;
+my $have_gtid_slave = 0;
 
 # command line options
 my $option_help = '';
@@ -1904,6 +1906,15 @@
 
     detect_mysql_capabilities_for_backup(\%mysql);
 
+
+    # Do not allow --slave-info with a multi-threded non-GTID slave,
+    # see https://bugs.launchpad.net/percona-xtrabackup/+bug/1372679
+    if ($option_slave_info and $have_multi_threaded_slave
+        and !$have_gtid_slave) {
+        die "The --slave-info option requires GTID enabled for a " .
+            "multi-threaded slave."
+    }
+
     #
     # if one of the history incrementals is being used, try to grab the
     # innodb_to_lsn from the history table and set the option_incremental_lsn
@@ -4927,20 +4938,26 @@
 # Query the server to find out what backup capabilities it supports.
 #
 sub detect_mysql_capabilities_for_backup {
+    my $con = shift;
+
     if ($option_incremental) {
         $have_changed_page_bitmaps =
-            mysql_query($_[0], "SELECT COUNT(*) FROM " .
+            mysql_query($con, "SELECT COUNT(*) FROM " .
                         "INFORMATION_SCHEMA.PLUGINS " .
                         "WHERE PLUGIN_NAME LIKE 'INNODB_CHANGED_PAGES'");
     }
 
-    if (!defined($_[0]->{vars})) {
-        get_mysql_vars($_[0]);
-    }
-
-    $have_backup_locks = defined($_[0]->{vars}->{have_backup_locks});
-
-    $have_galera_enabled = defined($_[0]->{vars}->{wsrep_on});
+    if (!defined($con->{vars})) {
+        get_mysql_vars($con);
+    }
+
+    if (!defined($con->{slave_status})) {
+        get_mysql_slave_status($con);
+    }
+
+    $have_backup_locks = defined($con->{vars}->{have_backup_locks});
+
+    $have_galera_enabled = defined($con->{vars}->{wsrep_on});
 
     if ($option_galera_info && !$have_galera_enabled) {
         my $now = current_time();
@@ -4952,7 +4969,7 @@
         $option_galera_info = 0;
     }
 
-    if ($mysql{vars}->{version}->{Value} =~ m/5\.[123]\.\d/) {
+    if ($con->{vars}->{version}->{Value} =~ m/5\.[123]\.\d/) {
         my $now = current_time();
 
         print STDERR "\n$now  $prefix Warning: FLUSH ENGINE LOGS " .
@@ -4964,6 +4981,19 @@
     } else {
         $have_flush_engine_logs = 1;
     }
+
+    if (defined($con->{vars}->{slave_parallel_workers}) and
+        ($con->{vars}->{slave_parallel_workers}->{Value} > 0)) {
+        $have_multi_threaded_slave = 1;
+    }
+
+    my $gtid_executed = $con->{slave_status}->{Executed_Gtid_Set};
+    my $gtid_slave_pos = $con->{vars}->{gtid_slave_pos};
+
+    if ((defined($gtid_executed) and $gtid_executed ne '') or
+        (defined($gtid_slave_pos) and $gtid_slave_pos ne '')) {
+        $have_gtid_slave = 1;
+    }
 }
 
 #
 
=== added file 'storage/innobase/xtrabackup/test/t/bug1372679.sh'
--- storage/innobase/xtrabackup/test/t/bug1372679.sh	1970-01-01 00:00:00 +0000
+++ storage/innobase/xtrabackup/test/t/bug1372679.sh	2014-10-27 14:49:12 +0000
@@ -0,0 +1,54 @@
+########################################################################
+# Bug #1372679: innobackupex --slave-info doesn't handle
+#               slave_parallel_workers>0
+########################################################################
+
+require_server_version_higher_than 5.6.0
+
+# Test that --slave-info with MTS enabled + GTID disabled fails
+
+MYSQLD_EXTRA_MY_CNF_OPTS="
+slave_parallel_workers=2
+"
+master_id=1
+slave_id=2
+
+start_server_with_id $master_id
+
+start_server_with_id $slave_id
+
+setup_slave $slave_id $master_id
+
+switch_server $slave_id
+
+innobackupex --no-timestamp --slave-info $topdir/backup 2>&1 |
+    grep 'The --slave-info option requires GTID enabled for a multi-threaded slave' ||
+    die "could not find the error message"
+
+if [[ ${PIPESTATUS[0]} == 0 ]]
+then
+    die "innobackupex did not fail as expected"
+fi
+
+stop_server_with_id $master_id
+stop_server_with_id $slave_id
+
+remove_var_dirs
+
+# Test that --slave-info with MTS enabled + GTID enabled works
+
+MYSQLD_EXTRA_MY_CNF_OPTS="
+gtid_mode=on
+log_slave_updates=on
+enforce_gtid_consistency=on
+slave_parallel_workers=2
+"
+
+start_server_with_id $master_id
+start_server_with_id $slave_id
+
+setup_slave $slave_id $master_id
+
+switch_server $slave_id
+
+innobackupex --no-timestamp --slave-info $topdir/backup