Merge lp:~sergei.glushchenko/percona-xtrabackup/2.3-xb-bug1391041 into lp:percona-xtrabackup/2.3

[Sergei Glushchenko]

Automerge
http://jenkins.percona.com/view/PXB%202.2/job/percona-xtrabackup-2.3-param/4/

[Alexey Kopytov (akopytov)]

Sergei,

What about xtrabackup_binlog_info? As in, why does it still contain both GTID and non-GTID coordinates regardless of gtid_mode?

review: Needs Information

[Sergei Glushchenko (sergei.glushchenko)]

http://jenkins.percona.com/view/PXB%202.2/job/percona-xtrabackup-2.3-param/7/
Repushed to 2.3 branch.

[Alexey Kopytov (akopytov)]

review: Approve

=== modified file 'storage/innobase/xtrabackup/doc/source/howtos/recipes_ibkx_gtid.rst'
--- storage/innobase/xtrabackup/doc/source/howtos/recipes_ibkx_gtid.rst	2013-05-13 13:29:59 +0000
+++ storage/innobase/xtrabackup/doc/source/howtos/recipes_ibkx_gtid.rst	2014-12-02 15:13:27 +0000
@@ -17,11 +17,11 @@
 In the destination folder there will be a file with the name :file:`xtrabackup_binlog_info`. This file will contain both, binary log coordinates and ``GTID`` information. :: 
 
  $ cat xtrabackup_binlog_info
- mysql-bin.000002    1232        c777888a-b6df-11e2-a604-080027635ef5:1-4
+ c777888a-b6df-11e2-a604-080027635ef5:1-4
 
 That information is also printed by innobackupex after backup is taken: ::
 
- innobackupex: MySQL binlog position: filename 'mysql-bin.000002', position 1232, gtid_executed c777888a-b6df-11e2-a604-080027635ef5:1-4
+ innobackupex: MySQL binlog position: GTID of the last change 'c777888a-b6df-11e2-a604-080027635ef5:1-4'
 
 STEP 2: Prepare the backup
 --------------------------

=== modified file 'storage/innobase/xtrabackup/innobackupex.pl'
--- storage/innobase/xtrabackup/innobackupex.pl	2014-11-21 09:07:50 +0000
+++ storage/innobase/xtrabackup/innobackupex.pl	2014-12-02 15:13:27 +0000
@@ -3085,13 +3085,21 @@
     # from the SHOW MASTER STATUS output
     my $filename = $con->{master_status}->{File};
     my $position = $con->{master_status}->{Position};
+    my $mysql_gtid = defined($con->{vars}->{gtid_mode}) &&
+                     $con->{vars}->{gtid_mode}->{Value} eq 'ON';
+    my $mariadb_gtid = defined($con->{vars}->{gtid_current_pos});
+    my @binlog_coordinates;
+    my @binlog_info_content;
 
     # Do not create xtrabackup_binlog_info if binary log is disabled
     if (!defined($filename) or !defined($position)) {
         return;
     }
 
-    $mysql_binlog_position = "filename '$filename', position $position";
+    if ($mariadb_gtid || !$mysql_gtid) {
+        @binlog_coordinates = ("filename '$filename'", "position $position");
+        @binlog_info_content = ($filename, $position);
+    }
 
     $gtid = $con->{master_status}->{Executed_Gtid_Set};
     if (!defined($gtid)) {
@@ -3100,14 +3108,16 @@
         $gtid = $con->{vars}->{gtid_current_pos}->{Value};
     }
 
-    if (defined($gtid)) {
-        $mysql_binlog_position .= ", GTID of the last change '$gtid'";
-    } else {
-        $gtid = '';
+    if ($mariadb_gtid || $mysql_gtid) {
+        push(@binlog_coordinates, "GTID of the last change '$gtid'");
+        push(@binlog_info_content, $gtid);
     }
 
+    $mysql_binlog_position = join(", ", @binlog_coordinates);
+
     # write binlog info file
-    write_to_backup_file("$binlog_info", "$filename\t$position\t\t$gtid\n");
+    write_to_backup_file($binlog_info,
+                         join("\t", @binlog_info_content) . "\n");
 }
 
 #

