Bug 21577278 INNODB: DO NOT TREAT A BAD ISL FILE LIKE A MISSING ISL FILE

During recovery, if an ISL file is found that refers to a missing or invalid datafile,
do not open that datafile, even if a valid version can be found in the
MLOG_FILE_NAME record.  This will cause recovery to fail.

Approved by Deb in rb#9958

Author: kdjakevin

mysql-test/suite/innodb/r/tablespace_crash.result

@@ -200,24 +200,28 @@ INSERT INTO t3 VALUES (6);
 INSERT INTO t4 VALUES (6);
 #
 # Kill the server
-# Mess up the ISL files so that they point to the wrong file.
+# Mess up a general tablespace ISL file so that it points to the wrong file.
+# Recovery will fail. Check the error message.
+# Mess up a file-per-table tablespace ISL file so that it points to the wrong file.
+# Recovery will fail. Check the error message.
+# Delete the ISL files and move all remote files to default locations
 # Restart mysqld and display which datafiles were recovered.
 # restart
-# It should be the remote datafiles again, but this time
-# they must have been found via the REDO log.
+# It should be the default datafiles
+# The two previous attempts to recover should not cause a problem
 #
 === information_schema.innodb_sys_tablespaces and innodb_sys_datafiles ===
 Space_Name	Space_Type	Page_Size	Zip_Size	Formats_Permitted	Path
-ts1	General	DEFAULT	0	Any	MYSQL_TMP_DIR/tablespace1.ibd
-ts2	General	DEFAULT	0	Any	MYSQL_TMP_DIR/tablespace2.ibd
-test/t3	Single	DEFAULT	0	Compact or Redundant	MYSQL_TMP_DIR/test/t3.ibd
-test/t4	Single	DEFAULT	0	Compact or Redundant	MYSQL_TMP_DIR/test/t4.ibd
+ts1	General	DEFAULT	0	Any	MYSQLD_DATADIR/tablespace1.ibd
+ts2	General	DEFAULT	0	Any	MYSQLD_DATADIR/tablespace2.ibd
+test/t3	Single	DEFAULT	0	Compact or Redundant	MYSQLD_DATADIR/test/t3.ibd
+test/t4	Single	DEFAULT	0	Compact or Redundant	MYSQLD_DATADIR/test/t4.ibd
 === information_schema.files ===
 Space_Name	File_Type	Engine	Status	Tablespace_Name	Path
-ts1	TABLESPACE	InnoDB	NORMAL	ts1	MYSQL_TMP_DIR/tablespace1.ibd
-ts2	TABLESPACE	InnoDB	NORMAL	ts2	MYSQL_TMP_DIR/tablespace2.ibd
-test/t3	TABLESPACE	InnoDB	NORMAL	innodb_file_per_table.##	MYSQL_TMP_DIR/test/t3.ibd
-test/t4	TABLESPACE	InnoDB	NORMAL	innodb_file_per_table.##	MYSQL_TMP_DIR/test/t4.ibd
+ts1	TABLESPACE	InnoDB	NORMAL	ts1	MYSQLD_DATADIR/tablespace1.ibd
+ts2	TABLESPACE	InnoDB	NORMAL	ts2	MYSQLD_DATADIR/tablespace2.ibd
+test/t3	TABLESPACE	InnoDB	NORMAL	innodb_file_per_table.##	MYSQLD_DATADIR/test/t3.ibd
+test/t4	TABLESPACE	InnoDB	NORMAL	innodb_file_per_table.##	MYSQLD_DATADIR/test/t4.ibd
 select * from t1a;
 a
 1
@@ -265,7 +269,7 @@ SHOW CREATE TABLE t4;
 Table	Create Table
 t4	CREATE TABLE `t4` (
   `a` int(11) DEFAULT NULL
-) /*!50100 TABLESPACE `innodb_file_per_table` */ ENGINE=InnoDB DEFAULT CHARSET=latin1 DATA DIRECTORY='MYSQL_TMP_DIR/'
+) /*!50100 TABLESPACE `innodb_file_per_table` */ ENGINE=InnoDB DEFAULT CHARSET=latin1
 #
 # Cleanup
 #

