Merge lp:~sergei.glushchenko/percona-xtrabackup/BT-26901-2.1 into lp:percona-xtrabackup/2.1

[Sergei Glushchenko]

Merge fix for #1066843 from 2.0

http://jenkins.percona.com/view/XtraBackup/job/percona-xtrabackup-2.1-param/66/

[Sergei Glushchenko (sergei.glushchenko)]

#26901

[Laurynas Biveinis (laurynas-biveinis)]

There is a conflict in innobackupex.

(Just a heads-up, not a full review)

review: Needs Fixing

[Laurynas Biveinis (laurynas-biveinis)]

Ah, wrong target branch.

[Sergei Glushchenko (sergei.glushchenko)]

Resubmitted to 2.1

[Laurynas Biveinis (laurynas-biveinis)]

Same comments as for 2.0 (in 2.1 please use innodb_int for the wrapper).

review: Needs Fixing

[Sergei Glushchenko (sergei.glushchenko)]

Same comments as for 2.0

http://jenkins.percona.com/view/XtraBackup/job/percona-xtrabackup-2.1-param/70/

[Laurynas Biveinis (laurynas-biveinis)]

OK with innodb_int.h changes following the style used in the rest in that file.

review: Approve

[Laurynas Biveinis (laurynas-biveinis)]

Please re-push and set to "Approved" then, thanks.

[Alexey Kopytov (akopytov)]

See comments in the 2.0 MP.

review: Needs Fixing

[Alexey Kopytov (akopytov)]

review: Approve

=== modified file 'innobackupex'
--- innobackupex	2012-11-07 06:45:28 +0000
+++ innobackupex	2012-11-15 16:55:39 +0000
@@ -700,6 +700,13 @@
     my $file;
     my $backup_innodb_data_file_path;
 
+    if (has_option(\%config, $option_defaults_group, 'innodb_doublewrite_file')) {
+        my $doublewrite_file =
+                get_option(\%config, $option_defaults_group,
+                            'innodb_doublewrite_file');
+        $excluded_files = $excluded_files . '|' . $doublewrite_file;
+    }
+
     # check whether files should be copied or moved to dest directory
     my $move_or_copy_file = $move_flag ? \&move_file : \&copy_file;
     my $move_or_copy_dir = $move_flag ?
@@ -1590,7 +1597,7 @@
         "innodb_log_file_size",
         "innodb_fast_checksum",
         "innodb_page_size",
-        "innodb_log_block_size",
+        "innodb_log_block_size"
         );
 
     my $options_dump = "# This MySQL options file was generated by $innobackup_script.\n\n" .
@@ -1604,6 +1611,12 @@
             $options_dump .= "$option_name=$option_value\n";
         }
     }
+    if (has_option(\%config,
+        $option_defaults_group, "innodb_doublewrite_file")) {
+        $options_dump .= "innodb_doublewrite_file=" . (split(/\/+/,
+                get_option(\%config, $option_defaults_group,
+                            'innodb_doublewrite_file')))[-1] . "\n";
+    }
 
     print FILE $options_dump;
     close(FILE);

=== modified file 'src/xtrabackup.c'
--- src/xtrabackup.c	2012-11-08 23:42:20 +0000
+++ src/xtrabackup.c	2012-11-15 16:55:39 +0000
@@ -3879,7 +3879,9 @@
 	os_file_t	file	= 0;
 	ulint		tablespace_flags;
 
-	ut_a(dbname != NULL || space_id == 0 || space_id == ULINT_UNDEFINED);
+	ut_a(dbname != NULL ||
+		trx_sys_sys_space(space_id) ||
+		space_id == ULINT_UNDEFINED);
 
 	*success = FALSE;
 
@@ -3908,6 +3910,10 @@
 		return file;
 	}
 
+	if (trx_sys_sys_space(space_id)) {
+		goto found;
+	}
+
 	mutex_enter(&fil_system->mutex);
 	fil_space = xb_space_get_by_name(dest_space_name);
 	mutex_exit(&fil_system->mutex);
@@ -5156,6 +5162,9 @@
 		printf("innodb_fast_checksum = %d\n", innobase_fast_checksum);
 		printf("innodb_page_size = %ld\n", innobase_page_size);
 		printf("innodb_log_block_size = %lu\n", innobase_log_block_size);
+		if (innobase_doublewrite_file != NULL) {
+			printf("innodb_doublewrite_file = %s\n", innobase_doublewrite_file);
+		}
 #endif
 		exit(EXIT_SUCCESS);
 	}