=== added file 'storage/innobase/xtrabackup/test/t/bug1391041.sh'
--- storage/innobase/xtrabackup/test/t/bug1391041.sh	1970-01-01 00:00:00 +0000
+++ storage/innobase/xtrabackup/test/t/bug1391041.sh	2014-12-02 15:13:27 +0000
@@ -0,0 +1,73 @@
+########################################################################
+# Bug 1391041: innobackupex should skip GTID output is GTID_MODE is OFF
+########################################################################
+
+. inc/common.sh
+
+require_server_version_higher_than 5.6.0
+
+MYSQLD_EXTRA_MY_CNF_OPTS="
+gtid_mode=on
+log_slave_updates=on
+enforce_gtid_consistency=on
+"
+start_server
+
+$MYSQL $MYSQL_ARGS test <<EOF
+CREATE TABLE t(id INT NOT NULL AUTO_INCREMENT PRIMARY KEY, c INT);
+INSERT INTO t(c) VALUES (1),(2),(3),(4),(5),(6),(7),(8);
+SET AUTOCOMMIT=0;
+INSERT INTO t(c) SELECT c FROM t;
+INSERT INTO t(c) SELECT c FROM t;
+INSERT INTO t(c) SELECT c FROM t;
+INSERT INTO t(c) SELECT c FROM t;
+INSERT INTO t(c) SELECT c FROM t;
+INSERT INTO t(c) SELECT c FROM t;
+INSERT INTO t(c) SELECT c FROM t;
+COMMIT;
+EOF
+
+innobackupex --no-timestamp $topdir/backup
+
+binlog_info=$topdir/backup/xtrabackup_binlog_info
+
+if egrep -q "filename.*position" $OUTFILE ; then
+	die "Found filename/position with GTID_MODE=ON"
+fi
+
+if ! egrep -q "GTID of the last change" $OUTFILE ; then
+	die "GTID of the last change not found with GTID_MODE=ON"
+fi
+
+if egrep -q "^mysql-bin.[0-9]+[[:space:]]+[0-9]+$" $binlog_info ; then
+	die "Found filename/position with GTID_MODE=ON"
+fi
+
+if ! egrep -q "^[a-f0-9:-]+$" $binlog_info ; then
+	die "GTID not found in xtrabackup_binlog_info with GTID_MODE=ON"
+fi
+
+echo -n >$OUTFILE
+rm -rf $topdir/backup
+MYSQLD_EXTRA_MY_CNF_OPTS=
+
+stop_server
+start_server
+
+innobackupex --no-timestamp $topdir/backup
+
+if egrep -q "GTID of the last change" $OUTFILE ; then
+	die "Found GTID of the last change with GTID_MODE=OFF"
+fi
+
+if ! grep -q "filename.*position" $OUTFILE ; then
+	die "filename/position not found with GTID_MODE=OFF"
+fi
+
+if ! egrep -q "^mysql-bin.[0-9]+[[:space:]]+[0-9]+$" $binlog_info ; then
+	die "Found filename/position in xtrabackup_binlog_info with GTID_MODE=OFF"
+fi
+
+if egrep -q "^[a-f0-9:-]+$" $binlog_info ; then
+	die "Found GTID of the last change in xtrabackup_binlog_info with GTID_MODE=OFF"
+fi

=== modified file 'storage/innobase/xtrabackup/test/t/bug977101.sh'
--- storage/innobase/xtrabackup/test/t/bug977101.sh	2013-04-27 18:48:50 +0000
+++ storage/innobase/xtrabackup/test/t/bug977101.sh	2014-12-02 15:13:27 +0000
@@ -17,14 +17,14 @@
 
 # Check that binlog info is correct with --safe-slave-backup
 innobackupex --no-timestamp --safe-slave-backup $topdir/backup
-run_cmd egrep -q '^mysql-bin.[0-9]+[[:space:]]+[0-9]+[[:space:]]+$' \
+run_cmd egrep -q '^mysql-bin.[0-9]+[[:space:]]+[0-9]+$' \
     $topdir/backup/xtrabackup_binlog_info
 
 # Check that both binlog info and slave info are correct with 
 # --safe-slave-backup
 rm -rf $topdir/backup
 innobackupex --no-timestamp --slave-info --safe-slave-backup $topdir/backup
-run_cmd egrep -q '^mysql-bin.[0-9]+[[:space:]]+[0-9]+[[:space:]]+$' \
+run_cmd egrep -q '^mysql-bin.[0-9]+[[:space:]]+[0-9]+$' \
     $topdir/backup/xtrabackup_binlog_info
 run_cmd egrep -q '^CHANGE MASTER TO MASTER_LOG_FILE='\''mysql-bin.[0-9]+'\'', MASTER_LOG_POS=[0-9]+$' \
     $topdir/backup/xtrabackup_slave_info

=== modified file 'storage/innobase/xtrabackup/test/t/gtid.sh'
--- storage/innobase/xtrabackup/test/t/gtid.sh	2013-07-25 15:04:49 +0000
+++ storage/innobase/xtrabackup/test/t/gtid.sh	2014-12-02 15:13:27 +0000
@@ -30,7 +30,7 @@
 innobackupex --no-timestamp $topdir/backup
 
 # Check that the value of gtid_executed is in xtrabackup_binlog_info
-if ! egrep -q '^mysql-bin.[0-9]+[[:space:]]+[0-9]+[[:space:]]+[a-f0-9:-]+$' \
+if ! egrep -q '^[a-f0-9:-]+$' \
     $topdir/backup/xtrabackup_binlog_info
 then
     die "Cannot find GTID coordinates in xtrabackup_binlog_info"

=== modified file 'storage/innobase/xtrabackup/test/t/ib_slave_info.sh'
--- storage/innobase/xtrabackup/test/t/ib_slave_info.sh	2013-08-18 18:07:09 +0000
+++ storage/innobase/xtrabackup/test/t/ib_slave_info.sh	2014-12-02 15:13:27 +0000
@@ -22,7 +22,7 @@
   $topdir/backup
 
 innobackupex --no-timestamp --slave-info $topdir/backup
-egrep -q '^mysql-bin.[0-9]+[[:space:]]+[0-9]+[[:space:]]+$' \
+egrep -q '^mysql-bin.[0-9]+[[:space:]]+[0-9]+$' \
     $topdir/backup/xtrabackup_binlog_info
 egrep -q '^CHANGE MASTER TO MASTER_LOG_FILE='\''mysql-bin.[0-9]+'\'', MASTER_LOG_POS=[0-9]+$' \
     $topdir/backup/xtrabackup_slave_info