mysql-test/suite/innodb/t/tablespace_crash.test

@@ -102,6 +102,10 @@ INSERT INTO t4 VALUES (6);
 --move_file $MYSQLD_DATADIR/tablespace2.ibd $MYSQL_TMP_DIR/tablespace2.ibd
 --move_file $MYSQLD_DATADIR/test/t3.ibd $MYSQL_TMP_DIR/test/t3.ibd
 --move_file $MYSQLD_DATADIR/test/t4.ibd $MYSQL_TMP_DIR/test/t4.ibd
+--exec echo $MYSQL_TMP_DIR/tablespace1.ibd > $MYSQLD_DATADIR/tablespace1.isl
+--exec echo $MYSQL_TMP_DIR/tablespace2.ibd > $MYSQLD_DATADIR/tablespace2.isl
+--exec echo $MYSQL_TMP_DIR/test/t3.ibd > $MYSQLD_DATADIR/tablespace3.isl
+--exec echo $MYSQL_TMP_DIR/test/t4.ibd > $MYSQLD_DATADIR/tablespace4.isl
 
 --echo # Restart mysqld and show that the remote files were opened and recovered.
 --source include/start_mysqld.inc
@@ -135,17 +139,61 @@ INSERT INTO t4 VALUES (6);
 --echo #
 --source include/kill_mysqld.inc
 
---echo # Mess up the ISL files so that they point to the wrong file.
+--echo # Mess up a general tablespace ISL file so that it points to the wrong file.
+--echo # Recovery will fail. Check the error message.
+
 --exec echo $MYSQL_TMP_DIR/bad/tablespace1.ibd > $MYSQLD_DATADIR/tablespace1.isl
---exec echo $MYSQL_TMP_DIR/bad/tablespace2.ibd > $MYSQLD_DATADIR/tablespace2.isl
+
+let SEARCH_FILE= $MYSQLTEST_VARDIR/log/my_restart.err;
+--error 3
+--exec $MYSQLD_CMD --core-file --console > $SEARCH_FILE 2>&1;
+
+let SEARCH_PATTERN= \[ERROR\] InnoDB: ISL file '.*tablespace1.isl' was found but the linked file '.*tablespace1.ibd' could not be opened or is not correct;
+--source include/search_pattern_in_file.inc
+
+let SEARCH_PATTERN= \[ERROR\] InnoDB: Tablespace .* was not found at .*tablespace1.ibd;
+--source include/search_pattern_in_file.inc
+
+let SEARCH_PATTERN= \[ERROR\] InnoDB: Cannot continue operation;
+--source include/search_pattern_in_file.inc
+
+--remove_file $SEARCH_FILE
+
+--echo # Mess up a file-per-table tablespace ISL file so that it points to the wrong file.
+--echo # Recovery will fail. Check the error message.
+
+--exec echo $MYSQL_TMP_DIR/tablespace1.ibd > $MYSQLD_DATADIR/tablespace1.isl
 --exec echo $MYSQL_TMP_DIR/bad/t3.ibd > $MYSQLD_DATADIR/test/t3.isl
