Bug #20534616 - FAILURES IN INNODB.INNODB_WL6501_CRASH_* TESTS

The UNDO log is getting corrupted because tablespace and file path data
are being updated to the system tables during startup before calling
truncate::fixup_tables() which does not expect any changed pages.

This patch prevents that from happening in two ways.

First, it prevents all updates to SYS_TABLESPACES and SYS_DATAFILES
during startup until these two system tables can be properly opened
and/or created.  Some of these preventions had already been made in
wl6205, but a few more are added here.

Secondly, it breaks up truncate::fixup_tables() into two halves.
The first half works only on tables in the system tablespace and it
does that before these two system tables are opened and tablespace
discovery is done.  In this way, it can be assured that UNDO pages
are not changed. Then after tablespace discovery, the rest of the
tables are fixed-up.

This patch also contains an extra limitation on the frequency of
calling dict_replace_tablespace_and_filepath() in fil_ibd_open().
These tablespaces are all initially opened during tablespace discovery.
Since the filepath of file-per-table tablespaces are not looked up in
SYS_DATAFILES during tablespace discovery (the filepath is still
generated from the table name) there is no need to update the dictionary
with the filepath generated. It is most likely already there.

(cherry picked from commit 7c9b696b6733beff9ca7858b5dfb3f8c75cdb7d6)

Author: kdjakevin

storage/innobase/dict/dict0crea.cc

@@ -48,6 +48,7 @@ Created 1/8/1996 Heikki Tuuri
 #include "fts0priv.h"
 #include "fsp0space.h"
 #include "fsp0sysspace.h"
+#include "srv0start.h"
 
 /*****************************************************************//**
 Based on a table object, this function builds the entry to be inserted
@@ -2060,6 +2061,11 @@ dict_replace_tablespace_in_dictionary(
 	trx_t*		trx,
 	bool		commit)
 {
+	if (!srv_sys_tablespaces_open) {
+		/* Startup procedure is not yet ready for updates. */
+		return(DB_SUCCESS);
+	}
+
 	dberr_t		error;
 
 	pars_info_t*	info = pars_info_create();
