Skip to content

Commit

Permalink
modification if handling renames and drops ;
Browse files Browse the repository at this point in the history 
create .ren .del files with space_id in the name, example
`10.ibd.ren` instead of `t1.ibd.ren`
`12.ibd.del` instead of `t2.ibd.del`
  • Loading branch information
@aybek
aybek committed Feb 12, 2024
1 parent 756795d commit 7f6652f
Show file tree
Hide file tree
Showing 3 changed files with 163 additions and 63 deletions.
21 changes: 17 additions & 4 deletions storage/innobase/xtrabackup/src/ddl_tracker.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,15 @@ static void data_copy_thread_func(copy_thread_ctxt_t *ctxt) {
my_thread_end();
}

/* returns .del or .ren file name starting with space_id
like schema/spaceid.ibd.del
*/
std::string ddl_tracker_t::convert_file_name(space_id_t space_id, std::string file_name,
std::string ext) {
auto sep_pos = file_name.find_last_of(Fil_path::SEPARATOR);
return file_name.substr(0, sep_pos + 1) + std::to_string(space_id) + ext;
}

void ddl_tracker_t::handle_ddl_operations() {
xb::info() << "DDL tracking : handling DDL operations";

Expand Down Expand Up @@ -197,7 +206,8 @@ void ddl_tracker_t::handle_ddl_operations() {
for (auto &table : recopy_tables) {
if (tables_in_backup.find(table) != tables_in_backup.end()) {
if (renames.find(table) != renames.end()) {
backup_file_printf((renames[table].first + ".del").c_str(), "%s", "");
backup_file_printf(convert_file_name(table, renames[table].first,
".ibd.del").c_str(), "%s", "");
}
string name = tables_in_backup[table];
new_tables[table] = name;
Expand All @@ -216,7 +226,9 @@ void ddl_tracker_t::handle_ddl_operations() {
new_tables.erase(table.first);
continue;
}
backup_file_printf((table.second + ".del").c_str(), "%s", "");

backup_file_printf(convert_file_name(table.first, table.second, ".ibd.del").c_str(),
"%s", "");
}

for (auto &table : renames) {
Expand All @@ -231,8 +243,9 @@ void ddl_tracker_t::handle_ddl_operations() {
new_tables[table.first] = table.second.second;
continue;
}
backup_file_printf((table.second.first + ".ren").c_str(), "%s",
table.second.second.c_str());

backup_file_printf(convert_file_name(table.first, table.second.first, ".ibd.ren").c_str(),
"%s", table.second.second.c_str());
}

fil_close_all_files();
Expand Down
1 change: 1 addition & 0 deletions storage/innobase/xtrabackup/src/ddl_tracker.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,5 +52,6 @@ class ddl_tracker_t {
ulint len, lsn_t start_lsn);
/** Function responsible to generate files based on DDL operations */
void handle_ddl_operations();
std::string convert_file_name(space_id_t space_id, std::string file_name, std::string ext);
};
#endif // DDL_TRACKER_H
204 changes: 145 additions & 59 deletions storage/innobase/xtrabackup/src/xtrabackup.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5486,59 +5486,122 @@ static std::string read_file_as_string(const std::string file) {
fclose(f);
return std::string(content, len);
}
/* Handle DDL for renamed files */

/**
Handle DDL for renamed files
example input: test/10.ibd.ren file with content = test/new_name.ibd ;
-> tablespace with space_id = 10 will be renamed to test/new_name.ibd
@return true on success */
static bool prepare_handle_ren_files(
const datadir_entry_t &entry, /*!<in: datadir entry */
void *arg __attribute__((unused))) {
void * /*data*/) {

if (entry.is_empty_dir) return true;

std::string ren_file = entry.path;
std::string ren_path = entry.rel_path;
std::string from_base = entry.datadir;
std::string to_base = entry.datadir;
#ifdef UNIV_DEBUG
size_t index = ren_file.find(".ren");
assert(index != std::string::npos);
#endif // UNIV_DEBUG
std::string from = ren_path.substr(0, ren_path.length() - 4);
from_base += from;
std::string to = read_file_as_string(ren_file);
to_base += to;
if (to.empty()) {
xb::error() << "Can not read " << ren_file;
char dest_space_name[FN_REFLEN];
space_id_t source_space_id;
std::string ren_file_content;
std::string ren_file = entry.file_name;
std::string ren_path = entry.path;

Fil_path::normalize(ren_path);
//trim .ibd.ren
source_space_id = atoi(ren_file.substr(0, ren_file.length() - 8).c_str());
ren_file_content = read_file_as_string(ren_path);

if (ren_file_content.empty()) {
xb::error() << ren_path << " is empty.";
return false;
}
xb::info() << "prepare_handle_ren_files: From: " << from << " To: " << to;
rename_force(from, to);
if (xtrabackup_incremental) {
rename_force(from_base + ".delta", to_base + ".delta");
rename_force(from_base + ".meta", to_base + ".meta");
//trim .ibd
snprintf(dest_space_name, FN_REFLEN, "%s",
ren_file_content.substr(0, ren_file_content.length() - 4).c_str());

fil_space_t *fil_space = fil_space_get(source_space_id);

if (fil_space != NULL) {
char tmpname[FN_REFLEN];
char *oldpath, *space_name;
bool res =
fil_space_read_name_and_filepath(fil_space->id, &space_name, &oldpath);
ut_a(res);
ut_a(os_file_exists(oldpath));
strncpy(tmpname, dest_space_name, sizeof(tmpname) - 1);

xb::info() << "prepare_handle_ren_files: renaming " << fil_space->name << " to " << dest_space_name;

if (!fil_rename_tablespace(fil_space->id, oldpath, tmpname, NULL)) {
xb::error() << "Cannot rename " << fil_space->name << " to "
<< dest_space_name;
ut::free(oldpath);
ut::free(space_name);
return false;
}
// rename .delta .meta files as well
if (xtrabackup_incremental) {
std::string from_path(oldpath);
std::string to_path = entry.datadir + OS_PATH_SEPARATOR + ren_file_content;

rename_force(from_path + ".delta", to_path + ".delta");
rename_force(from_path + ".meta", to_path + ".meta");
}
// delete the .ren file, we don't need it anymore
os_file_delete(0, ren_path.c_str());
ut::free(oldpath);
ut::free(space_name);

return true;
}
os_file_delete(0, ren_file.c_str());
return true;

xb::error() << "prepare_handle_ren_files(): failed to apply " << ren_path;
return false;
}
/* Handle DDL for deleted files */

/**
Handle DDL for deleted files
example input: test/10.ibd.del file
-> tablespace with space_id = 10 will be deleted
@return true on success */
static bool prepare_handle_del_files(
const datadir_entry_t &entry, /*!<in: datadir entry */
void *arg __attribute__((unused))) {
if (entry.is_empty_dir) return true;

std::string del_file = entry.path;
std::string dest_path = entry.rel_path;
xb::info() << "prepare_handle_del_files: " << del_file;
#ifdef UNIV_DEBUG
size_t index = dest_path.find(".del");
assert(index != std::string::npos);
#endif // UNIV_DEBUG
os_file_delete(0, del_file.c_str());
del_file.erase(del_file.length() - 4);
delete_force(dest_path.substr(0, dest_path.length() - 4).c_str());
if (xtrabackup_incremental) {
delete_force(del_file + ".delta");
delete_force(del_file + ".meta");
std::string del_file = entry.file_name;
std::string del_path = entry.path;
space_id_t space_id;

//trim .ibd.del
space_id = atoi(del_file.substr(0, del_file.length() - 8).c_str());
fil_space_t *fil_space = fil_space_get(space_id);
if (fil_space != NULL) {
char *path, *space_name;
bool res =
fil_space_read_name_and_filepath(fil_space->id, &space_name, &path);
ut_a(res);
ut_a(os_file_exists(path));

xb::info() << "prepare_handle_del_files: deleting " << fil_space->name;

dberr_t err = fil_delete_tablespace(fil_space->id, BUF_REMOVE_NONE);
if (err != DB_SUCCESS) {
xb::error() << "Cannot delete " << fil_space->name;
ut::free(path);
ut::free(space_name);
return false;
}

os_file_delete(0, del_path.c_str());
if (xtrabackup_incremental) {
std::string inc_path(path);
delete_force(inc_path + ".delta");
delete_force(inc_path + ".meta");
}
return true;
}

return true;
xb::error() << "prepare_handle_del_files(): failed to delete " << del_path;
return false;
}
/************************************************************************
Callback to handle datadir entry. Deletes entry if it has no matching
Expand Down Expand Up @@ -6619,27 +6682,6 @@ static void xtrabackup_prepare_func(int argc, char **argv) {
backup_redo_log_flushed_lsn = incremental_flushed_lsn;
}

/* Handle DDL files produced by DDL tracking during backup */
xb_process_datadir(
xtrabackup_incremental_dir ? xtrabackup_incremental_dir : ".", ".del",
prepare_handle_del_files, NULL);
xb_process_datadir(
xtrabackup_incremental_dir ? xtrabackup_incremental_dir : ".", ".ren",
prepare_handle_ren_files, NULL);
if (xtrabackup_incremental_dir) {
/** This is the new file, this might be less than the original .ibd because
* we are copying the file while there are still dirty pages in the BP.
* Those changes will later be conciliated via redo log*/
xb_process_datadir(xtrabackup_incremental_dir, ".new.meta",
prepare_handle_new_files, NULL);
xb_process_datadir(xtrabackup_incremental_dir, ".new.delta",
prepare_handle_new_files, NULL);
xb_process_datadir(xtrabackup_incremental_dir, ".new",
prepare_handle_new_files, NULL);
} else {
xb_process_datadir(".", ".new", prepare_handle_new_files, NULL);
}

init_mysql_environment();
my_thread_init();
THD *thd = create_internal_thd();
Expand Down Expand Up @@ -6714,6 +6756,50 @@ static void xtrabackup_prepare_func(int argc, char **argv) {
xb_normalize_init_values();

Tablespace_map::instance().deserialize("./");

/* Handle `RENAME/DELETE` DDL files produced by DDL tracking during backup */
err = xb_data_files_init();
if (err != DB_SUCCESS) {
xb::error() << "xb_data_files_init() failed "
<< "with error code " << err;
goto error_cleanup;
}

if (!xb_process_datadir(
xtrabackup_incremental_dir ? xtrabackup_incremental_dir : ".", ".ren",
prepare_handle_ren_files, NULL)) {
xb_data_files_close();
goto error_cleanup;
}
if (!xb_process_datadir(
xtrabackup_incremental_dir ? xtrabackup_incremental_dir : ".", ".del",
prepare_handle_del_files, NULL)) {
xb_data_files_close();
goto error_cleanup;
}

xb_data_files_close();
fil_close();
innodb_free_param();

/* Handle `CREATE` DDL files produced by DDL tracking during backup */
if (xtrabackup_incremental_dir) {
/** This is the new file, this might be less than the original .ibd because
* we are copying the file while there are still dirty pages in the BP.
* Those changes will later be conciliated via redo log*/
xb_process_datadir(xtrabackup_incremental_dir, ".new.meta",
prepare_handle_new_files, NULL);
xb_process_datadir(xtrabackup_incremental_dir, ".new.delta",
prepare_handle_new_files, NULL);
xb_process_datadir(xtrabackup_incremental_dir, ".new",
prepare_handle_new_files, NULL);
} else {
xb_process_datadir(".", ".new", prepare_handle_new_files, NULL);
}

if (innodb_init_param()) {
goto error_cleanup;
}

if (xtrabackup_incremental) {
Tablespace_map::instance().deserialize(xtrabackup_incremental_dir);
Expand Down

0 comments on commit 7f6652f

Please sign in to comment.