=== added file 'test/t/ib_doublewrite.sh'
--- test/t/ib_doublewrite.sh	1970-01-01 00:00:00 +0000
+++ test/t/ib_doublewrite.sh	2012-11-15 16:55:39 +0000
@@ -0,0 +1,120 @@
+########################################################################
+# Bug #1066843: Fix for bug #932623 does not take separate doublewrite
+#               tablespace into account
+# Bug #1068470: XtraBackup handles separate doublewrite buffer file
+#               incorrectly
+# We testing full and incremental backup and restore to check that
+# separate doublewrite buffer file handled correctly
+########################################################################
+
+. inc/common.sh
+
+if [ -z "$XTRADB_VERSION" ]; then
+    echo "Requires XtraDB" > $SKIPPED_REASON
+    exit $SKIPPED_EXIT_CODE
+fi
+
+DBLWR=${TEST_BASEDIR}/var1/data/dblwr.ibd
+start_server --innodb_file_per_table --innodb_doublewrite_file=${DBLWR}
+load_dbase_schema incremental_sample
+
+# Workaround for bug #1072695
+IB_ARGS_NO_DEFAULTS_FILE=`echo $IB_ARGS | sed -e 's/--defaults-file=[^ ]* / /'`
+function innobackupex_no_defaults_file ()
+{
+	run_cmd $IB_BIN $IB_ARGS_NO_DEFAULTS_FILE $*
+}
+
+echo "innodb_doublewrite_file=${DBLWR}" >>$topdir/my.cnf
+
+# Adding initial rows
+vlog "Adding initial rows to database..."
+${MYSQL} ${MYSQL_ARGS} -e "insert into test values (1, 1);" incremental_sample
+
+# Full backup
+# backup root directory
+mkdir -p $topdir/backup
+
+vlog "Starting backup"
+full_backup_dir=$topdir/backup/full
+innobackupex  --no-timestamp $full_backup_dir
+vlog "Full backup done to directory $full_backup_dir"
+cat $full_backup_dir/backup-my.cnf
+
+# Changing data
+
+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 test values (10, 1);" incremental_sample
+${MYSQL} ${MYSQL_ARGS} -e "insert into t2 values (10, 1);" incremental_sample
+vlog "Changes done"
+
+# Saving the checksum of original table
+checksum_test_a=`checksum_table incremental_sample test`
+checksum_t2_a=`checksum_table incremental_sample t2`
+vlog "Table 'test' checksum is $checksum_test_a"
+vlog "Table 't2' checksum is $checksum_t2_a"
+
+vlog "Making incremental backup"
+
+vlog "###############"
+vlog "# INCREMENTAL #"
+vlog "###############"
+
+# Incremental backup
+inc_backup_dir=$topdir/backup/inc
+innobackupex --no-timestamp --incremental --incremental-basedir=$full_backup_dir \
+    $inc_backup_dir
+vlog "Incremental backup done to directory $inc_backup_dir"
+
+vlog "Preparing backup"
+# Prepare backup
+vlog "##############"
+vlog "# PREPARE #1 #"
+vlog "##############"
+innobackupex_no_defaults_file --apply-log --redo-only $full_backup_dir
+vlog "Log applied to full backup"
+vlog "##############"
+vlog "# PREPARE #2 #"
+vlog "##############"
+innobackupex_no_defaults_file --apply-log --redo-only --incremental-dir=$inc_backup_dir \
+    $full_backup_dir
+vlog "Delta applied to full backup"
+vlog "##############"
+vlog "# PREPARE #3 #"
+vlog "##############"
+innobackupex_no_defaults_file --apply-log $full_backup_dir
+vlog "Data prepared for restore"
+
+# Destroying mysql data
+stop_server
+rm -rf $mysql_datadir/*
+vlog "Data destroyed"
+
+# Restore backup
+vlog "Copying files"
+vlog "###########"
+vlog "# RESTORE #"
+vlog "###########"
+innobackupex --copy-back $full_backup_dir
+vlog "Data restored"
+
+start_server --innodb_file_per_table --innodb_doublewrite_file=${DBLWR}
+
+vlog "Checking checksums"
+checksum_test_b=`checksum_table incremental_sample test`
+checksum_t2_b=`checksum_table incremental_sample t2`
+
+if [ "$checksum_test_a" != "$checksum_test_b"  ]
+then 
+	vlog "Checksums for table 'test' are not equal"
+	exit -1
+fi
+
+if [ "$checksum_t2_a" != "$checksum_t2_b"  ]
+then 
+	vlog "Checksums for table 't2' are not equal"
+	exit -1
+fi
+
+vlog "Checksums are OK"