Merge lp:~laurynas-biveinis/percona-server/rm-lazy-drop-table-5.5 into lp:percona-server/5.5

[Laurynas Biveinis]

Remove the lazy drop table implementation, implementing
https://blueprints.launchpad.net/percona-server/+spec/remove-lazy-drop-table.

Coincidentally this also fixes:
- bug 1086227 (InnoDB: Assertion failure in thread <nr> in file
dict0dict.c line 1883 | in dict_index_remove_from_cache | on ALTER
TABLE (related to Bug 897258));
- bug 1128848 (InnoDB: Failing assertion: node->n_pending == 0 in file
fil0fil.c line 2415 | abort in fil_delete_tablespace).

The lazy drop table removal is implemented as follows:
- removing buf_page_struct::space_was_being_deleted and all its
checks;
- removing buf_LRU_mark_space_was_deleted();
- replacing global srv_lazy_drop_table declared/defined in
srv0srv.h/.c with a static global variable in ha_innodb.cc;
- printing a warning if lazy drop table is enabled;
- adjusting the variable help text;
- removing srv_lazy_drop_table check from fil_delete_tablespace().

http://jenkins.percona.com/job/percona-server-5.5-param/719/ does not look really good, but the failures (especially the innodb.innodb_bug60049 one) agree with the last three trunk build failures.

[Laurynas Biveinis (laurynas-biveinis)]

The diff conflict will have to be resolved at the time of the branch merge to the trunk. It does not block reviews.

[Alexey Kopytov (akopytov)]

review: Approve

=== modified file 'Percona-Server/storage/innobase/buf/buf0buf.c'
--- Percona-Server/storage/innobase/buf/buf0buf.c	2013-03-26 07:16:53 +0000
+++ Percona-Server/storage/innobase/buf/buf0buf.c	2013-04-04 07:23:28 +0000
@@ -2002,27 +2002,6 @@
 #endif /* UNIV_DEBUG || UNIV_BUF_DEBUG */
 	}
 
