diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-03-16 15:51:26 +0200 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-03-16 15:51:26 +0200 |
commit | f87a944c79d158857d3ddabc6a11a4acb73afe06 (patch) | |
tree | b267f2d3c6aca983aa54b3f1b85123810f3c294d /storage/innobase | |
parent | 8ea923f55b7666a359ac2c54f6c10e8609d16846 (diff) | |
parent | 8cbada87f05be0dac0c53b1bc4c305af6c00fb1b (diff) | |
download | mariadb-git-f87a944c79d158857d3ddabc6a11a4acb73afe06.tar.gz |
Merge 10.5 into 10.6
Diffstat (limited to 'storage/innobase')
-rw-r--r-- | storage/innobase/fil/fil0fil.cc | 104 | ||||
-rw-r--r-- | storage/innobase/include/fil0fil.h | 14 | ||||
-rw-r--r-- | storage/innobase/log/log0recv.cc | 72 |
3 files changed, 70 insertions, 120 deletions
diff --git a/storage/innobase/fil/fil0fil.cc b/storage/innobase/fil/fil0fil.cc index d48b19b7b26..7cd619827fa 100644 --- a/storage/innobase/fil/fil0fil.cc +++ b/storage/innobase/fil/fil0fil.cc @@ -111,19 +111,6 @@ bool fil_space_t::try_to_close(bool print_info) return false; } -/** Test if a tablespace file can be renamed to a new filepath by checking -if that the old filepath exists and the new filepath does not exist. -@param[in] old_path old filepath -@param[in] new_path new filepath -@param[in] is_discarded whether the tablespace is discarded -@param[in] replace_new whether to ignore the existence of new_path -@return innodb error code */ -static dberr_t -fil_rename_tablespace_check( - const char* old_path, - const char* new_path, - bool is_discarded, - bool replace_new = false); /** Rename a single-table tablespace. The tablespace must exist in the memory cache. @param[in] id tablespace identifier @@ -1583,89 +1570,6 @@ fil_name_write( mtr->log_file_op(FILE_MODIFY, space_id, name); } -/** Replay a file rename operation if possible. -@param[in] space_id tablespace identifier -@param[in] name old file name -@param[in] new_name new file name -@return whether the operation was successfully applied -(the name did not exist, or new_name did not exist and -name was successfully renamed to new_name) */ -bool -fil_op_replay_rename( - ulint space_id, - const char* name, - const char* new_name) -{ - /* In order to replay the rename, the following must hold: - * The new name is not already used. - * A tablespace exists with the old name. - * The space ID for that tablepace matches this log entry. - This will prevent unintended renames during recovery. */ - fil_space_t* space = fil_space_get(space_id); - - if (space == NULL) { - return(true); - } - - const bool name_match - = strcmp(name, UT_LIST_GET_FIRST(space->chain)->name) == 0; - - if (!name_match) { - return(true); - } - - /* Create the database directory for the new name, if - it does not exist yet */ - - const char* namend = strrchr(new_name, OS_PATH_SEPARATOR); - ut_a(namend != NULL); - - char* dir = static_cast<char*>( - ut_malloc_nokey(ulint(namend - new_name) + 1)); - - memcpy(dir, new_name, ulint(namend - new_name)); - dir[namend - new_name] = '\0'; - - bool success = os_file_create_directory(dir, false); - ut_a(success); - - ulint dirlen = 0; - - if (const char* dirend = strrchr(dir, OS_PATH_SEPARATOR)) { - dirlen = ulint(dirend - dir) + 1; - } - - ut_free(dir); - - /* New path must not exist. */ - dberr_t err = fil_rename_tablespace_check( - name, new_name, false); - if (err != DB_SUCCESS) { - ib::error() << " Cannot replay file rename." - " Remove either file and try again."; - return(false); - } - - char* new_table = mem_strdupl( - new_name + dirlen, - strlen(new_name + dirlen) - - 4 /* remove ".ibd" */); - - ut_ad(new_table[ulint(namend - new_name) - dirlen] - == OS_PATH_SEPARATOR); -#if OS_PATH_SEPARATOR != '/' - new_table[namend - new_name - dirlen] = '/'; -#endif - - if (!fil_rename_tablespace( - space_id, name, new_table, new_name)) { - ut_error; - } - - ut_free(new_table); - return(true); -} - /** Check for pending operations. @param[in] space tablespace @param[in] count number of attempts so far @@ -2092,22 +1996,18 @@ fil_make_filepath( if that the old filepath exists and the new filepath does not exist. @param[in] old_path old filepath @param[in] new_path new filepath -@param[in] is_discarded whether the tablespace is discarded @param[in] replace_new whether to ignore the existence of new_path @return innodb error code */ static dberr_t fil_rename_tablespace_check( const char* old_path, const char* new_path, - bool is_discarded, bool replace_new) { bool exists = false; os_file_type_t ftype; - if (!is_discarded - && os_file_status(old_path, &exists, &ftype) - && !exists) { + if (os_file_status(old_path, &exists, &ftype) && !exists) { ib::error() << "Cannot rename '" << old_path << "' to '" << new_path << "' because the source file" @@ -2167,7 +2067,7 @@ dberr_t fil_space_t::rename(const char* name, const char* path, bool log, if (log) { dberr_t err = fil_rename_tablespace_check( - chain.start->name, path, false, replace); + chain.start->name, path, replace); if (err != DB_SUCCESS) { return(err); } diff --git a/storage/innobase/include/fil0fil.h b/storage/innobase/include/fil0fil.h index e1f4f8168b1..a5c5a22f8ca 100644 --- a/storage/innobase/include/fil0fil.h +++ b/storage/innobase/include/fil0fil.h @@ -1565,20 +1565,6 @@ fil_write_flushed_lsn( lsn_t lsn) MY_ATTRIBUTE((warn_unused_result)); -/** Replay a file rename operation if possible. -@param[in] space_id tablespace identifier -@param[in] name old file name -@param[in] new_name new file name -@return whether the operation was successfully applied -(the name did not exist, or new_name did not exist and -name was successfully renamed to new_name) */ -bool -fil_op_replay_rename( - ulint space_id, - const char* name, - const char* new_name) - MY_ATTRIBUTE((warn_unused_result)); - /** Delete a tablespace and associated .ibd file. @param[in] id tablespace identifier @param[in] if_exists whether to ignore missing tablespace diff --git a/storage/innobase/log/log0recv.cc b/storage/innobase/log/log0recv.cc index 12c4765e10c..2b8c9e64b47 100644 --- a/storage/innobase/log/log0recv.cc +++ b/storage/innobase/log/log0recv.cc @@ -584,6 +584,9 @@ typedef std::map< static recv_spaces_t recv_spaces; +/** The last parsed FILE_RENAME records */ +static std::map<uint32_t,std::string> renamed_spaces; + /** Report an operation to create, delete, or rename a file during backup. @param[in] space_id tablespace identifier @param[in] create whether the file is being created @@ -943,6 +946,7 @@ void recv_sys_t::close() } recv_spaces.clear(); + renamed_spaces.clear(); mlog_init.clear(); close_files(); @@ -2205,11 +2209,15 @@ same_page: l, static_cast<ulint>(fnend - fn), reinterpret_cast<const byte*>(fn2), fn2 ? static_cast<ulint>(fn2end - fn2) : 0); - - if (!fn2 || !apply); - else if (UNIV_UNLIKELY(!fil_op_replay_rename(space_id, fn, fn2))) - found_corrupt_fs= true; const_cast<char&>(fn[rlen])= saved_end; + + if (fn2 && apply) + { + const size_t len= fn2end - fn2; + auto r= renamed_spaces.emplace(space_id, std::string{fn2, len}); + if (!r.second) + r.first->second= std::string{fn2, len}; + } if (is_corrupt_fs()) return true; } @@ -2817,6 +2825,62 @@ next_page: buf_pool_invalidate(); mysql_mutex_lock(&log_sys.mutex); } +#if 1 /* Mariabackup FIXME: Remove or adjust rename_table_in_prepare() */ + else if (srv_operation != SRV_OPERATION_NORMAL); +#endif + else + { + /* In the last batch, we will apply any rename operations. */ + for (auto r : renamed_spaces) + { + const uint32_t id= r.first; + fil_space_t *space= fil_space_t::get(id); + if (!space) + continue; + ut_ad(UT_LIST_GET_LEN(space->chain) == 1); + const char *old= space->chain.start->name; + if (r.second != old) + { + bool exists; + os_file_type_t ftype; + const char *new_name= r.second.c_str(); + if (!os_file_status(new_name, &exists, &ftype) || exists) + { + ib::error() << "Cannot replay rename of tablespace " << id + << " from '" << old << "' to '" << r.second << + (exists ? "' because the target file exists" : "'"); + found_corrupt_fs= true; + } + else + { + size_t base= r.second.rfind(OS_PATH_SEPARATOR); + ut_ad(base != std::string::npos); + size_t start= r.second.rfind(OS_PATH_SEPARATOR, base - 1); + if (start == std::string::npos) + start= 0; + else + ++start; + /* Keep only databasename/tablename without .ibd suffix */ + std::string space_name(r.second, start, r.second.size() - start - 4); + ut_ad(space_name[base - start] == OS_PATH_SEPARATOR); +#if OS_PATH_SEPARATOR != '/' + space_name[base - start]= '/'; +#endif + mysql_mutex_lock(&log_sys.mutex); + if (dberr_t err= space->rename(space_name.c_str(), r.second.c_str(), + false)) + { + ib::error() << "Cannot replay rename of tablespace " << id + << " to '" << r.second << "': " << err; + found_corrupt_fs= true; + } + mysql_mutex_unlock(&log_sys.mutex); + } + } + space->release(); + } + renamed_spaces.clear(); + } mysql_mutex_lock(&mutex); |