Skip to content

MDEV-40728 Recovery wrongly fails if FILE_CREATE is followed by FILE_RENAME #5530

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.

Sign up for GitHub

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

Open
dr-m wants to merge 1 commit into
base: 13.0
Choose a base branch
from
+83 −29
Open

MDEV-40728 Recovery wrongly fails if FILE_CREATE is followed by FILE_RENAME #5530

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
112 changes: 83 additions & 29 deletions storage/innobase/log/log0recv.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -929,6 +929,18 @@ static struct
d++;
continue;
}
else
{
recv_spaces_t::iterator it{recv_spaces.find(d->first)};
if (UNIV_UNLIKELY(it == recv_spaces.end()))
ut_ad("inconsistent data structures" == 0);
else if (it->second.create_lsn)
/*
Because a FILE_CREATE record exists, the entire file must
be recoverable via log records.
*/
goto next_item;
}
const page_id_t page_id{d->first, 0};
const byte *page= recv_sys.dblwr.find_page(page_id, max_lsn);
if (!page)
Expand Down Expand Up @@ -1208,6 +1220,51 @@ inline size_t recv_sys_t::files_size()
return files.size();
}

/** Apply a FILE_DELETE record. */
ATTRIBUTE_COLD static void fil_delete_apply(fil_space_t *space) noexcept
{
if (log_sys.archive)
{
/*
In recovery with innodb_log_archive=ON there may be a situation like
the following:

FILE_RENAME(123, t1.ibd, #sql-ib123.ibd)
FILE_CREATE(124, #sql-alter-.ibd)
FILE_RENAME(124, #sql-alter-.ibd, t1.ibd)
FILE_DELETE(123, #sql-ib123.ibd)

In such a scenario, we must delete the old file in order to
avoid a name clash in recv_rename_files().

In normal crash recovery, at most one file operation can be
pending, and it will be handled by rollback or purge.
*/
if (FSP_FLAGS_HAS_DATA_DIR(space->flags))
RemoteDatafile::delete_link_file(space->name());
os_file_delete(innodb_data_file_key, space->chain.start->name);
}
fil_space_free(space->id, false);
}

/** Apply a FILE_DELETE record to a tablespace that has not been loaded yet. */
ATTRIBUTE_COLD static void fil_delete_apply(uint32_t id, const char *name)
noexcept
{
if (log_sys.archive)
{
fil_space_t *space{nullptr};
if (fil_ibd_load(id, name, space) == FIL_LOAD_OK)
{
ut_ad(space);
deferred_spaces.remove(id);
fil_delete_apply(space);
return;
}
ut_ad(!space);
}
}

/** Process a file name from a FILE_* record.
@param[in] name file name
@param[in] len length of the file name
Expand All @@ -1234,32 +1291,28 @@ static void fil_name_process(const char *name, ulint len, uint32_t space_id,
ut_ad(p.first->first == space_id);

file_name_t& f = p.first->second;

ut_ad(!f.space || f.space->id == space_id);
auto d = deferred_spaces.find(space_id);
if (d) {
if (deleted) {
d->deleted = true;
goto got_deleted;
}
goto reload;
}

if (deleted) {
got_deleted:
/* Got FILE_DELETE */
if (!p.second && f.status != file_name_t::DELETED) {
if (d) {
d->deleted = true;
}
if (p.second) {
fil_delete_apply(space_id, f.name.c_str());
} else if (f.status != file_name_t::DELETED) {
f.status = file_name_t::DELETED;
if (f.space != NULL) {
fil_space_free(space_id, false);
fil_delete_apply(f.space);
f.space = NULL;
}
}

ut_ad(f.space == NULL);
goto reset_create;
} else if (p.second // the first FILE_MODIFY or FILE_RENAME
f.create_lsn = 0;
} else if (d || p.second /* the first FILE_MODIFY or FILE_RENAME */
|| f.name != fname.name) {
reload:
if (f.name.size() == 0) {
/* Augment the recv_spaces.emplace_hint() for the
FILE_MODIFY record that had been added by
Expand All @@ -1273,7 +1326,8 @@ static void fil_name_process(const char *name, ulint len, uint32_t space_id,
the space_id. If not, ignore the file after displaying
a note. Abort if there are multiple files with the
same space_id. */
switch (fil_ibd_load(space_id, fname.name.c_str(), space)) {
switch (fil_load_status s
= fil_ibd_load(space_id, fname.name.c_str(), space)) {
case FIL_LOAD_OK:
ut_ad(space != NULL);

Expand Down Expand Up @@ -1308,25 +1362,28 @@ static void fil_name_process(const char *name, ulint len, uint32_t space_id,
break;

case FIL_LOAD_ID_CHANGED:
ut_ad(space == NULL);
break;

case FIL_LOAD_NOT_FOUND:
/* No matching tablespace was found; maybe it
was renamed, and we will find a subsequent
FILE_* record. */
ut_ad(space == NULL);

if (srv_operation == SRV_OPERATION_RESTORE && d
&& ftype == FILE_RENAME) {
if (f.create_lsn) {
if (d && ftype == FILE_RENAME) {
rename:
d->file_name = fname.name;
f.name = fname.name;
d->file_name = fname.name;
f.name = fname.name;
}
break;
}

if (f.create_lsn) {
return;
if (ftype == FILE_CREATE) {
f.create_lsn = lsn;
break;
}

if (s == FIL_LOAD_ID_CHANGED) {
break;
}

if (srv_force_recovery
Expand All @@ -1346,11 +1403,10 @@ static void fil_name_process(const char *name, ulint len, uint32_t space_id,
int(fname.name.size()),
fname.name.data(), space_id);
}
return;
break;

case FIL_LOAD_DEFER:
if (d && ftype == FILE_RENAME
&& srv_operation == SRV_OPERATION_RESTORE) {
if (d && ftype == FILE_RENAME && f.create_lsn) {
goto rename;
}
/* Skip the deferred spaces
Expand Down Expand Up @@ -1382,8 +1438,6 @@ static void fil_name_process(const char *name, ulint len, uint32_t space_id,
" due to innodb_force_recovery",
int(len), name, space_id);
}
reset_create:
f.create_lsn = 0;
} else if (ftype == FILE_CREATE && !f.space) {
f.create_lsn = lsn;
}
Expand Down