Merge lp:~akopytov/percona-xtrabackup/bug1177201-2.1 into lp:percona-xtrabackup/2.2

[Alexey Kopytov]

    Bug #1177201: Assertion "to_read % cursor->page_size == 0" failed at
                  fil_cur.cc:218

    Allow junk at the end of data files, i.e. when there’s a block less than
    the page size at the end of the file. It is apparently a server-side
    problem with unknown root cause, but it’s ok to ignore that as long as
    InnoDB itself ignores such datafiles.

http://jenkins.percona.com/view/PXB%202.1/job/percona-xtrabackup-2.1-param/553/

[Sergei Glushchenko (sergei.glushchenko)]

Hi Alexey,

Looks good, but please resubmit to lp:percona-xtrabackup/2.1

review: Needs Resubmitting (g2)

=== modified file 'storage/innobase/xtrabackup/src/fil_cur.cc'
--- storage/innobase/xtrabackup/src/fil_cur.cc	2013-11-26 10:44:44 +0000
+++ storage/innobase/xtrabackup/src/fil_cur.cc	2014-02-28 06:03:56 +0000
@@ -293,7 +293,23 @@
 	if (to_read > (ib_int64_t) cursor->buf_size) {
 		to_read = (ib_int64_t) cursor->buf_size;
 	}
+
 	xb_a(to_read > 0 && to_read <= 0xFFFFFFFFLL);
+
+	if (to_read % cursor->page_size != 0 &&
+	    offset + to_read == cursor->statinfo.st_size) {
+
+		msg("[%02u] xtrabackup: Warning: junk at the end of %s:\n",
+		    cursor->thread_n, cursor->abs_path);
+		msg("[%02u] xtrabackup: Warning: offset = %llu, "
+		    "to_read = %llu\n",
+		    cursor->thread_n,
+		    (unsigned long long) offset,
+		    (unsigned long long) to_read);
+
+		return(XB_FIL_CUR_EOF);
+	}
+
 	xb_a(to_read % cursor->page_size == 0);
 
 	npages = (ulint) (to_read >> cursor->page_size_shift);
 
=== added file 'storage/innobase/xtrabackup/test/t/bug1177201.sh'
--- storage/innobase/xtrabackup/test/t/bug1177201.sh	1970-01-01 00:00:00 +0000
+++ storage/innobase/xtrabackup/test/t/bug1177201.sh	2014-02-28 06:03:56 +0000
@@ -0,0 +1,22 @@
+########################################################################
+# Bug #1177201: Assertion "to_read % cursor->page_size == 0" failed at
+#               fil_cur.cc:218
+########################################################################
+
+start_server
+
+dd if=/dev/zero of=$topdir/zeroes bs=1 count=4096
+
+cat $topdir/zeroes >>$MYSQLD_DATADIR/ibdata1
+
+innobackupex --no-timestamp $topdir/backup
+
+stop_server
+
+rm -rf $MYSQLD_DATADIR/*
+
+innobackupex --apply-log $topdir/backup
+
+innobackupex --copy-back $topdir/backup
+
+start_server