@@ -2111,6 +2117,8 @@ dict_add_datafile_to_dictionary(
 	const char*	path,
 	trx_t*		trx)
 {
+	ut_ad(srv_sys_tablespaces_open);
+
 	dberr_t		error;
 
 	pars_info_t*	info = pars_info_create();
@@ -2156,6 +2164,7 @@ dict_delete_tablespace_and_datafiles(
 	ut_ad(rw_lock_own(&dict_operation_lock, RW_LOCK_X));
 #endif /* UNIV_SYNC_DEBUG */
 	ut_ad(mutex_own(&dict_sys->mutex));
+	ut_ad(srv_sys_tablespaces_open);
 
 	trx->op_info = "delete tablespace and datafiles from dictionary";
 

storage/innobase/dict/dict0load.cc

@@ -791,10 +791,6 @@ dict_get_space_name(
 	ulint		space_id,
 	mem_heap_t*	callers_heap)
 {
-	if (!srv_sys_tablespaces_open) {
-		return(NULL);
-	}
-
 	mtr_t		mtr;
 	dict_table_t*	sys_tablespaces;
 	dict_index_t*	sys_index;
@@ -810,9 +806,12 @@ dict_get_space_name(
 
 	ut_ad(mutex_own(&dict_sys->mutex));
 
-	mtr_start(&mtr);
-
 	sys_tablespaces = dict_table_get_low("SYS_TABLESPACES");
+	if (sys_tablespaces == NULL) {
+		ut_a(!srv_sys_tablespaces_open);
+		return(NULL);
+	}
+
 	sys_index = UT_LIST_GET_FIRST(sys_tablespaces->indexes);
 
 	ut_ad(!dict_table_is_comp(sys_tablespaces));
@@ -830,6 +829,8 @@ dict_get_space_name(
 	dfield_set_data(dfield, buf, 4);
 	dict_index_copy_types(tuple, sys_index, 1);
 
+	mtr_start(&mtr);
+
 	btr_pcur_open_on_user_rec(sys_index, tuple, PAGE_CUR_GE,
 				  BTR_SEARCH_LEAF, &pcur, &mtr);
 
@@ -884,6 +885,11 @@ dict_update_filepath(
 	ulint		space_id,
 	const char*	filepath)
 {
+	if (!srv_sys_tablespaces_open) {
+		/* Startup procedure is not yet ready for updates. */
+		return(DB_SUCCESS);
+	}
+
 	dberr_t		err = DB_SUCCESS;
 	trx_t*		trx;
 
@@ -944,6 +950,13 @@ dict_replace_tablespace_and_filepath(
 	const char*	filepath,
 	ulint		fsp_flags)
 {
+	if (!srv_sys_tablespaces_open) {
+		/* Startup procedure is not yet ready for updates.
+		Return success since this will likely get updated
+		later. */
+		return(DB_SUCCESS);
+	}
+
 	dberr_t		err = DB_SUCCESS;
 	trx_t*		trx;
 
@@ -984,6 +997,13 @@ dict_add_filepath(
 	ulint		space_id,
 	const char*	filepath)
 {
+	if (!srv_sys_tablespaces_open) {
+		/* Startup procedure is not yet ready for updates.
+		Return success since this will likely get updated
+		later. */
+		return(DB_SUCCESS);
+	}
+
 	dberr_t		err = DB_SUCCESS;
 	trx_t*		trx;
 
@@ -2572,15 +2592,17 @@ dict_get_and_save_space_name(
 	}
 
 	/* Read it from the dictionary. */
-	if (!dict_mutex_own) {
-		dict_mutex_enter_for_mysql();
-	}
+	if (srv_sys_tablespaces_open) {
+		if (!dict_mutex_own) {
+			dict_mutex_enter_for_mysql();
+		}
 
-	table->tablespace = dict_get_space_name(
-		table->space, table->heap);
+		table->tablespace = dict_get_space_name(
+			table->space, table->heap);
 
-	if (!dict_mutex_own) {
-		dict_mutex_exit_for_mysql();
+		if (!dict_mutex_own) {
+			dict_mutex_exit_for_mysql();
+		}
 	}
 }
 

storage/innobase/fil/fil0fil.cc

@@ -3809,10 +3809,14 @@ fil_ibd_open(
 				id, space_name, df_remote.filepath(), flags);
 		}
 
-	} else if (df_default.is_open() && path_in == NULL) {
+	} else if (df_default.is_open()
+		   && path_in == NULL
+		   && (DICT_TF_HAS_DATA_DIR(flags)
+		       || DICT_TF_HAS_SHARED_SPACE(flags))) {
 		/* SYS_DATAFILES record for this tablespace ID
-		was not supplied. Replace whatever was there with
-		this filepath, name and flags. */
+		was not supplied and it should have been.
+		Replace whatever was there with this filepath,
+		name and flags. */
 		dict_replace_tablespace_and_filepath(
 			id, space_name, df_default.filepath(), flags);
 	}

storage/innobase/include/row0trunc.h

@@ -1,6 +1,6 @@
 /*****************************************************************************
 
-Copyright (c) 2013, 2014, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 2013, 2015, Oracle and/or its affiliates. All Rights Reserved.
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
@@ -286,10 +286,15 @@ class truncate_t {
 
 	/**
 	Fix the table truncate by applying information parsed from TRUNCATE log.
-	Fix-up includes re-creating table (drop and re-create
-	indexes) and for single-tablespace re-creating tablespace.
+	Fix-up includes re-creating table (drop and re-create indexes) 
 	@return	error code or DB_SUCCESS */
-	static dberr_t fixup_tables();
+	static dberr_t fixup_tables_in_system_tablespace();
+
+	/**
+	Fix the table truncate by applying information parsed from TRUNCATE log.
+	Fix-up includes re-creating tablespace.
+	@return	error code or DB_SUCCESS */
+	static dberr_t fixup_tables_in_non_system_tablespace();
 
 	/**
 	Check whether a tablespace was truncated during recovery

storage/innobase/row/row0trunc.cc

@@ -2018,12 +2018,64 @@ row_truncate_table_for_mysql(
 
 /**
 Fix the table truncate by applying information parsed from TRUNCATE log.
-Fix-up includes re-creating table (drop and re-create indexes) and for
-single-tablespace re-creating tablespace.
-@return error code or DB_SUCCESS */
+Fix-up includes re-creating table (drop and re-create indexes)
+@return	error code or DB_SUCCESS */
+dberr_t
+truncate_t::fixup_tables_in_system_tablespace()
+{
+	dberr_t	err = DB_SUCCESS;
+
+	/* Using the info cached during REDO log scan phase fix the
+	table truncate. */
+
+	for (tables_t::iterator it = s_tables.begin();
+	     it != s_tables.end();) {
+
+		if ((*it)->m_space_id == TRX_SYS_SPACE) {
+			/* Step-1: Drop and re-create indexes. */
+			ib::info() << "Completing truncate for table with "
+				"id (" << (*it)->m_old_table_id << ") "
+				"residing in the system tablespace.";
+
+			err = fil_recreate_table(
+				(*it)->m_space_id,
+				(*it)->m_format_flags,
+				(*it)->m_tablespace_flags,
+				(*it)->m_tablename,
+				**it);
+
+			/* Step-2: Update the SYS_XXXX tables to reflect
+			this new table_id and root_page_no. */
+			table_id_t	new_id;
+
+			dict_hdr_get_new_id(&new_id, NULL, NULL, NULL, true);
+
+			err = row_truncate_update_sys_tables_during_fix_up(
+				**it, new_id, TRUE,
+				(err == DB_SUCCESS) ? false : true);
 
+			if (err != DB_SUCCESS) {
+				break;
+			}
+
+			os_file_delete(
+				innodb_log_file_key, (*it)->m_log_file_name);
+			UT_DELETE(*it);
+			it = s_tables.erase(it);
+		} else {
+			++it;
+		}
+	}
+
+	return(err);
+}
+
+/**
+Fix the table truncate by applying information parsed from TRUNCATE log.
+Fix-up includes re-creating tablespace.
+@return	error code or DB_SUCCESS */
 dberr_t
-truncate_t::fixup_tables()
+truncate_t::fixup_tables_in_non_system_tablespace()
 {
 	dberr_t	err = DB_SUCCESS;
 
@@ -2033,17 +2085,22 @@ truncate_t::fixup_tables()
 
 	for (tables_t::iterator it = s_tables.begin(); it != end; ++it) {
 
+		/* All tables in the system tablesapce have already been
+		done and erased from this list. */
+		ut_a((*it)->m_space_id != TRX_SYS_SPACE);
+
 		/* Step-1: Drop tablespace (only for single-tablespace),
 		drop indexes and re-create indexes. */
 
-		ib::info() << "Completing truncate for table with id ("
-			<< (*it)->m_old_table_id << ") residing in space with"
-			" id (" << (*it)->m_space_id << ")";
-
 		if (fsp_is_file_per_table((*it)->m_space_id,
 					  (*it)->m_tablespace_flags)) {
 			/* The table is file_per_table */
 
+			ib::info() << "Completing truncate for table with "
+				"id (" << (*it)->m_old_table_id << ") "
+				"residing in file-per-table tablespace with "
+				"id (" << (*it)->m_space_id << ")";
+
 			if (!fil_space_get((*it)->m_space_id)) {
 
 				/* Create the database directory for name,
@@ -2080,7 +2137,13 @@ truncate_t::fixup_tables()
 				(*it)->m_tablename,
 				**it, log_get_lsn());
 
-		} else {  /* not file_per_table */
+		} else {
+			/* Table is in a shared tablespace */
+
+			ib::info() << "Completing truncate for table with "
+				"id (" << (*it)->m_old_table_id << ") "
+				"residing in shared tablespace with "
+				"id (" << (*it)->m_space_id << ")";
 
 			/* Temp-tables in temp-tablespace are never restored.*/
 			ut_ad((*it)->m_space_id != srv_tmp_space.space_id());
@@ -2093,8 +2156,8 @@ truncate_t::fixup_tables()
 				**it);
 		}
 
-		/* Step-2: Update the SYS_XXXX tables to reflect new table-id
-		and root_page_no. */
+		/* Step-2: Update the SYS_XXXX tables to reflect new
+		table-id and root_page_no. */
 		table_id_t	new_id;
 
 		dict_hdr_get_new_id(&new_id, NULL, NULL, NULL, true);

storage/innobase/srv/srv0start.cc

@@ -2113,15 +2113,23 @@ innobase_start_or_create_for_mysql(void)
 
 		recv_recovery_from_checkpoint_finish();
 
+		/* Fix-up truncate of tables in the system tablespace
+		if server crashed while truncate was active. The non-
+		system tables are done after tablespace discovery. Do
+		this now because this procedure assumes that no pages
+		have changed since redo recovery.  Tablespace discovery
+		can do updates to pages in the system tablespace.*/
+		err = truncate_t::fixup_tables_in_system_tablespace();
+
 		if (srv_force_recovery < SRV_FORCE_NO_IBUF_MERGE) {
 			/* Open or Create SYS_TABLESPACES and SYS_DATAFILES
 			so that tablespace names and other metadata can be
 			found. */
+			srv_sys_tablespaces_open = true;
 			err = dict_create_or_check_sys_tablespace();
 			if (err != DB_SUCCESS) {
 				return(srv_init_abort(err));
 			}
-			srv_sys_tablespaces_open = true;
 
 			/* The following call is necessary for the insert
 			buffer to work with multiple tablespaces. We must
@@ -2153,7 +2161,7 @@ innobase_start_or_create_for_mysql(void)
 
 		/* Fix-up truncate of table if server crashed while truncate
 		was active. */
-		err = truncate_t::fixup_tables();
+		err = truncate_t::fixup_tables_in_non_system_tablespace();
 
 		if (err != DB_SUCCESS) {
 			return(srv_init_abort(err));