---exec echo $MYSQL_TMP_DIR/bad/t4.ibd > $MYSQLD_DATADIR/test/t4.isl
+
+--error 3
+--exec $MYSQLD_CMD --core-file --console > $SEARCH_FILE 2>&1;
+
+let SEARCH_PATTERN= \[ERROR\] InnoDB: ISL file '.*t3.isl' was found but the linked file '.*t3.ibd' could not be opened or is not correct;
+--source include/search_pattern_in_file.inc
+
+let SEARCH_PATTERN= \[ERROR\] InnoDB: Tablespace .* was not found at .*t3.ibd;
+--source include/search_pattern_in_file.inc
+
+let SEARCH_PATTERN= \[ERROR\] InnoDB: Cannot continue operation;
+--source include/search_pattern_in_file.inc
+
+--remove_file $SEARCH_FILE
+
+--echo # Delete the ISL files and move all remote files to default locations
+--remove_file $MYSQLD_DATADIR/tablespace1.isl
+--remove_file $MYSQLD_DATADIR/tablespace2.isl
+--remove_file $MYSQLD_DATADIR/test/t3.isl
+--remove_file $MYSQLD_DATADIR/test/t4.isl
+--move_file $MYSQL_TMP_DIR/tablespace1.ibd $MYSQLD_DATADIR/tablespace1.ibd
+--move_file $MYSQL_TMP_DIR/tablespace2.ibd $MYSQLD_DATADIR/tablespace2.ibd
+--move_file $MYSQL_TMP_DIR/test/t3.ibd $MYSQLD_DATADIR/test/t3.ibd
+--move_file $MYSQL_TMP_DIR/test/t4.ibd $MYSQLD_DATADIR/test/t4.ibd
 
 --echo # Restart mysqld and display which datafiles were recovered.
 --source include/start_mysqld.inc
 
---echo # It should be the remote datafiles again, but this time
---echo # they must have been found via the REDO log.
+--echo # It should be the default datafiles
+--echo # The two previous attempts to recover should not cause a problem
 --echo #
 
 --source suite/innodb/include/show_i_s_tablespaces.inc
@@ -171,4 +219,12 @@ DROP TABLE t3;
 DROP TABLE t4;
 DROP TABLESPACE ts1;
 DROP TABLESPACE ts2;
---remove_file $MYSQLD_DATADIR/test/t3.isl
+
+-- disable_query_log
+# This log message can occur with --repeat=2+ because the previous test will
+# have entries in the REDO log within the same checkpoint.  So there will be
+# MLOG_FILE_NAME records for remote datafiles with the same basename but the
+# previous space_ids.
+call mtr.add_suppression("\\[ERROR\\] InnoDB: ISL file '.*isl' was found but the linked file '.*ibd' could not be opened or is not correct.");
+-- enable_query_log
+

storage/innobase/dict/dict0load.cc

