Merge lp:~laurynas-biveinis/percona-server/bug1305364-5.6 into lp:percona-server/5.6

[Laurynas Biveinis]

Merge bug 1305364 (InnoDB: Assertion failure in file buf0flu.cc line
546 | crashes if RW workload and InnoDB compression are combined) from
5.5 and null-merge fix for bug 1219833.

The automerged bits from 5.5 are extra assertions in
buf_flush_page_and_try_neighbors and buf_flush_or_remove_pages. All
other 5.5 bits have been null-merged.

The 5.6-specific extra fixes implemented:
- in btr_search_validate_one_table: lock LRU list mutex around
  buf_page_get_state/buf_block_hash_get calls. That's a
  counterintuitive way to achieve the correct locking, but the obvious
  option of moving up the block mutex locking would violate the
  locking order with page_hash locking performed by
  buf_block_hash_get, and locking page_hash earlier would require
  verbose changes to lock to get the right latch, unlock, relock,
  check the state.
- in buf_flush_ready_for_flush: accept BUF_BLOCK_REMOVE_HASH pages (if
  LRU list is unlocked), return false for them.
- in buf_page_get_block: assert that page hash is S or X latched or
  that LRU list mutex is held.

http://jenkins.percona.com/job/percona-server-5.6-param/593/
Not sure if G1 or G2

[Vlad Lesin (vlad-lesin)]

Looks good for me.

review: Approve (g2)

=== modified file 'storage/innobase/btr/btr0sea.cc'
--- storage/innobase/btr/btr0sea.cc	2013-10-23 08:48:28 +0000
+++ storage/innobase/btr/btr0sea.cc	2014-04-24 16:39:10 +0000
@@ -1944,7 +1944,10 @@
 			buf_pool_t*		buf_pool;
 			index_id_t		page_index_id;
 
-			buf_pool = buf_pool_from_bpage((buf_page_t*) block);
+			buf_pool = buf_pool_from_bpage((buf_page_t *) block);
+			/* Prevent BUF_BLOCK_FILE_PAGE -> BUF_BLOCK_REMOVE_HASH
+			transition until we lock the block mutex */
+			mutex_enter(&buf_pool->LRU_list_mutex);
 
 			if (UNIV_LIKELY(buf_block_get_state(block)
 					== BUF_BLOCK_FILE_PAGE)) {
@@ -1980,6 +1983,7 @@
 			}
 
 			mutex_enter(&block->mutex);
+			mutex_exit(&buf_pool->LRU_list_mutex);
 
 			ut_a(!dict_index_is_ibuf(block->index));
 

=== modified file 'storage/innobase/buf/buf0flu.cc'
--- storage/innobase/buf/buf0flu.cc	2014-03-26 13:14:09 +0000
+++ storage/innobase/buf/buf0flu.cc	2014-04-24 16:39:10 +0000
@@ -546,7 +546,12 @@
 	ut_ad(flush_type < BUF_FLUSH_N_TYPES);
 	ut_ad(mutex_own(buf_page_get_mutex(bpage))
 	      || flush_type == BUF_FLUSH_LIST);
-	ut_a(buf_page_in_file(bpage));
+	ut_a(buf_page_in_file(bpage)
+	     || (buf_page_get_state(bpage) == BUF_BLOCK_REMOVE_HASH
+#ifdef UNIV_DEBUG
+		 && !mutex_own(&buf_pool_from_bpage(bpage)->LRU_list_mutex)
+#endif
+		     ));
 
 	if (bpage->oldest_modification == 0
 	    || buf_page_get_io_fix_unlocked(bpage) != BUF_IO_NONE) {
@@ -557,6 +562,7 @@
 
 	switch (flush_type) {
 	case BUF_FLUSH_LIST:
+		return(buf_page_get_state(bpage) != BUF_BLOCK_REMOVE_HASH);
 	case BUF_FLUSH_LRU:
 	case BUF_FLUSH_SINGLE_PAGE:
 		return(true);
@@ -1361,7 +1367,11 @@
 	}
 
 	ut_a(buf_page_in_file(bpage)
-	     || buf_page_get_state(bpage) == BUF_BLOCK_REMOVE_HASH);
+	     || (buf_page_get_state(bpage) == BUF_BLOCK_REMOVE_HASH
+#ifdef UNIV_DEBUG
+		 && !mutex_own(&buf_pool->LRU_list_mutex)
+#endif
+		 ));
 
 	if (buf_flush_ready_for_flush(bpage, flush_type)) {
 		buf_pool_t*	buf_pool;

=== modified file 'storage/innobase/buf/buf0lru.cc'
--- storage/innobase/buf/buf0lru.cc	2014-02-17 11:12:40 +0000
+++ storage/innobase/buf/buf0lru.cc	2014-04-24 16:39:10 +0000
@@ -595,6 +595,8 @@
 	buf_page_t*	bpage;
 	ulint		processed = 0;
 
+	ut_ad(mutex_own(&buf_pool->LRU_list_mutex));
+
 	buf_flush_list_mutex_enter(buf_pool);
 
 rescan:

=== modified file 'storage/innobase/include/buf0buf.ic'
--- storage/innobase/include/buf0buf.ic	2014-02-17 11:12:40 +0000
+++ storage/innobase/include/buf0buf.ic	2014-04-24 16:39:10 +0000
@@ -662,6 +662,11 @@
 	buf_page_t*	bpage)	/*!< in: control block, or NULL */
 {
 	if (bpage != NULL) {
+#ifdef UNIV_DEBUG
+		buf_pool_t*	buf_pool	= buf_pool_from_bpage(bpage);
+		ut_ad(buf_page_hash_lock_held_s_or_x(buf_pool, bpage)
+		      || mutex_own(&buf_pool->LRU_list_mutex));
+#endif
 		ut_ad(buf_page_in_file(bpage));
 
 		if (buf_page_get_state(bpage) == BUF_BLOCK_FILE_PAGE) {