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

[Alexey Kopytov]

    Bug #1239670: xtrabackup_slave_info does not contain GTID purge lists

    Modified innobackupex to detect when the slave server is in the GTID
    mode, and produce the correct (pseudo-)SQL to setup a new slave in this
    case. I.e. xtrabackup_slave_info instead of:

    CHANGE MASTER TO MASTER_LOG_FILE=..., MASTER_LOG_POS=...

    will contain:

    SET GLOBAL gtid_purged=...;
    CHANGE MASTER TO MASTER_AUTO_POSITION=1

[Alexey Kopytov (akopytov)]

http://jenkins.percona.com/view/XtraBackup/job/percona-xtrabackup-2.2-param/25/

[Sergei Glushchenko (sergei.glushchenko)]

Approve

review: Approve (g2)

=== modified file 'xtrabackup/innobackupex'
--- xtrabackup/innobackupex	2013-09-26 06:26:18 +0000
+++ xtrabackup/innobackupex	2013-10-26 16:08:42 +0000
@@ -3143,18 +3143,16 @@
 
     my @lines;
     my @info_lines;
-    my $position = '';
-    my $filename = '';
-    my $master= '';
 
     # get slave status
     get_mysql_slave_status($con);
 
     # get output of the "show slave status" command from mysql output
     # and extract binlog position of the master server
-    $master = $con->{slave_status}->{Master_Host};
-    $filename = $con->{slave_status}->{Relay_Master_Log_File};
-    $position = $con->{slave_status}->{Exec_Master_Log_Pos};
+    my $master = $con->{slave_status}->{Master_Host};
+    my $filename = $con->{slave_status}->{Relay_Master_Log_File};
+    my $position = $con->{slave_status}->{Exec_Master_Log_Pos};
+    my $gtid_executed = $con->{slave_status}->{Executed_Gtid_Set};
 
     if (!defined($master) || !defined($filename) || !defined($position)) {
         my $now = current_time();
@@ -3167,11 +3165,25 @@
         return;
     }
 
-    # print slave status to a file
-    write_to_backup_file("$slave_info", 
-      "CHANGE MASTER TO MASTER_LOG_FILE='$filename', MASTER_LOG_POS=$position\n");
-   
-    $mysql_slave_position = "master host '$master', filename '$filename', position $position";
+    # Print slave status to a file.
+    # If GTID mode is used, construct a CHANGE MASTER statement with
+    # MASTER_AUTO_POSITION and correct a gtid_purged value.
+    if (defined($gtid_executed) && $gtid_executed) {
+        $gtid_executed =~ s/\n/ /;
+        write_to_backup_file("$slave_info",
+                             "SET GLOBAL gtid_purged='$gtid_executed';\n" .
+                             "CHANGE MASTER TO MASTER_AUTO_POSITION=1\n");
+        $mysql_slave_position = "master host '$master', ".
+            "purge list '$gtid_executed'";
+    } else {
+        write_to_backup_file("$slave_info",
+                             "CHANGE MASTER TO MASTER_LOG_FILE='$filename', " .
+                             "MASTER_LOG_POS=$position\n");
+
+        $mysql_slave_position = "master host '$master', " .
+            "filename '$filename', " .
+            "position $position";
+    }
 }
 
 sub eat_sql_whitespace {

=== added file 'xtrabackup/test/t/bug1239670.sh'
--- xtrabackup/test/t/bug1239670.sh	1970-01-01 00:00:00 +0000
+++ xtrabackup/test/t/bug1239670.sh	2013-10-26 16:08:42 +0000
@@ -0,0 +1,50 @@
+#########################################################################
+# Bug #1239670: xtrabackup_slave_info does not contain GTID purge lists
+#########################################################################
+
+require_server_version_higher_than 5.6.0
+
+MYSQLD_EXTRA_MY_CNF_OPTS="
+gtid_mode=on
+log_slave_updates=on
+enforce_gtid_consistency=on
+"
+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 $master_id
+
+$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
+
+sync_slave_with_master $slave_id $master_id
+
+switch_server $slave_id
+
+$MYSQL $MYSQL_ARGS -e "SHOW SLAVE STATUS\G"
+
+innobackupex --no-timestamp --slave-info $topdir/backup
+
+vlog "Verifying format of xtrabackup_slave_info:"
+f=$topdir/backup/xtrabackup_slave_info
+echo "---"
+cat $f
+echo "---"
+run_cmd egrep -q '^SET GLOBAL gtid_purged='\''[0-9a-f:, -]+'\' $f
+run_cmd egrep -q '^CHANGE MASTER TO MASTER_AUTO_POSITION=1' $f