Merge lp:~sergei.glushchenko/percona-xtrabackup/xb21-bug976945 into lp:percona-xtrabackup/2.1

[Sergei Glushchenko]

Bug976945: innodb_log_block_size=4096 is not supported
When called with --prepare xtrabackup didn't initialize
log_block_size properly.
Solution is to initialize log_block_size from inside
xtrabackup_init_temp_log when --prepare called.

#24231

[Alexey Kopytov (akopytov)]

Same comments as in https://code.launchpad.net/~sergei.glushchenko/percona-xtrabackup/xb20-bug976945/+merge/110468

review: Needs Fixing

[Alexey Kopytov (akopytov)]

Approved. In the future, when you're merging a revision from a lower version branch, just say it's a merge in revision comments, there's no need to duplicate the revision comment from that branch.

review: Approve

=== modified file 'src/xtrabackup.c'
--- src/xtrabackup.c	2012-06-14 14:48:55 +0000
+++ src/xtrabackup.c	2012-06-18 03:45:25 +0000
@@ -681,7 +681,7 @@
    (G_PTR*) &innobase_page_size, (G_PTR*) &innobase_page_size, 0,
    GET_LONG, REQUIRED_ARG, (1 << 14), (1 << 12), (1 << UNIV_PAGE_SIZE_SHIFT_MAX), 0, 1L, 0},
   {"innodb_log_block_size", OPT_INNODB_LOG_BLOCK_SIZE,
-  "###EXPERIMENTAL###: The log block size of the transaction log file. "
+  "The log block size of the transaction log file. "
    "Changing for created log file is not supported. Use on your own risk!",
    (G_PTR*) &innobase_log_block_size, (G_PTR*) &innobase_log_block_size, 0,
    GET_ULONG, REQUIRED_ARG, 512, 512, 1 << UNIV_PAGE_SIZE_SHIFT_MAX, 0, 1L, 0},
@@ -862,6 +862,34 @@
   return 0;
 }
 
+/***********************************************************************
+Initializes log_block_size*/
+static
+ibool
+xb_init_log_block_size(void)
+{
+#ifdef XTRADB_BASED
+	srv_log_block_size = 0;
+	if (innobase_log_block_size != 512) {
+		uint	n_shift = get_bit_shift(innobase_log_block_size);;
+
+		if (n_shift > 0) {
+			srv_log_block_size = (1 << n_shift);
+			msg("InnoDB: The log block size is set to %lu.\n",
+			    srv_log_block_size);
+		}
+	} else {
+		srv_log_block_size = 512;
+	}
+	if (!srv_log_block_size) {
+		msg("InnoDB: Error: %lu is not valid value for "
+		    "innodb_log_block_size.\n", innobase_log_block_size);
+		return FALSE;
+	}
+#endif
+	return TRUE;
+}
+
 static my_bool
 innodb_init_param(void)
 {
@@ -903,25 +931,7 @@
 		srv_page_size = (1 << srv_page_size_shift);
 	}
 
-	srv_log_block_size = 0;
-	if (innobase_log_block_size != 512) {
-		uint	n_shift = get_bit_shift(innobase_log_block_size);;
-
-		msg("InnoDB: Warning: innodb_log_block_size has "
-		    "been changed from its default value. "
-		    "(###EXPERIMENTAL### operation)\n");
-		if (n_shift > 0) {
-			srv_log_block_size = (1 << n_shift);
-			msg("InnoDB: The log block size is set to %lu.\n",
-			    srv_log_block_size);
-		}
-	} else {
-		srv_log_block_size = 512;
-	}
-
-	if (!srv_log_block_size) {
-		msg("InnoDB: Error: %lu is not valid value for "
-		    "innodb_log_block_size.\n", innobase_log_block_size);
+	if (!xb_init_log_block_size()) {
 		goto error;
 	}
 
@@ -3402,6 +3412,10 @@
 
 	max_no = ut_dulint_zero;
 
+	if (!xb_init_log_block_size()) {
+		goto error;
+	}
+
 	if(!xtrabackup_incremental_dir) {
 		sprintf(dst_path, "%s/ib_logfile0", xtrabackup_target_dir);
 		sprintf(src_path, "%s/%s", xtrabackup_target_dir,
 
=== added file 'test/t/bug976945.sh'
--- test/t/bug976945.sh	1970-01-01 00:00:00 +0000
+++ test/t/bug976945.sh	2012-06-18 03:45:25 +0000
@@ -0,0 +1,35 @@
+############################################################################
+# Bug #976945: innodb_log_block_size=4096 is not supported
+############################################################################
+. inc/common.sh
+
+if [ -z "$XTRADB_VERSION" ]; then
+    echo "Requires XtraDB" > $SKIPPED_REASON
+    exit $SKIPPED_EXIT_CODE
+fi
+
+start_server --innodb_log_block_size=4096
+echo innodb_log_block_size=4096 >> ${MYSQLD_VARDIR}/my.cnf
+load_sakila
+
+# Full backup
+vlog "Starting backup"
+
+full_backup_dir=${MYSQLD_VARDIR}/full_backup
+innobackupex  --no-timestamp $full_backup_dir
+
+vlog "Preparing backup"
+innobackupex --apply-log --redo-only $full_backup_dir
+vlog "Log applied to full backup"
+
+# Destroying mysql data
+stop_server
+rm -rf $mysql_datadir/*
+vlog "Data destroyed"
+
+# Restore backup
+vlog "Copying files to their original locations"
+innobackupex --copy-back $full_backup_dir
+vlog "Data restored"
+
+start_server --innodb_log_block_size=4096