Merge lp:~laurynas-biveinis/percona-server/BT-16274-bug1111226-5.1 into lp:percona-server/5.1

[Laurynas Biveinis]

2nd MP: unify 5.1 and 5.5 tests.
http://jenkins.percona.com/job/percona-server-5.1-param/520/

Fix bug 1111226 for 5.1
No BT or ST, but 16274 QA

Fix bug 1111226 (Writing larger than 4GB bitmap file fails; bitmap
write error causes heap corruption).

The first issue is incorrect higher 32 bits of write offset
calculation: the 64-bit offset was shifted to the left instead of the
right, fixed trivially.

The second issue is that if a bitmap page write fails (for example,
due to the condition above), then log_online_write_bitmap() exits
prematurely with a return code signalling error. But, if at least one
bitmap page was written successfully, then the written bitmap tree
nodes will be doubly pointed to: from the bitmap tree itself and from
the free node list. This will cause a heap corruption on the log
following thread shutdown (which happens immediatelly in the case of
bitmap write error).

Fixed by keeping iterating over the bitmap tree in case of error, but
skipping the actual write. This way all the tree nodes are moved to
free list for the subsequent cleanup.

Add a write failure injection site and a new testcase
percona_changed_page_debug.

[George Ormond Lorch III (gl-az)]

percona_changed_page_bmp_debug.test is slightly different from 5.5 MP in the way the server restarts are structured and order of:
RESET CHANGED_PAGE_BITMAPS;
CREATE TABLE t1 (x INT) ENGINE=InnoDB;

Is this intentional?

review: Needs Information (g2)

[Laurynas Biveinis (laurynas-biveinis)]

Discussion on the 5.5 MP.

[Laurynas Biveinis (laurynas-biveinis)]

review: Needs Fixing

[George Ormond Lorch III (gl-az)]

review: Approve (g2)

[Stewart Smith (stewart)]

review: Approve

=== added file 'Percona-Server/mysql-test/suite/innodb_plugin/r/percona_changed_page_bmp_debug.result'
--- Percona-Server/mysql-test/suite/innodb_plugin/r/percona_changed_page_bmp_debug.result	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/suite/innodb_plugin/r/percona_changed_page_bmp_debug.result	2013-02-07 10:52:23 +0000
@@ -0,0 +1,23 @@
+DROP TABLE IF EXISTS t1;
+call mtr.add_suppression("InnoDB: Error: log tracking bitmap write failed, stopping log tracking thread!");
+1st restart
+RESET CHANGED_PAGE_BITMAPS;
+CREATE TABLE t1 (x INT) ENGINE=InnoDB;
+2nd restart
+INSERT INTO t1 VALUES (1),(2),(3),(4),(5);
+INSERT INTO t1 VALUES (1),(2),(3),(4),(5);
+INSERT INTO t1 VALUES (1),(2),(3),(4),(5);
+INSERT INTO t1 SELECT x FROM t1;
+INSERT INTO t1 SELECT x FROM t1;
+INSERT INTO t1 SELECT x FROM t1;
+INSERT INTO t1 SELECT x FROM t1;
+INSERT INTO t1 SELECT x FROM t1;
+INSERT INTO t1 SELECT x FROM t1;
+INSERT INTO t1 SELECT x FROM t1;
+INSERT INTO t1 SELECT x FROM t1;
+INSERT INTO t1 SELECT x FROM t1;
+INSERT INTO t1 SELECT x FROM t1;
+INSERT INTO t1 SELECT x FROM t1;
+INSERT INTO t1 SELECT x FROM t1;
+3rd restart
+DROP TABLE t1;

=== added file 'Percona-Server/mysql-test/suite/innodb_plugin/t/percona_changed_page_bmp_debug-master.opt'
--- Percona-Server/mysql-test/suite/innodb_plugin/t/percona_changed_page_bmp_debug-master.opt	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/suite/innodb_plugin/t/percona_changed_page_bmp_debug-master.opt	2013-02-07 10:52:23 +0000
@@ -0,0 +1,1 @@
+--innodb_track_changed_pages=TRUE --innodb_log_file_size=1M

