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

MDEV-31568 InnoDB protection against dual processes accessing data insufficient

Browse Source 
fil_node_open_file_low(): Always acquire an advisory lock on
the system tablespace. Originally, we already did this in
SysTablespace::open_file(), but SysTablespace::open_or_create()
would release those locks when it is closing the file handles.

This is a 10.5+ specific follow up to
commit 0ee1082bd2e7e7049c4f0e686bad53cf7ba053ab (MDEV-28495).

Thanks to Daniel Black for verifying this bug.
This commit is contained in:
Marko Mäkelä 2023-07-05 15:15:04 +03:00
parent 5f2a77cef1
commit bd7908e6ac
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
storage/innobase/fil/fil0fil.cc
View File

@ -391,8 +391,16 @@ static bool fil_node_open_file_low(fil_node_t *node)
: OS_FILE_OPEN | OS_FILE_ON_ERROR_NO_EXIT,
OS_FILE_AIO, type,
srv_read_only_mode, &success);
if (success)
if (node->is_open())
{
ut_ad(success);
#ifndef _WIN32
if (!node->space->id && !srv_read_only_mode && my_disable_locking &&
os_file_lock(node->handle, node->name))
goto fail;
#endif
break;
}
/* The following call prints an error message */
if (os_file_get_last_error(true) == EMFILE + 100 &&
@ -406,6 +414,9 @@ static bool fil_node_open_file_low(fil_node_t *node)
if (node->size);
else if (!node->read_page0() || !fil_comp_algo_validate(node->space))
{
#ifndef _WIN32
fail:
#endif
os_file_close(node->handle);
node->handle= OS_FILE_CLOSED;
return false;