Merge lp:~sergei.glushchenko/percona-xtrabackup/bug711166_part-1.6 into lp:percona-xtrabackup/2.0

[Sergei Glushchenko]

Merge of fix for 1.6 series

[Alexey Kopytov (akopytov)]

Sergei,

Please merge to a separate trunk-based tree, and run it through Jenkins before submitting a MP.

I also have some comments on the 1.6 version of the fix.

review: Needs Resubmitting

Unmerged revisions

348. By Sergei Glushchenko on 2012-09-18

Partitioned tables are not correctly handled by the --databases, --include,
--tables-file options of innobackupex, and by the --tables and
--tables-file options of xtrabackup.
Solution is to remove partition suffix (#P#...) before doing filtering.
Testcases cover variants of using filtering options with MyISAM and
InnoDB tables (to test both innobackupex and xtrabackup) with either stream
mode turned on and turned off.

=== modified file 'innobackupex'
--- innobackupex	2012-01-31 01:46:10 +0000
+++ innobackupex	2012-02-01 04:33:50 +0000
@@ -2345,6 +2345,8 @@
          $filename = (reverse(split(/\//, $table_path)))[0];
          # get name of the table by removing file suffix
          $table = (split(/\./, $filename))[0];
+         # and partition suffix
+         $table = (split('#P#', $table))[0];
       }
    }
 

=== added file 'test/t/bug711166-innodb.sh'
--- test/t/bug711166-innodb.sh	1970-01-01 00:00:00 +0000
+++ test/t/bug711166-innodb.sh	2012-02-01 04:33:50 +0000
@@ -0,0 +1,77 @@
+########################################################################
+# Bug #711166: If xtrabackup is being used with --tables-file option
+#              (and the table list contains partitioned table) - only
+#              *.par files are being backed up.
+########################################################################
+
+. inc/common.sh
+
+init
+run_mysqld --innodb_file_per_table
+
+mkdir -p $topdir/ext
+
+# Create InnoDB partitioned table
+run_cmd $MYSQL $MYSQL_ARGS test <<EOF
+CREATE TABLE test (
+  a int(11) DEFAULT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=latin1
+PARTITION BY RANGE (a)
+(PARTITION p0 VALUES LESS THAN (100) ENGINE = InnoDB,
+ PARTITION P1 VALUES LESS THAN (200) ENGINE = InnoDB,
+ PARTITION p2 VALUES LESS THAN (300) ENGINE = InnoDB,
+ PARTITION p3 VALUES LESS THAN (400) ENGINE = InnoDB,
+ PARTITION p4 VALUES LESS THAN MAXVALUE ENGINE = InnoDB);
+EOF
+
+# Adding 500 rows
+
+vlog "Adding initial rows to database..."
+
+numrow=500
+count=0
+while [ "$numrow" -gt "$count" ]
+do
+	${MYSQL} ${MYSQL_ARGS} -e "insert into test values ($count);" test
+	let "count=count+1"
+done
+
+# Saving the checksum of original table
+checksum_a=`checksum_table test test`
+
+# Take a backup
+# Only backup of test.test table will be taken
+cat >$topdir/tables <<EOF
+test.test
+EOF
+xtrabackup --datadir=$mysql_datadir --backup --target-dir=$topdir/backup \
+    --tables-file=$topdir/tables
+vlog "Backup taken"
+xtrabackup --datadir=$mysql_datadir --prepare --target-dir=$topdir/backup
+vlog "Backup prepared"
+
+stop_mysqld
+
+# Remove original table
+rm $mysql_datadir/test/test*.ibd
+rm -rf $topdir/ext/*
+vlog "Original test.test removed"
+
+# Restore test.test from backup
+cp -r $topdir/backup/* $mysql_datadir
+vlog "test.test copied from backup"
+
+run_mysqld
+
+vlog "Cheking checksums"
+checksum_b=`checksum_table test test`
+
+vlog "Checksums are $checksum_a and $checksum_b"
+
+if [ "$checksum_a" != "$checksum_b" ]
+then 
+	vlog "Checksums are not equal"
+	exit -1
+fi
+
+vlog "Checksums are OK"

=== added file 'test/t/bug711166-myisam.sh'
--- test/t/bug711166-myisam.sh	1970-01-01 00:00:00 +0000
+++ test/t/bug711166-myisam.sh	2012-02-01 04:33:50 +0000
@@ -0,0 +1,79 @@
+########################################################################
+# Bug #711166: If innobackupex is being used with --tables-file option
+#              (and the table list contains partitioned table) - only
+#              *.par files are being backed up.
+########################################################################
+
+. inc/common.sh
+
+init
+run_mysqld
+
+mkdir -p $topdir/ext
+
+# Create MyISAM partitioned table with some partitions in
+# different location
+run_cmd $MYSQL $MYSQL_ARGS test <<EOF
+CREATE TABLE test (
+  a int(11) DEFAULT NULL
+) ENGINE=MyISAM DEFAULT CHARSET=latin1
+PARTITION BY RANGE (a)
+(PARTITION p0 VALUES LESS THAN (100) ENGINE = MyISAM,
+ PARTITION P1 VALUES LESS THAN (200) ENGINE = MyISAM,
+ PARTITION p2 VALUES LESS THAN (300)
+   DATA DIRECTORY = '$topdir/ext' INDEX DIRECTORY = '$topdir/ext'
+   ENGINE = MyISAM,
+ PARTITION p3 VALUES LESS THAN (400)
+   DATA DIRECTORY = '$topdir/ext' INDEX DIRECTORY = '$topdir/ext'
+   ENGINE = MyISAM,
+ PARTITION p4 VALUES LESS THAN MAXVALUE ENGINE = MyISAM);
+EOF
+
+# Adding 500 rows
+
+vlog "Adding initial rows to database..."
+
+numrow=500
+count=0
+while [ "$numrow" -gt "$count" ]
+do
+	${MYSQL} ${MYSQL_ARGS} -e "insert into test values ($count);" test
+	let "count=count+1"
+done
+
+# Saving the checksum of original table
+checksum_a=`checksum_table test test`
+
+# Take a backup
+# Only backup of test.test table will be taken
+cat >$topdir/tables <<EOF
+test.test
+EOF
+$IB_BIN $IB_ARGS --no-timestamp --tables-file=$topdir/tables $topdir/backup
+vlog "Backup taken"
+
+stop_mysqld
+
+# Remove original table
+rm $mysql_datadir/test/test*
+rm -rf $topdir/ext/*
+vlog "Original test.test removed"
+
+# Restore test.test from backup
+cp -r $topdir/backup/* $mysql_datadir
+vlog "test.test copied from backup"
+
+run_mysqld
+
+vlog "Cheking checksums"
+checksum_b=`checksum_table test test`
+
+vlog "Checksums are $checksum_a and $checksum_b"
+
+if [ "$checksum_a" != "$checksum_b" ]
+then 
+	vlog "Checksums are not equal"
+	exit -1
+fi
+
+vlog "Checksums are OK"

=== modified file 'xtrabackup.c'
--- xtrabackup.c	2012-01-31 01:46:10 +0000
+++ xtrabackup.c	2012-02-01 04:33:50 +0000
@@ -2877,6 +2877,11 @@
 			p = next + 1;
 		}
 		p_len = strlen(p) - strlen(".ibd");
+		/* in case file is parttition of a table it contains #P# magic
+		after the table name.
+		*/
+		if ((next = strstr(p, "#P#")) != NULL)
+			p_len = next - p;
 
 		if (p_len < 1) {
 			/* unknown situation: skip filtering */