1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MDEV-25491 fixup: Race between DROP TABLE and purge of DROP INDEX

Browse Source 
xdes_get_descriptor_with_space_hdr(): Use the correct mode
BUF_GET_POSSIBLY_FREED also when the tablespace is larger
than innodb_page_size pages. This function could be called by
fseg_free_step().

fsp_alloc_seg_inode(): For completeness (and for improved robustness
in case of a corrupted tablespace), use BUF_GET_POSSIBLY_FREED.
With this, the entire compilation unit fsp0fsp.cc will use that mode.
This commit is contained in:
Marko Mäkelä 2021-04-30 10:31:37 +03:00
parent f21e159bb5
commit fd8c68c7fe
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
storage/innobase/fsp/fsp0fsp.cc
View File

@ -348,18 +348,23 @@ xdes_get_descriptor_with_space_hdr(
buf_block_t* block = header;
if (descr_page_no) {
block = buf_page_get(
page_id_t(space->id, descr_page_no), zip_size,
RW_SX_LATCH, mtr);
block = buf_page_get_gen(page_id_t(space->id, descr_page_no),
zip_size, RW_SX_LATCH, nullptr,
BUF_GET_POSSIBLY_FREED, mtr);
if (block && block->page.status == buf_page_t::FREED) {
block = nullptr;
}
}
if (desc_block != NULL) {
*desc_block = block;
}
return XDES_ARR_OFFSET + XDES_SIZE
return block
? XDES_ARR_OFFSET + XDES_SIZE
* xdes_calc_descriptor_index(zip_size, offset)
+ block->frame;
+ block->frame
: nullptr;
}
/** Get the extent descriptor of a page.
@ -440,7 +445,6 @@ MY_ATTRIBUTE((nonnull(3), warn_unused_result))
extent descriptor resides is x-locked.
@param space tablespace
@param lst_node file address of the list node contained in the descriptor
@param mode BUF_GET or BUF_GET_POSSIBLY_FREED
@param mtr mini-transaction
@param block extent descriptor block
@return pointer to the extent descriptor */
@ -1439,7 +1443,12 @@ fsp_alloc_seg_inode(fil_space_t *space, buf_block_t *header,
flst_get_first(FSP_HEADER_OFFSET + FSP_SEG_INODES_FREE
+ header->frame).page);
block = buf_page_get(page_id, space->zip_size(), RW_SX_LATCH, mtr);
block = buf_page_get_gen(page_id, space->zip_size(), RW_SX_LATCH,
nullptr, BUF_GET_POSSIBLY_FREED, mtr);
if (!block || block->page.status == buf_page_t::FREED) {
return nullptr;
}
if (!space->full_crc32()) {
fil_block_check_type(*block, FIL_PAGE_INODE, mtr);
}