=== added file 'Percona-Server/mysql-test/suite/innodb_plugin/t/percona_changed_page_bmp_debug.test'
--- Percona-Server/mysql-test/suite/innodb_plugin/t/percona_changed_page_bmp_debug.test	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/suite/innodb_plugin/t/percona_changed_page_bmp_debug.test	2013-02-07 10:52:23 +0000
@@ -0,0 +1,56 @@
+#
+# Non-crash tests for the changed page bitmaps that require debug builds
+#
+--source include/have_debug.inc
+--source include/have_innodb_plugin.inc
+
+--disable_warnings
+DROP TABLE IF EXISTS t1;
+--enable_warnings
+
+let $MYSQLD_DATADIR= `select @@datadir`;
+
+call mtr.add_suppression("InnoDB: Error: log tracking bitmap write failed, stopping log tracking thread!");
+
+--echo 1st restart
+--source include/restart_mysqld.inc
+RESET CHANGED_PAGE_BITMAPS;
+CREATE TABLE t1 (x INT) ENGINE=InnoDB;
+
+#
+# Test for bug 1111226: test that bitmap write errors are handled gracefully
+#
+
+# Setup an error on bitmap write
+--echo 2nd restart
+--exec echo "wait" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
+--shutdown_server 10
+--source include/wait_until_disconnected.inc
+--enable_reconnect
+--exec echo "restart:-#d,bitmap_page_write_error" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
+--source include/wait_until_connected_again.inc
+
+# Generate log data that is larger than the log capacity
+INSERT INTO t1 VALUES (1),(2),(3),(4),(5);
+INSERT INTO t1 VALUES (1),(2),(3),(4),(5);
+INSERT INTO t1 VALUES (1),(2),(3),(4),(5);
+INSERT INTO t1 SELECT x FROM t1;
+INSERT INTO t1 SELECT x FROM t1;
+INSERT INTO t1 SELECT x FROM t1;
+INSERT INTO t1 SELECT x FROM t1;
+INSERT INTO t1 SELECT x FROM t1;
+INSERT INTO t1 SELECT x FROM t1;
+INSERT INTO t1 SELECT x FROM t1;
+INSERT INTO t1 SELECT x FROM t1;
+INSERT INTO t1 SELECT x FROM t1;
+INSERT INTO t1 SELECT x FROM t1;
+INSERT INTO t1 SELECT x FROM t1;
+INSERT INTO t1 SELECT x FROM t1;
+
+# At this point the log tracker thread should have quit
+# TODO: test its status through I_S query once the table is implemented
+
+--echo 3rd restart
+--source include/restart_mysqld.inc
+
+DROP TABLE t1;

=== modified file 'Percona-Server/storage/innodb_plugin/log/log0online.c'
--- Percona-Server/storage/innodb_plugin/log/log0online.c	2013-02-07 05:14:23 +0000
+++ Percona-Server/storage/innodb_plugin/log/log0online.c	2013-02-07 10:52:23 +0000
@@ -1073,10 +1073,13 @@
 
 	ut_ad(mutex_own(&log_bmp_sys->mutex));
 
+	/* Simulate a write error */
+	DBUG_EXECUTE_IF("bitmap_page_write_error", return FALSE;);
+
 	success = os_file_write(log_bmp_sys->out.name, log_bmp_sys->out.file,
 				block,
 				(ulint)(log_bmp_sys->out.offset & 0xFFFFFFFF),
-				(ulint)(log_bmp_sys->out.offset << 32),
+				(ulint)(log_bmp_sys->out.offset >> 32),
 				MODIFIED_PAGE_BLOCK_SIZE);
 	if (UNIV_UNLIKELY(!success)) {
 
@@ -1119,6 +1122,7 @@
 {
 	ib_rbt_node_t		*bmp_tree_node;
 	const ib_rbt_node_t	*last_bmp_tree_node;
+	ibool			success = TRUE;
 
 	ut_ad(mutex_own(&log_bmp_sys->mutex));
 
@@ -1136,19 +1140,24 @@
 
 		byte *page = rbt_value(byte, bmp_tree_node);
 
-		if (bmp_tree_node == last_bmp_tree_node) {
-			mach_write_to_4(page + MODIFIED_PAGE_IS_LAST_BLOCK, 1);
-		}
-
-		mach_write_ull(page + MODIFIED_PAGE_START_LSN,
-			       log_bmp_sys->start_lsn);
-		mach_write_ull(page + MODIFIED_PAGE_END_LSN,
-			       log_bmp_sys->end_lsn);
-		mach_write_to_4(page + MODIFIED_PAGE_BLOCK_CHECKSUM,
-				log_online_calc_checksum(page));
-
-		if (!log_online_write_bitmap_page(page)) {
-			return FALSE;
+		/* In case of a bitmap page write error keep on looping over
+		the tree to reclaim its memory through the free list instead of
+		returning immediatelly. */
+		if (UNIV_LIKELY(success)) {
+			if (bmp_tree_node == last_bmp_tree_node) {
+				mach_write_to_4(page
+						+ MODIFIED_PAGE_IS_LAST_BLOCK,
+						1);
+			}
+
+			mach_write_ull(page + MODIFIED_PAGE_START_LSN,
+				       log_bmp_sys->start_lsn);
+			mach_write_ull(page + MODIFIED_PAGE_END_LSN,
+				       log_bmp_sys->end_lsn);
+			mach_write_to_4(page + MODIFIED_PAGE_BLOCK_CHECKSUM,
+					log_online_calc_checksum(page));
+
+			success = log_online_write_bitmap_page(page);
 		}
 
 		bmp_tree_node->left = log_bmp_sys->page_free_list;
@@ -1159,7 +1168,7 @@
 	}
 
 	rbt_reset(log_bmp_sys->modified_pages);
-	return TRUE;
+	return success;
 }
 
 /*********************************************************************//**