Merge lp:~sergei.glushchenko/percona-xtrabackup/2.2-BT48819-xb-bug1403237 into lp:percona-xtrabackup/2.2

[Sergei Glushchenko]

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

    Bug 1403237: apply-log Failed with small xtrabackup_logfile

    The root cause is that last checkpoint lsn offset in log group is
    stored at different offsets in ibdata1 for Percona Server 5.5 and
    MySQL 5.6 when total size of log files is greater than 4G.

    This fix is to try both variants of the offset when starting log
    copying, one of them has to work.

No changes needed when it comes to creating empty log files upon prepare as checkpoint LSN offset will be close to LOG_FILE_HDR_SIZE and both PS 5.1/5.5 and MySQL 5.6 will recognize it correctly.

No changes needed when we create temporary log file because only xtrabackup read it and it must be of same format as MySQL 5.6. We don't recommend to prepare backup with the same version of xtrabackup which used for taking backup.

Revision IDS in branch and jenkins build are not the same, but only thing changed is commit message.

[Alexey Kopytov (akopytov)]

review: Approve

=== modified file 'storage/innobase/include/log0log.h'
--- storage/innobase/include/log0log.h	2014-09-15 08:52:36 +0000
+++ storage/innobase/include/log0log.h	2015-01-06 16:38:15 +0000
@@ -749,6 +749,8 @@
 	lsn_t		lsn;		/*!< lsn used to fix coordinates within
 					the log group */
 	lsn_t		lsn_offset;	/*!< the offset of the above lsn */
+	lsn_t		lsn_offset_alt;	/*!< alternative lsn offset for PS 5.5
+					with large log files */
 	ulint		n_pending_writes;/*!< number of currently pending flush
 					writes for this log group */
 	byte**		file_header_bufs_ptr;/*!< unaligned buffers */
 
=== modified file 'storage/innobase/log/log0recv.cc'
--- storage/innobase/log/log0recv.cc	2014-12-28 13:11:05 +0000
+++ storage/innobase/log/log0recv.cc	2015-01-06 16:38:15 +0000
@@ -800,8 +800,16 @@
 				buf + LOG_CHECKPOINT_LSN);
 			group->lsn_offset = mach_read_from_4(
 				buf + LOG_CHECKPOINT_OFFSET_LOW32);
-			group->lsn_offset |= ((lsn_t) mach_read_from_4(
-				buf + LOG_CHECKPOINT_OFFSET_HIGH32)) << 32;
+			group->lsn_offset_alt = group->lsn_offset;
+			if (group->file_size * group->n_files >
+				4294967296ULL /* 4GiB */) {
+				group->lsn_offset |= ((lsn_t) mach_read_from_4(
+					buf + LOG_CHECKPOINT_OFFSET_HIGH32))
+					<< 32;
+				group->lsn_offset_alt =
+					((lsn_t) mach_read_from_8(
+					buf + LOG_CHECKPOINT_ARCHIVED_LSN));
+			}
 			checkpoint_no = mach_read_from_8(
 				buf + LOG_CHECKPOINT_NO);
 
 
=== modified file 'storage/innobase/xtrabackup/src/xtrabackup.cc'
--- storage/innobase/xtrabackup/src/xtrabackup.cc	2014-12-22 11:27:03 +0000
+++ storage/innobase/xtrabackup/src/xtrabackup.cc	2015-01-06 16:38:15 +0000
@@ -2062,7 +2062,7 @@
 }
 
 static my_bool
-xtrabackup_copy_logfile(lsn_t from_lsn, my_bool is_last)
+xtrabackup_copy_logfile(lsn_t from_lsn, my_bool is_last, my_bool is_first)
 {
 	/* definition from recv_recovery_from_checkpoint_start() */
 	log_group_t*	group;
@@ -2095,6 +2095,7 @@
 
 		mutex_enter(&log_sys->mutex);
 
+retry_read:
 		log_group_read_log_seg(LOG_RECOVER, log_sys->buf,
 				       group, start_lsn, end_lsn);
 
@@ -2124,6 +2125,15 @@
 			blocks_in_group = log_block_convert_lsn_to_no(
 				log_group_get_capacity(group)) - 1;
 
+			/* Can be just wrong lsn_offset. Is it PS 5.5 with large
+			log files? */
+			if (is_first &&
+			    group->lsn_offset != group->lsn_offset_alt) {
+				group->lsn_offset = group->lsn_offset_alt;
+				is_first = FALSE;
+				goto retry_read;
+			}
+
 			if (no < scanned_no ||
 			    /* Log block numbers wrap around at 0x3FFFFFFF */
 			    ((scanned_no | 0x40000000UL) - no) %
@@ -2302,7 +2312,7 @@
 				       0);
 		if (log_copying) {
 			if(xtrabackup_copy_logfile(log_copy_scanned_lsn,
-						   FALSE)) {
+						   FALSE, FALSE)) {
 
 				exit(EXIT_FAILURE);
 			}
@@ -2310,7 +2320,7 @@
 	}
 
 	/* last copying */
-	if(xtrabackup_copy_logfile(log_copy_scanned_lsn, TRUE)) {
+	if(xtrabackup_copy_logfile(log_copy_scanned_lsn, TRUE, FALSE)) {
 
 		exit(EXIT_FAILURE);
 	}
@@ -3554,7 +3564,7 @@
 
 
 	/* copy log file by current position */
-	if(xtrabackup_copy_logfile(checkpoint_lsn_start, FALSE))
+	if(xtrabackup_copy_logfile(checkpoint_lsn_start, FALSE, TRUE))
 		exit(EXIT_FAILURE);