Merge lp:~percona-dev/percona-xtrabackup/xb_export into lp:percona-xtrabackup/2.0

[Valentine Gostev]

Fixed xb_export test to perform prepare with export.
Added full backup test after importing.

UPD: merged my revisions to single one

[Yasufumi Kinoshita (yasufumi-kinoshita)]

You don't understand xtrabackup at all, basically....
I don't understand what is tested here. It is completely wrong usage.

xtrabackup should be executed 2 times.
--backup and --prepare.
In addition, to export tables, --export is needed with --prepare.

You should not make test cases until you understand xtrabackup/InnoDB/MySQL.

review: Disapprove

[Yasufumi Kinoshita (yasufumi-kinoshita)]

If passed with 5.1.54-fix_expand_import_and_dict_size_limit branch.
I am OK.

review: Approve ((please confirm to work correctly))

[Alexey Kopytov (akopytov)]

Why was this one rejected? Isn't it an improved version of the superseded one?

[Valentine Gostev (longbow)]

At the first time I've forgot to add the line with --prepare and --export, which caused server crash.

After adding string:
+run_cmd ${XB_BIN} --datadir=$mysql_datadir --prepare --export --target-dir=$backup_dir

test case passes ok on importing, then exporting table.

[Vadim Tkachenko (vadim-tk)]

I am lost in two proposals, but OK to merge good version.

review: Approve

=== added file 'test/t/xb_export.sh'
--- test/t/xb_export.sh	1970-01-01 00:00:00 +0000
+++ test/t/xb_export.sh	2011-02-10 12:12:02 +0000
@@ -0,0 +1,100 @@
+. inc/common.sh
+
+init
+
+backup_dir=/tmp/xb_export_backup
+rm -rf $backup_dir
+mkdir $backup_dir
+# Starting database server
+run_mysqld --innodb_file_per_table --innodb_file_format=Barracuda
+
+# Loading table schema
+load_dbase_schema incremental_sample
+
+# Adding some data to database
+vlog "Adding initial rows to database..."
+numrow=100
+count=0
+while [ "$numrow" -gt "$count" ]
+do
+	${MYSQL} ${MYSQL_ARGS} -e "insert into test values ($count, $numrow);" incremental_sample
+	let "count=count+1"
+done
+vlog "Initial rows added"
+
+checksum_1=`${MYSQL} ${MYSQL_ARGS} -Ns -e "checksum table test" incremental_sample | awk '{print $2}'`
+rowsnum_1=`${MYSQL} ${MYSQL_ARGS} -Ns -e "select count(*) from test" incremental_sample`
+vlog "rowsnum_1 is $rowsnum_1"
+vlog "checksum_1 is $checksum_1"
+
+# Performing table backup
+#run_cmd xtrabackup --datadir=$mysql_datadir --backup --tables="^incremental_sample[.]test" --target-dir=$backup_dir
+run_cmd xtrabackup --datadir=$mysql_datadir --backup --target-dir=$backup_dir
+vlog "Table was backed up"
+
+vlog "Re-initializing database server"
+stop_mysqld
+clean
+init
+run_mysqld --innodb_file_per_table --innodb_expand_import=1 --innodb_file_format=Barracuda
+load_dbase_schema incremental_sample
+vlog "Database was re-initialized"
+
+run_cmd ${MYSQL} ${MYSQL_ARGS} -e "alter table test discard tablespace;" incremental_sample
+#run_cmd xtrabackup --datadir=$mysql_datadir --prepare --target-dir=$backup_dir
+run_cmd xtrabackup --datadir=$mysql_datadir --prepare --export --target-dir=$backup_dir
+run_cmd cp $backup_dir/incremental_sample/test* $mysql_datadir/incremental_sample/
+run_cmd ls -lah $mysql_datadir/incremental_sample/
+run_cmd ${MYSQL} ${MYSQL_ARGS} -e "alter table test import tablespace" incremental_sample
+vlog "Table has been imported"
+
+vlog "Cheking checksums"
+checksum_2=`${MYSQL} ${MYSQL_ARGS} -Ns -e "checksum table test;" incremental_sample | awk '{print $2}'`
+vlog "checksum_2 is $checksum_2"
+rowsnum_1=`${MYSQL} ${MYSQL_ARGS} -Ns -e "select count(*) from test" incremental_sample`
+vlog "rowsnum_1 is $rowsnum_1"
+
+if [ $checksum_1 -ne $checksum_2  ]
+then 
+	vlog "Checksums are not equal"
+	exit -1
+fi
+
+vlog "Checksums are OK"
+
+# Some testing queries
+run_cmd ${MYSQL} ${MYSQL_ARGS} -e "select count(*) from test;" incremental_sample
+run_cmd ${MYSQL} ${MYSQL_ARGS} -e "show create table test;" incremental_sample
+
+# Performing full backup of imported table
+mkdir -p $topdir/backup/full
+
+xtrabackup --datadir=$mysql_datadir --backup --target-dir=$topdir/backup/full
+xtrabackup --datadir=$mysql_datadir --prepare --apply-log-only --target-dir=$topdir/backup/full
+xtrabackup --datadir=$mysql_datadir --prepare --target-dir=$topdir/backup/full
+
+run_cmd ${MYSQL} ${MYSQL_ARGS} -e "delete from test;" incremental_sample
+
+stop_mysqld
+
+cd $topdir/backup/full
+cp -r * $mysql_datadir
+cd -
+
+run_mysqld --innodb_file_per_table
+
+vlog "Cheking checksums"
+checksum_3=`${MYSQL} ${MYSQL_ARGS} -Ns -e "checksum table test;" incremental_sample | awk '{print $2}'`
+vlog "checksum_3 is $checksum_3"
+
+if [ $checksum_3 -ne $checksum_2  ]
+then
+        vlog "Checksums are not equal"
+        exit -1
+fi
+
+vlog "Checksums are OK"
+
+rm -rf $backup_dir
+stop_mysqld
+clean