-	if (UNIV_UNLIKELY(bpage->space_was_being_deleted)) {
-		/* This page is obsoleted, should discard and retry */
-		rw_lock_s_unlock(&buf_pool->page_hash_latch);
-
-		mutex_enter(&buf_pool->LRU_list_mutex);
-		block_mutex = buf_page_get_mutex_enter(bpage);
-
-		if (UNIV_UNLIKELY(!block_mutex)) {
-			mutex_exit(&buf_pool->LRU_list_mutex);
-			goto lookup;
-		}
-
-		buf_LRU_free_block(bpage, TRUE, TRUE);
-
-		mutex_exit(&buf_pool->LRU_list_mutex);
-		mutex_exit(block_mutex);
-		block_mutex = NULL;
-
-		goto lookup;
-	}
-
 	if (UNIV_UNLIKELY(!bpage->zip.data)) {
 		/* There is no compressed page. */
 err_exit:
@@ -2533,26 +2512,6 @@
 		block = (buf_block_t*) buf_page_hash_get_low(
 			buf_pool, space, offset, fold);
 		if (block) {
-			if (UNIV_UNLIKELY(block->page.space_was_being_deleted)) {
-				/* This page is obsoleted, should discard and retry */
-				rw_lock_s_unlock(&buf_pool->page_hash_latch);
-
-				mutex_enter(&buf_pool->LRU_list_mutex);
-				block_mutex = buf_page_get_mutex_enter((buf_page_t*)block);
-
-				if (UNIV_UNLIKELY(!block_mutex)) {
-					mutex_exit(&buf_pool->LRU_list_mutex);
-					goto loop;
-				}
-
-				buf_LRU_free_block((buf_page_t*)block, TRUE, TRUE);
-
-				mutex_exit(&buf_pool->LRU_list_mutex);
-				mutex_exit(block_mutex);
-				block_mutex = NULL;
-
-				goto loop;
-			}
 
 			block_mutex = buf_page_get_mutex_enter((buf_page_t*)block);
 			ut_a(block_mutex);
@@ -3488,28 +3447,12 @@
 
 	fold = buf_page_address_fold(space, offset);
 
-retry:
 	//buf_pool_mutex_enter(buf_pool);
 	mutex_enter(&buf_pool->LRU_list_mutex);
 	rw_lock_x_lock(&buf_pool->page_hash_latch);
 
 	watch_page = buf_page_hash_get_low(buf_pool, space, offset, fold);
 
-	if (UNIV_UNLIKELY(watch_page && watch_page->space_was_being_deleted)) {
-		mutex_t*	block_mutex = buf_page_get_mutex_enter(watch_page);
-
-		/* This page is obsoleted, should discard and retry */
-		rw_lock_x_unlock(&buf_pool->page_hash_latch);
-		ut_a(block_mutex);
-
-		buf_LRU_free_block(watch_page, TRUE, TRUE);
-
-		mutex_exit(&buf_pool->LRU_list_mutex);
-		mutex_exit(block_mutex);
-
-		goto retry;
-	}
-
 	if (watch_page && !buf_pool_watch_is_sentinel(buf_pool, watch_page)) {
 		/* The page is already in the buffer pool. */
 		watch_page = NULL;
@@ -3638,7 +3581,6 @@
 		bpage->state	= BUF_BLOCK_ZIP_PAGE;
 		bpage->space	= space;
 		bpage->offset	= offset;
-		bpage->space_was_being_deleted = FALSE;
 
 #ifdef UNIV_DEBUG
 		bpage->in_page_hash = FALSE;
@@ -3723,7 +3665,6 @@
 
 	fold = buf_page_address_fold(space, offset);
 
-retry:
 	//buf_pool_mutex_enter(buf_pool);
 	mutex_enter(&buf_pool->LRU_list_mutex);
 	rw_lock_x_lock(&buf_pool->page_hash_latch);
@@ -3731,21 +3672,6 @@
 	block = (buf_block_t*) buf_page_hash_get_low(
 		buf_pool, space, offset, fold);
 
-	if (UNIV_UNLIKELY(block && block->page.space_was_being_deleted)) {
-		mutex_t*	block_mutex = buf_page_get_mutex_enter((buf_page_t*)block);
-
-		/* This page is obsoleted, should discard and retry */
-		rw_lock_x_unlock(&buf_pool->page_hash_latch);
-		ut_a(block_mutex);
-
-		buf_LRU_free_block((buf_page_t*)block, TRUE, TRUE);
-
-		mutex_exit(&buf_pool->LRU_list_mutex);
-		mutex_exit(block_mutex);
-
-		goto retry;
-	}
-
 	if (block
 	    && buf_page_in_file(&block->page)
 	    && !buf_pool_watch_is_sentinel(buf_pool, &block->page)) {

=== modified file 'Percona-Server/storage/innobase/buf/buf0flu.c'
--- Percona-Server/storage/innobase/buf/buf0flu.c	2013-02-18 04:48:10 +0000
+++ Percona-Server/storage/innobase/buf/buf0flu.c	2013-04-04 07:23:28 +0000
@@ -459,7 +459,7 @@
 
 	if (UNIV_LIKELY(bpage->in_LRU_list && buf_page_in_file(bpage))) {
 
-		return((bpage->oldest_modification == 0 || bpage->space_was_being_deleted)
+		return(bpage->oldest_modification == 0
 		       && buf_page_get_io_fix(bpage) == BUF_IO_NONE
 		       && bpage->buf_fix_count == 0);
 	}
@@ -501,13 +501,6 @@
 	    && buf_page_get_io_fix(bpage) == BUF_IO_NONE) {
 		ut_ad(bpage->in_flush_list);
 
-		if (bpage->space_was_being_deleted) {
-			/* should be removed from flush_list here */
-			/* because buf_flush_try_neighbors() cannot flush without fil_space_get_size(space) */
-			buf_flush_remove(bpage);
-			return(FALSE);
-		}
-
 		if (flush_type != BUF_FLUSH_LRU) {
 
 			return(TRUE);

=== modified file 'Percona-Server/storage/innobase/buf/buf0lru.c'
--- Percona-Server/storage/innobase/buf/buf0lru.c	2013-03-26 07:16:53 +0000
+++ Percona-Server/storage/innobase/buf/buf0lru.c	2013-04-04 07:23:28 +0000
@@ -884,42 +884,6 @@
 	}
 }
 
-/******************************************************************//**
-*/
-UNIV_INTERN
-void
-buf_LRU_mark_space_was_deleted(
-/*===========================*/
-	ulint	id)	/*!< in: space id */
-{
-	ulint	i;
-
-	for (i = 0; i < srv_buf_pool_instances; i++) {
-		buf_pool_t*	buf_pool;
-		buf_page_t*	bpage;
-
-		buf_pool = buf_pool_from_array(i);
-
-		mutex_enter(&buf_pool->LRU_list_mutex);
-
-		bpage = UT_LIST_GET_FIRST(buf_pool->LRU);
-
-		while (bpage != NULL) {
-			if (buf_page_get_space(bpage) == id) {
-				bpage->space_was_being_deleted = TRUE;
-			}
-			bpage = UT_LIST_GET_NEXT(LRU, bpage);
-		}
-
-		mutex_exit(&buf_pool->LRU_list_mutex);
-
-		/* The AHI entries for the tablespace being deleted should be
-		removed by now.  */
-		ut_ad(buf_LRU_drop_page_hash_for_tablespace(buf_pool, id)
-		      == 0);
-	}
-}
-
 #if defined UNIV_DEBUG || defined UNIV_BUF_DEBUG
 /********************************************************************//**
 Insert a compressed block into buf_pool->zip_clean in the LRU order. */
@@ -1891,10 +1855,6 @@
 		return(FALSE);
 	}
 
-	if (bpage->space_was_being_deleted && bpage->oldest_modification != 0) {
-		buf_flush_remove(bpage);
-	}
-
 #ifdef UNIV_IBUF_COUNT_DEBUG
 	ut_a(ibuf_count_get(bpage->space, bpage->offset) == 0);
 #endif /* UNIV_IBUF_COUNT_DEBUG */

=== modified file 'Percona-Server/storage/innobase/fil/fil0fil.c'
--- Percona-Server/storage/innobase/fil/fil0fil.c	2013-03-23 01:08:22 +0000
+++ Percona-Server/storage/innobase/fil/fil0fil.c	2013-04-04 07:23:28 +0000
@@ -2426,15 +2426,11 @@
 	To deal with potential read requests by checking the
 	::stop_new_ops flag in fil_io() */
 
-	if (srv_lazy_drop_table) {
-		buf_LRU_mark_space_was_deleted(id);
-	} else {
 	buf_LRU_flush_or_remove_pages(
 		id, evict_all
 		? BUF_REMOVE_ALL_NO_WRITE
 		: BUF_REMOVE_FLUSH_NO_WRITE);
 
-	}
 #endif
 	/* printf("Deleting tablespace %s id %lu\n", space->name, id); */
 
@@ -5304,22 +5300,6 @@
 		srv_data_written+= len;
 	}
 
-	/* if the table space was already deleted, space might not exist already. */
-	if (message
-	    && space_id < SRV_LOG_SPACE_FIRST_ID
-	    && ((buf_page_t*)message)->space_was_being_deleted) {
-
-		if (mode == OS_AIO_NORMAL) {
-			buf_page_io_complete(message);
-			return(DB_SUCCESS); /*fake*/
-		}
-		if (type == OS_FILE_READ) {
-			return(DB_TABLESPACE_DELETED);
-		} else {
-			return(DB_SUCCESS); /*fake*/
-		}
-	}
-
 	/* Reserve the fil_system mutex and make sure that we can open at
 	least one file while holding it, if the file is not already open */
 
@@ -5465,20 +5445,6 @@
 	}
 #endif
 
-	/* if the table space was already deleted, space might not exist already. */
-	if (message
-	    && space_id < SRV_LOG_SPACE_FIRST_ID
-	    && ((buf_page_t*)message)->space_was_being_deleted) {
-
-		if (mode == OS_AIO_SYNC) {
-			if (type == OS_FILE_READ) {
-				return(DB_TABLESPACE_DELETED);
-			} else {
-				return(DB_SUCCESS); /*fake*/
-			}
-		}
-	}
-
 	ut_a(ret);
 
 	if (mode == OS_AIO_SYNC) {
@@ -5601,21 +5567,6 @@
 					      &message, &type, &space_id);
 	}
 
