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

[Vadim Tkachenko]

[Alexey Kopytov (akopytov)]

Should we have a test case for the bug? Something like ib_incremental.sh which uses innobackupex where possible and parses the InnoDB errors from the bug #713300 (since the test would succeed otherwise)?

review: Needs Fixing

[Vadim Tkachenko (vadim-tk)]

Alexey,

I included test, please review again

review: Needs Resubmitting

[Vadim Tkachenko (vadim-tk)]

review: Abstain

[Alexey Kopytov (akopytov)]

Looks good to me.

review: Approve

=== modified file 'innobackupex'
--- innobackupex	2011-02-12 04:49:26 +0000
+++ innobackupex	2011-02-13 19:06:56 +0000
@@ -892,6 +892,9 @@
         Die "\n$prefix ibbackup failed";
     }
 
+    # We should not create ib_logfile files if we prepare for following incremental applies
+    # Also we do not prepare ib_logfile if we applied incremental changes
+    if (!( ($option_redo_only) or ($option_incremental_dir))) { 
     $now = current_time();
     print STDERR "\n$now  $prefix Restarting xtrabackup with command: $cmdline\nfor creating ib_logfile*\n\n";
     $rcode = system("$cmdline");
@@ -899,6 +902,7 @@
         # failure
         Die "\n$prefix xtrabackup (2nd execution) failed";
     }
+    }
 }
 
 

=== added file 'test/t/ib_incremental.sh'
--- test/t/ib_incremental.sh	1970-01-01 00:00:00 +0000
+++ test/t/ib_incremental.sh	2011-02-13 19:06:56 +0000
@@ -0,0 +1,103 @@
+. inc/common.sh
+
+OUTFILE=results/ib_incremental_innobackupex.out
+
+init
+run_mysqld --innodb_file_per_table
+load_dbase_schema incremental_sample
+
+# creating my.cnf for innobackupex
+echo "
+[mysqld]
+datadir=$mysql_datadir" > $topdir/my.cnf
+
+# Adding initial rows
+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"
+
+# Full backup
+# backup root directory
+mkdir -p $topdir/backup
+
+vlog "Starting backup"
+innobackupex --user=root --socket=$mysql_socket --defaults-file=$topdir/my.cnf $topdir/backup > $OUTFILE 2>&1 || die "innobackupex died with exit code $?"
+full_backup_dir=`grep "innobackupex: Backup created in directory" $OUTFILE | awk -F\' '{print $2}'`
+vlog "Full backup done to folder $full_backup_dir"
+
+# Changing data
+
+vlog "Making changes to database"
+let "count=numrow+1"
+let "numrow=500"
+while [ "$numrow" -gt "$count" ]
+do
+	${MYSQL} ${MYSQL_ARGS} -e "insert into test values ($count, $numrow);" incremental_sample
+	let "count=count+1"
+done
+vlog "Changes done"
+
+# Saving the checksum of original table
+checksum_a=`${MYSQL} ${MYSQL_ARGS} -Ns -e "checksum table test;" incremental_sample | awk '{print $2}'`
+vlog "Table checksum is $checksum_a"
+
+vlog "Making incremental backup"
+
+echo "###############" >> $OUTFILE
+echo "# INCREMENTAL #" >> $OUTFILE
+echo "###############" >> $OUTFILE
+
+# Incremental backup
+innobackupex --user=root --socket=$mysql_socket --defaults-file=$topdir/my.cnf --incremental --incremental-basedir=$full_backup_dir $topdir/backup >> $OUTFILE 2>&1 || die "innobackupex died with exit code $?"
+inc_backup_dir=`grep "innobackupex: Backup created in directory" $OUTFILE | tail -n 1 | awk -F\' '{print $2}'`
+vlog "Incremental backup done to filder $inc_backup_dir"
+
+vlog "Preparing backup"
+# Prepare backup
+echo "##############" >> $OUTFILE
+echo "# PREPARE #1 #" >> $OUTFILE
+echo "##############" >> $OUTFILE
+innobackupex --defaults-file=$topdir/my.cnf --apply-log --redo-only $full_backup_dir >> $OUTFILE 2>&1 || die "innobackupex died with exit code $?"
+vlog "Log applied to full backup"
+echo "##############" >> $OUTFILE
+echo "# PREPARE #2 #" >> $OUTFILE
+echo "##############" >> $OUTFILE
+innobackupex --defaults-file=$topdir/my.cnf --apply-log --redo-only --incremental-dir=$inc_backup_dir $full_backup_dir >> $OUTFILE 2>&1 || die "innobackupex died with exit code $?"
+vlog "Delta applied to full backup"
+echo "##############" >> $OUTFILE
+echo "# PREPARE #3 #" >> $OUTFILE
+echo "##############" >> $OUTFILE
+innobackupex --defaults-file=$topdir/my.cnf --apply-log $full_backup_dir >> $OUTFILE 2>&1 || die "innobackupex died with exit code $?"
+vlog "Data prepared for restore"
+
+# Destroying mysql data
+stop_mysqld
+rm -rf $mysql_datadir/*
+vlog "Data destroyed"
+
+# Restore backup
+vlog "Copying files"
+run_cmd innobackupex --defaults-file=$topdir/my.cnf --copy-back $full_backup_dir
+vlog "Data restored"
+
+run_mysqld --innodb_file_per_table
+
+vlog "Cheking checksums"
+checksum_b=`${MYSQL} ${MYSQL_ARGS} -Ns -e "checksum table test;" incremental_sample | awk '{print $2}'`
+
+if [ $checksum_a -ne $checksum_b  ]
+then 
+	vlog "Checksums are not equal"
+	exit -1
+fi
+
+vlog "Checksums are OK"
+
+stop_mysqld
+clean