Merge lp:~laurynas-biveinis/percona-xtrabackup/bug1022562-2.1 into lp:percona-xtrabackup/2.1

[Laurynas Biveinis]

Merge fix for bug 1022562 (Inc backup fails if a tablespace is created
between full and inc backups).

The code is different from 2.0: add a new function wf_common_filter()
in write_filt.c that provides page-offset-based filtering that is
common for all write filters.

Jenkins (with follow-up branches included): http://jenkins.percona.com/job/percona-xtrabackup-2.1-param/35/
Issue #16274

[Stewart Smith (stewart)]

review: Approve

=== modified file 'src/write_filt.c'
--- src/write_filt.c	2012-08-01 10:18:22 +0000
+++ src/write_filt.c	2012-08-01 10:18:22 +0000
@@ -23,6 +23,7 @@
 /* Page write filters implementation */
 
 #include <my_base.h>
+#include <fil0fil.h>
 #include <ut0mem.h>
 #include "common.h"
 #include "innodb_int.h"
@@ -31,6 +32,21 @@
 #include "xtrabackup.h"
 
 /************************************************************************
+The common tablespace-offset-based page filter.  This is a subroutine for all
+other filters that will select additional pages to be written by their
+tablespace position, regardless of the main filter logic.
+
+@return TRUE if the page with given id should be selected, FALSE otherwise. */
+static my_bool wf_common_filter(ulint offset) {
+	/* We always copy the 1st FIL_IBD_INITIAL_SIZE *
+	UNIV_PAGE_SIZE bytes of any tablespace.  These pages are
+	guaranteed to be flushed upon tablespace create and they are
+	needed so that we have a good minimal tablespace image before
+	doing anything further with it.  */
+	return (offset < FIL_IBD_FILE_INITIAL_SIZE * UNIV_PAGE_SIZE);
+}
+
+/************************************************************************
 Write-through page write filter. */
 static my_bool wf_wt_init(xb_write_filt_ctxt_t *ctxt, char *dst_name,
 			  xb_fil_cur_t *cursor);
@@ -136,7 +152,8 @@
 	for (i = 0, page = cursor->buf; i < cursor->buf_npages;
 	     i++, page += page_size) {
 		if (ut_dulint_cmp(incremental_lsn,
-				  MACH_READ_64(page + FIL_PAGE_LSN)) >= 0) {
+				  MACH_READ_64(page + FIL_PAGE_LSN)) >= 0
+		    && !wf_common_filter(cursor->buf_offset + i * page_size)) {
 			continue;
 		}
 
 
=== modified file 'src/xtrabackup.c'
--- src/xtrabackup.c	2012-08-01 10:18:22 +0000
+++ src/xtrabackup.c	2012-08-01 10:18:22 +0000
@@ -3802,7 +3802,7 @@
 in given directory. When matching tablespace found, renames it to match the
 name of .delta file. If there was a tablespace with matching name and
 mismatching ID, renames it to xtrabackup_tmp_#ID.ibd. If there was no
-matching file, creates the new one.
+matching file, creates a placeholder for the new tablespace.
 @return file handle of matched or created file */
 static
 os_file_t
@@ -3901,7 +3901,12 @@
 		goto found;
 	}
 
-	/* no matching space found. create the new one */
+	/* No matching space found. create the new one.  Note that this is not
+	a full-fledged tablespace create, as done by
+	fil_create_new_single_table_tablespace(): the minumum tablespace size
+	is not ensured and the 1st page fields are not set.  We rely on backup
+	delta to contain the 1st FIL_IBD_FILE_INITIAL_SIZE * UNIV_PAGE_SIZE
+	to ensure the correct tablespace image.  */
 
 #ifdef INNODB_VERSION_SHORT
 	if (!fil_space_create(dest_space_name, space_id,
 
=== added file 'test/t/bug1022562.sh'
--- test/t/bug1022562.sh	1970-01-01 00:00:00 +0000
+++ test/t/bug1022562.sh	2012-08-01 10:18:22 +0000
@@ -0,0 +1,93 @@
+. inc/common.sh
+
+mysqld_additional_args="--innodb_file_per_table"
+  
+start_server ${mysqld_additional_args}
+
+load_dbase_schema incremental_sample
+
+# Full backup
+
+# Full backup folder
+rm -rf $topdir/data/full
+mkdir -p $topdir/data/full
+# Incremental data
+rm -rf $topdir/data/delta
+mkdir -p $topdir/data/delta
+
+vlog "Starting backup"
+
+xtrabackup --datadir=$mysql_datadir --backup --target-dir=$topdir/data/full \
+    $mysqld_additional_args
+
+vlog "Full backup done"
+
+# Changing data in sakila
+
+vlog "Making changes to database"
+
+${MYSQL} ${MYSQL_ARGS} -e "CREATE TABLE t2 (a INT(11) DEFAULT NULL, \
+ number INT(11) DEFAULT NULL) ENGINE=INNODB" incremental_sample
+${MYSQL} ${MYSQL_ARGS} -e "INSERT INTO t2 VALUES (1, 1)" incremental_sample
+  
+vlog "Changes done"
+
+# Saving the checksum of original table
+checksum_t2_a=`checksum_table incremental_sample t2`
+
+vlog "Table 't2' checksum is $checksum_t2_a"
+
+vlog "Making incremental backup"
+
+# Incremental backup
+xtrabackup --datadir=$mysql_datadir --backup \
+    --target-dir=$topdir/data/delta --incremental-basedir=$topdir/data/full \
+    $mysqld_additional_args
+
+vlog "Incremental backup done"
+vlog "Preparing backup"
+
+# Prepare backup
+xtrabackup --datadir=$mysql_datadir --prepare --apply-log-only \
+    --target-dir=$topdir/data/full $mysqld_additional_args
+vlog "Log applied to backup"
+
+xtrabackup --datadir=$mysql_datadir --prepare --apply-log-only \
+    --target-dir=$topdir/data/full --incremental-dir=$topdir/data/delta \
+    $mysqld_additional_args
+vlog "Delta applied to backup"
+
+xtrabackup --datadir=$mysql_datadir --prepare --target-dir=$topdir/data/full \
+    $mysqld_additional_args
+vlog "Data prepared for restore"
+
+# removing rows
+${MYSQL} ${MYSQL_ARGS} -e "delete from t2;" incremental_sample
+vlog "Table cleared"
+
+# Restore backup
+
+stop_server
+
+vlog "Copying files"
+
+cd $topdir/data/full/
+cp -r * $mysql_datadir
+cd -
+
+vlog "Data restored"
+
+start_server ${mysqld_additional_args}
+
+vlog "Checking checksums"
+checksum_t2_b=`checksum_table incremental_sample t2`
+
+if [ "$checksum_t2_a" != "$checksum_t2_b"  ]
+then 
+    vlog "Checksums of table 't2' are not equal"
+    exit -1
+fi
+
+vlog "Checksums are OK"
+
+stop_server