-	/* if the table space was already deleted, fil_node might not exist already. */
-	if (message
-	    && space_id < SRV_LOG_SPACE_FIRST_ID
-	    && ((buf_page_t*)message)->space_was_being_deleted) {
-
-		/* intended not to be uncompress read page */
-		ut_a(buf_page_get_io_fix_unlocked(message) == BUF_IO_WRITE
-		     || !buf_page_get_zip_size(message)
-		     || buf_page_get_state(message) != BUF_BLOCK_FILE_PAGE);
-
-		srv_set_io_thread_op_info(segment, "complete io for buf page");
-		buf_page_io_complete(message);
-		return;
-	}
-
 	ut_a(ret);
 	if (UNIV_UNLIKELY(fil_node == NULL)) {
 		ut_ad(srv_shutdown_state == SRV_SHUTDOWN_EXIT_THREADS);

=== modified file 'Percona-Server/storage/innobase/handler/ha_innodb.cc'
--- Percona-Server/storage/innobase/handler/ha_innodb.cc	2013-03-26 07:16:53 +0000
+++ Percona-Server/storage/innobase/handler/ha_innodb.cc	2013-04-04 07:23:28 +0000
@@ -202,6 +202,7 @@
 #endif
 static my_bool	innobase_buffer_pool_shm_checksum	= TRUE;
 static uint	innobase_buffer_pool_shm_key		= 0;
+static ulong	srv_lazy_drop_table			= 0;
 
 
 static char*	internal_innobase_data_file_path	= NULL;
@@ -3009,6 +3010,12 @@
 			"InnoDB:          innodb_buffer_pool_shm_key was ignored.\n");
 	}
 
