Merge lp:~gl-az/percona-xtrabackup/bug1250375-2.2 into lp:percona-xtrabackup/2.2

[George Ormond Lorch III]

Fix for bug 1250375 : PXB 56 in galera mode should backup last binlog file.

When --galera-info is specified and Executed_Gtid_Set is valid (PXB 5.6 only or better), innobackupex will execute FLUSH BINARY LOGS and then carry the current binary log as indicated in SHOW MASTER STATUS into the backup set.

Created simple test case (bug1250375.sh) based on xb_galera_info.sh that is only valid for PXC 5.6 or greater to test that the correct bin-log file is present within the backup set.

[George Ormond Lorch III (gl-az)]

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

Same comments on test case as 2.1.

[George Ormond Lorch III (gl-az)]

Similar to the 2.1 comments:

Reviewed the changes myself again after a break and re-orderd things a bit in write_galera_info...new jenkins here http://jenkins.percona.com/view/PXB%202.2/job/percona-xtrabackup-2.2-param/84/ but one host is now having issues. I will restart tests when the issue clears and post new comments.

[George Ormond Lorch III (gl-az)]

Same as 2.1 comments, fixed and new jenkins:

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

[Alexey Kopytov (akopytov)]

review: Needs Fixing

[Alexey Kopytov (akopytov)]

After running it through PXC 5.6 enabled Jenkins:

- log_slave_updates is also a pre-requisite for gtid_mode
- $con->{master_status}->{Executed_Gtid_Set} is always defined on a 5.6 server (but is empty, if GTID is disabled).

I will fix it in the merge revision.

review: Approve

=== modified file 'storage/innobase/xtrabackup/innobackupex.pl'
--- storage/innobase/xtrabackup/innobackupex.pl	2014-01-12 13:29:37 +0000
+++ storage/innobase/xtrabackup/innobackupex.pl	2014-01-15 18:32:40 +0000
@@ -3149,6 +3149,28 @@
 
     write_to_backup_file("$galera_info", "$state_uuid" .
       ":" . "$last_committed" . "\n");
+
+    if (!defined($con->{master_status})) {
+        get_mysql_master_status($con);
+    }
+
+    if (defined($con->{master_status}->{Executed_Gtid_Set})) {
+        my $log_bin_dir;
+        my $log_bin_file;
+
+        mysql_query($con, "FLUSH BINARY LOGS");
+        get_mysql_master_status($con);
+
+        $log_bin_file = $con->{master_status}->{File};
+        $log_bin_dir = File::Basename::dirname($mysql{vars}->{log_bin_basename}->{Value});
+
+        if (!defined($log_bin_file) || !defined($log_bin_dir)) {
+            die "Failed to get master binlog coordinates from SHOW MASTER STATUS";
+        }
+
+        backup_file("$log_bin_dir", "$log_bin_file", 
+                    "$backup_dir/$log_bin_dir/$log_bin_file")
+    }
 }
 
 
 
=== added file 'storage/innobase/xtrabackup/test/t/bug1250375.sh'
--- storage/innobase/xtrabackup/test/t/bug1250375.sh	1970-01-01 00:00:00 +0000
+++ storage/innobase/xtrabackup/test/t/bug1250375.sh	2014-01-15 18:32:40 +0000
@@ -0,0 +1,38 @@
+. inc/common.sh
+
+require_galera
+require_server_version_higher_than 5.6.0
+
+ADDR=127.0.0.1
+
+if [[ -n ${WSREP_DEBUG:-} ]];then 
+    start_server --log-bin=`hostname`-bin --binlog-format=ROW --wsrep-provider=${MYSQL_BASEDIR}/lib/libgalera_smm.so --wsrep_cluster_address=gcomm:// --wsrep-debug=1 --wsrep_provider_options="debug=1" --wsrep_node_address=$ADDR --gtid_mode=ON
+else 
+    start_server --log-bin=`hostname`-bin --binlog-format=ROW --wsrep-provider=${MYSQL_BASEDIR}/lib/libgalera_smm.so --wsrep_cluster_address=gcomm:// --wsrep_node_address=$ADDR --gtid_mode=ON
+
+fi
+
+
+innobackupex --no-timestamp --galera-info $topdir/backup 
+backup_dir=$topdir/backup
+vlog "Backup created in directory $backup_dir"
+
+count=0
+master_file=
+
+while read line; do
+    if [ $count -eq 1 ] # File:
+    then
+        master_file=`echo "$line" | sed s/File://`
+        break
+    fi
+    count=$((count+1))
+done <<< "`run_cmd $MYSQL $MYSQL_ARGS -Nse 'SHOW MASTER STATUS\G' mysql`"
+
+stop_server
+
+if [ -f "$backup_dir/$master_file" ]
+then
+    vlog "Could not find bin-log file in backup set, expecting to find $master_file"
+    exit 1
+fi