Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

PXB-3241 : Assertion failure: os0file.cc:3416:!exists while taking ba… #1554

Merged
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 13 additions & 7 deletions storage/innobase/xtrabackup/src/xtrabackup.cc
Original file line number Diff line number Diff line change
Expand Up @@ -6973,13 +6973,8 @@ static void xtrabackup_prepare_func(int argc, char **argv) {
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;
}

// This should be done before handling .del files. Because we have to delete
// the correct delta files for the corresponding .del files.
if (xtrabackup_incremental_dir) {
// Build meta map
if (!xb_process_datadir(
Expand All @@ -6990,13 +6985,24 @@ static void xtrabackup_prepare_func(int argc, char **argv) {
}
}

// This should be done before rename because .del files are created after
// consolidating or skipping intermediate operations (renames etc). So they
// should be processed before renames.
if (!xb_process_datadir(
xtrabackup_incremental_dir ? xtrabackup_incremental_dir : ".", ".del",
prepare_handle_del_files, NULL)) {
xb_data_files_close();
goto error_cleanup;
}

// This should be done after processing .meta and .del
if (!xb_process_datadir(
xtrabackup_incremental_dir ? xtrabackup_incremental_dir : ".", ".ren",
prepare_handle_ren_files, NULL)) {
xb_data_files_close();
goto error_cleanup;
}

xb_data_files_close();
fil_close();
innodb_free_param();
Expand Down
Loading