+	if (srv_lazy_drop_table) {
+		fprintf(stderr,
+			"InnoDB: Warning: "
+			"innodb_lazy_drop_table is deprecated and ignored.\n");
+	}
+
 	srv_mem_pool_size = (ulint) innobase_additional_mem_pool_size;
 
 	srv_n_file_io_threads = (ulint) innobase_file_io_threads;
@@ -13027,8 +13034,7 @@
 
 static MYSQL_SYSVAR_ULONG(lazy_drop_table, srv_lazy_drop_table,
   PLUGIN_VAR_RQCMDARG,
-  "At deleting tablespace, only miminum needed processes at the time are done. "
-  "e.g. for http://bugs.mysql.com/51325",
+  "[Deprecated option] no effect",
   NULL, NULL, 0, 0, 1, 0);
 
 static MYSQL_SYSVAR_BOOL(locking_fake_changes, srv_fake_changes_locks,

=== modified file 'Percona-Server/storage/innobase/include/buf0buf.h'
--- Percona-Server/storage/innobase/include/buf0buf.h	2013-02-18 04:48:10 +0000
+++ Percona-Server/storage/innobase/include/buf0buf.h	2013-04-04 07:23:28 +0000
@@ -1585,9 +1585,14 @@
 	/* @} */
 	unsigned	access_time;	/*!< time of first access, or
 					0 if the block was never accessed
+<<<<<<< TREE
 					in the buffer pool. Protected by
 					block mutex */
 	ibool		space_was_being_deleted;
+=======
+					in the buffer pool */
+	/* @} */
+>>>>>>> MERGE-SOURCE
 	ibool		is_corrupt;
 # if defined UNIV_DEBUG_FILE_ACCESSES || defined UNIV_DEBUG
 	ibool		file_page_was_freed;

=== modified file 'Percona-Server/storage/innobase/include/buf0buf.ic'
--- Percona-Server/storage/innobase/include/buf0buf.ic	2013-03-23 01:08:22 +0000
+++ Percona-Server/storage/innobase/include/buf0buf.ic	2013-04-04 07:23:28 +0000
@@ -430,7 +430,6 @@
 	buf_block_set_state(block, BUF_BLOCK_FILE_PAGE);
 	block->page.space = space;
 	block->page.offset = page_no;
-	block->page.space_was_being_deleted = FALSE;
 }
 
 /*********************************************************************//**

=== modified file 'Percona-Server/storage/innobase/include/buf0lru.h'
--- Percona-Server/storage/innobase/include/buf0lru.h	2013-02-18 04:48:10 +0000
+++ Percona-Server/storage/innobase/include/buf0lru.h	2013-04-04 07:23:28 +0000
@@ -73,13 +73,6 @@
 	enum buf_remove_t	buf_remove);/*!< in: remove or flush
 					strategy */
 
-/******************************************************************//**
-*/
-UNIV_INTERN
-void
-buf_LRU_mark_space_was_deleted(
-/*===========================*/
-	ulint	id);	/*!< in: space id */
 #if defined UNIV_DEBUG || defined UNIV_BUF_DEBUG
 /********************************************************************//**
 Insert a compressed block into buf_pool->zip_clean in the LRU order. */

=== modified file 'Percona-Server/storage/innobase/include/srv0srv.h'
--- Percona-Server/storage/innobase/include/srv0srv.h	2013-03-23 01:08:22 +0000
+++ Percona-Server/storage/innobase/include/srv0srv.h	2013-04-04 07:23:28 +0000
@@ -282,8 +282,6 @@
 	} while(0)
 
 extern ulint	srv_dict_size_limit;
-
-extern ulint	srv_lazy_drop_table;
 /*-------------------------------------------*/
 
 extern ulint	srv_n_rows_inserted;

=== modified file 'Percona-Server/storage/innobase/srv/srv0srv.c'
--- Percona-Server/storage/innobase/srv/srv0srv.c	2013-03-26 01:40:02 +0000
+++ Percona-Server/storage/innobase/srv/srv0srv.c	2013-04-04 07:23:28 +0000
@@ -430,8 +430,6 @@
 UNIV_INTERN ulint	srv_pass_corrupt_table = 0; /* 0:disable 1:enable */
 
 UNIV_INTERN ulint	srv_dict_size_limit = 0;
-
-UNIV_INTERN ulint	srv_lazy_drop_table = 0;
 /*-------------------------------------------*/
 UNIV_INTERN ulong	srv_n_spin_wait_rounds	= 30;
 UNIV_INTERN ulong	srv_n_free_tickets_to_enter = 500;