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

MDEV-24863 AHI entries mismatch with the index while reloading the evicted tables.

Browse Source 
This is after-merge fix of f33e57a9e66f7e1790cb84b141381bb668e281a0.
In btr_search_drop_page_hash_index(), InnoDB should take
the exclusive lock on the AHI latch if index is already
freed to avoid the freed memory access during buf_pool_resize()
This commit is contained in:
Thirunarayanan Balathandayuthapani 2021-02-25 20:51:30 +05:30
parent 01b44c054d
commit 4b166ca901
1 changed files with 25 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
storage/innobase/btr/btr0sea.cc
View File

@ -1279,13 +1279,24 @@ retry:
auto part = btr_search_sys.get_part(index_id,
block->page.id().space());
dict_index_t* index = block->index;
bool is_freed = index && index->freed();
if (is_freed) {
rw_lock_x_lock(&part->latch);
} else {
rw_lock_s_lock(&part->latch);
}
assert_block_ahi_valid(block);
dict_index_t* index = block->index;
if (!index || !btr_search_enabled) {
if (is_freed) {
rw_lock_x_unlock(&part->latch);
} else {
rw_lock_s_unlock(&part->latch);
}
return;
}
@ -1304,7 +1315,9 @@ retry:
/* NOTE: The AHI fields of block must not be accessed after
releasing search latch, as the index page might only be s-latched! */
if (!is_freed) {
rw_lock_s_unlock(&part->latch);
}
ut_a(n_fields > 0 || n_bytes > 0);
@ -1355,15 +1368,17 @@ next_rec:
mem_heap_free(heap);
}
if (!is_freed) {
rw_lock_x_lock(&part->latch);
if (UNIV_UNLIKELY(!block->index)) {
/* Someone else has meanwhile dropped the hash index */
/* Someone else has meanwhile dropped the
hash index */
goto cleanup;
}
ut_a(block->index == index);
}
if (block->curr_n_fields != n_fields
|| block->curr_n_bytes != n_bytes) {