@@ -1447,7 +1447,7 @@ dict_check_sys_tables(
 			char *dict_path = dict_get_first_path(space_id);
 			char *fil_path = fil_space_get_first_path(space_id);
 			if (dict_path && fil_path
-				&& strcmp(dict_path, fil_path)) {
+			    && strcmp(dict_path, fil_path)) {
 				dict_update_filepath(space_id, fil_path);
 			}
 			ut_free(dict_path);

storage/innobase/fil/fil0fil.cc

@@ -4174,23 +4174,49 @@ fil_ibd_discover(
 	/* Did not find a general or file-per-table datafile in the
 	default location.  Look for a remote general tablespace. */
 	df_rem_gen.set_name(basename);
-	if (df_rem_gen.open_read_only(false) == DB_SUCCESS
-	    && df_rem_gen.validate_for_recovery() == DB_SUCCESS
-	    && df_rem_gen.space_id() == space_id) {
-		df.set_filepath(df_rem_gen.filepath());
-		df.open_read_only(false);
-		return(true);
+	if (df_rem_gen.open_link_file() == DB_SUCCESS) {
+		/* An ISL file was found with contents. */
+		if (df_rem_gen.open_read_only(false) == DB_SUCCESS
+		    && df_rem_gen.validate_for_recovery() == DB_SUCCESS
+		    && df_rem_gen.space_id() == space_id) {
+			df.set_filepath(df_rem_gen.filepath());
+			df.open_read_only(false);
+			return(true);
+		}
+
+		/* Assume that this ISL file is intended to be used.
+		Since it is not pointing to the correct file, do not
+		continue looking for another file. */
+		ib::error() << "ISL file '"
+			<< df_rem_gen.link_filepath()
+			<< "' was found but the linked file '"
+			<< df_rem_gen.filepath()
+			<< "' could not be opened or is not correct.";
+		return(false);
 	}
 
 	/* Look for a remote file-per-table tablespace. */
 	if (sep_found == 2) {
 		df_rem_per.set_name(db);
-		if (df_rem_per.open_read_only(false) == DB_SUCCESS
-		    && df_rem_per.validate_for_recovery() == DB_SUCCESS
-		    && df_rem_per.space_id() == space_id) {
-			df.set_filepath(df_rem_per.filepath());
-			df.open_read_only(false);
-			return(true);
+		if (df_rem_per.open_link_file() == DB_SUCCESS) {
+			/* An ISL file was found with contents. */
+			if (df_rem_per.open_read_only(false) == DB_SUCCESS
+			    && df_rem_per.validate_for_recovery() == DB_SUCCESS
+			    && df_rem_per.space_id() == space_id) {
+				df.set_filepath(df_rem_per.filepath());
+				df.open_read_only(false);
+				return(true);
+			}
+
+			/* Assume that this ISL file is intended to be used.
+			Since it is not pointing to the correct file, do not
+			continue looking for another file. */
+			ib::error() << "ISL file '"
+				<< df_rem_per.link_filepath()
+				<< "' was found but the linked file '"
+				<< df_rem_per.filepath()
+				<< "' could not be opened or is not correct.";
+			return(false);
 		}
 	}
 
@@ -4202,7 +4228,7 @@ fil_ibd_discover(
 		return(true);
 	}
 
-	/* A datafile was not discovered for the filanem given. */
+	/* A datafile was not discovered for the filename given. */
 	return(false);
 }
 
@@ -4237,7 +4263,8 @@ fil_ibd_load(
 		previously. Fail if it is different. */
 		fil_node_t* node = UT_LIST_GET_FIRST(space->chain);
 
-		if (0 != strcmp(filename, node->name)) {
+		if (0 != strcmp(innobase_basename(filename),
+				innobase_basename(node->name))) {
 			ib::info() << "Ignoring data file '" << filename
 				<< "' with space ID " << space->id
 				<< ". Another data file called " << node->name

storage/innobase/fsp/fsp0file.cc

@@ -828,28 +828,28 @@ Datafile::restore_from_doublewrite(
 			m_filepath, m_handle, page, 0, page_size.physical()));
 }
 
+/** Create a link filename based on the contents of m_name,
+open that file, and read the contents into m_filepath.
+@retval DB_SUCCESS if remote linked tablespace file is opened and read.
+@retval DB_CANNOT_OPEN_FILE if the link file does not exist. */
+dberr_t
+RemoteDatafile::open_link_file()
+{
+	set_link_filepath(NULL);
+	m_filepath = read_link_file(m_link_filepath);
+
+	return(m_filepath == NULL ? DB_CANNOT_OPEN_FILE : DB_SUCCESS);
+}
+
 /** Opens a handle to the file linked to in an InnoDB Symbolic Link file
 in read-only mode so that it can be validated.
 @param[in]	strict	whether to issue error messages
 @return DB_SUCCESS if remote linked tablespace file is found and opened. */
 dberr_t
 RemoteDatafile::open_read_only(bool strict)
 {
-	if (m_filepath == NULL) {
-		if (m_link_filepath == NULL) {
-			m_link_filepath = fil_make_filepath(
-				NULL, name(), ISL, false);
-		}
-
-		bool	is_shared = FSP_FLAGS_GET_SHARED(flags());
-		m_filepath = read_link_file(m_link_filepath, is_shared);
-
-		/* Validate m_filepath */
-		if (m_filepath == NULL) {
-			/* There is no ISL file or
-			its contents are not valid. */
-			return(DB_ERROR);
-		}
+	if (m_filepath == NULL && open_link_file() == DB_CANNOT_OPEN_FILE) {
+		return(DB_ERROR);
 	}
 
 	dberr_t err = Datafile::open_read_only(strict);
@@ -872,19 +872,8 @@ in read-write mode so that it can be restored from doublewrite and validated.
 dberr_t
 RemoteDatafile::open_read_write(bool read_only_mode)
 {
-	if (m_filepath == NULL) {
-		if (m_link_filepath == NULL) {
-			m_link_filepath = fil_make_filepath(
-				NULL, name(), ISL, false);
-		}
-
-		bool	is_shared = FSP_FLAGS_GET_SHARED(flags());
-		m_filepath = read_link_file(m_link_filepath, is_shared);
-
-		if (m_filepath == NULL) {
-			/* There is no remote file */
-			return(DB_ERROR);
-		}
+	if (m_filepath == NULL && open_link_file() == DB_CANNOT_OPEN_FILE) {
+		return(DB_ERROR);
 	}
 
 	dberr_t err = Datafile::open_read_write(read_only_mode);
@@ -919,17 +908,19 @@ the path provided without its suffix, plus DOT_ISL.
 void
 RemoteDatafile::set_link_filepath(const char* path)
 {
-	bool	is_shared =  FSP_FLAGS_GET_SHARED(flags());
+	if (m_link_filepath != NULL) {
+		return;
+	}
 
-	if (is_shared) {
-		ut_ad(path != NULL);
+	if (path != NULL && FSP_FLAGS_GET_SHARED(flags())) {
+		/* Make the link_filepath based on the basename. */
 		ut_ad(strcmp(&path[strlen(path) - strlen(DOT_IBD)],
 		      DOT_IBD) == 0);
 
 		m_link_filepath = fil_make_filepath(NULL, base_name(path),
 						    ISL, false);
 	} else {
-		ut_ad(path == NULL);
+		/* Make the link_filepath based on the m_name. */
 		m_link_filepath = fil_make_filepath(NULL, name(), ISL, false);
 	}
 }
@@ -986,7 +977,7 @@ RemoteDatafile::create_link_file(
 		return(DB_ERROR);
 	}
 
-	prev_filepath = read_link_file(link_filepath, is_shared);
+	prev_filepath = read_link_file(link_filepath);
 	if (prev_filepath) {
 		/* Truncate will call this with an existing
 		link file which contains the same filepath. */
@@ -1080,13 +1071,10 @@ For general tablespaces, there will be no 'database' directory.
 The 'basename.isl' will be in the datadir.
 The caller must free the memory returned if it is not null.
 @param[in]	link_filepath	filepath of the ISL file
-@param[in]	is_shared	true for general tablespace,
-				false for file-per-table
 @return Filepath of the IBD file read from the ISL file */
 char*
 RemoteDatafile::read_link_file(
-	const char*	link_filepath,
-	bool		is_shared)
+	const char*	link_filepath)
 {
 	char*		filepath = NULL;
 	FILE*		file = NULL;

storage/innobase/include/fsp0file.h

@@ -476,7 +476,7 @@ class RemoteDatafile : public Datafile
 {
 private:
 	/** Link filename (full path) */
-	char*			m_link_filepath;
+	char*	m_link_filepath;
 
 public:
 
@@ -515,6 +515,12 @@ class RemoteDatafile : public Datafile
 				If NULL, use m_name as the basename. */
 	void set_link_filepath(const char* path);
 
+	/** Create a link filename based on the contents of m_name,
+	open that file, and read the contents into m_filepath.
+	@retval DB_SUCCESS if remote linked tablespace file is opened and read.
+	@retval DB_CANNOT_OPEN_FILE if the link file does not exist. */
+	dberr_t open_link_file();
+
 	/** Delete an InnoDB Symbolic Link (ISL) file. */
 	void delete_link_file(void);
 
@@ -563,11 +569,8 @@ class RemoteDatafile : public Datafile
 	The 'basename.isl' will be in the datadir.
 	The caller must free the memory returned if it is not null.
 	@param[in]	link_filepath	filepath of the ISL file
-	@param[in]	is_shared	true for general tablespace,
-					false for file-per-table
 	@return Filepath of the IBD file read from the ISL file */
 	static char* read_link_file(
-		const char*	link_filepath,
-		bool		is_shared);
+		const char*	link_filepath);
 };
 #endif /* fsp0file_h */