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

This is after-merge fix of f33e57a9.
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()
parent 01b44c05
......@@ -1279,13 +1279,24 @@ void btr_search_drop_page_hash_index(buf_block_t* block)
auto part = btr_search_sys.get_part(index_id,
block->page.id().space());
rw_lock_s_lock(&part->latch);
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) {
rw_lock_s_unlock(&part->latch);
if (is_freed) {
rw_lock_x_unlock(&part->latch);
} else {
rw_lock_s_unlock(&part->latch);
}
return;
}
......@@ -1304,7 +1315,9 @@ void btr_search_drop_page_hash_index(buf_block_t* block)
/* NOTE: The AHI fields of block must not be accessed after
releasing search latch, as the index page might only be s-latched! */
rw_lock_s_unlock(&part->latch);
if (!is_freed) {
rw_lock_s_unlock(&part->latch);
}
ut_a(n_fields > 0 || n_bytes > 0);
......@@ -1355,16 +1368,18 @@ void btr_search_drop_page_hash_index(buf_block_t* block)
mem_heap_free(heap);
}
rw_lock_x_lock(&part->latch);
if (!is_freed) {
rw_lock_x_lock(&part->latch);
if (UNIV_UNLIKELY(!block->index)) {
/* Someone else has meanwhile dropped the hash index */
if (UNIV_UNLIKELY(!block->index)) {
/* Someone else has meanwhile dropped the
hash index */
goto cleanup;
}
goto cleanup;
ut_a(block->index == index);
}
ut_a(block->index == index);
if (block->curr_n_fields != n_fields
|| block->curr_n_bytes != n_bytes) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment