mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-15 19:42:28 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

MDEV-35608 Fake PMEM on /dev/shm no longer works

Browse source 
In commit 6acada713a the
logic for treating the file system of /dev/shm
as if it were persistent memory was broken.

Let us restore the original logic, so that we will have
some more CI coverage of the memory-mapped redo log interface.
This commit is contained in:
Marko Mäkelä 2024-12-09 12:53:38 +02:00
parent 9428647be3
commit 1a557d087c
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
storage/innobase/log/log0log.cc
View file

@ -255,6 +255,10 @@ static void *log_mmap(os_file_t file,
if (!read_only)
# ifdef HAVE_PMEM
prot= PROT_READ | PROT_WRITE;
# ifdef __linux__ /* On Linux, we pretend that /dev/shm is PMEM */
remap:
# endif
# else
return MAP_FAILED;
# endif
@ -270,8 +274,9 @@ static void *log_mmap(os_file_t file,
# ifdef HAVE_PMEM
# ifdef __linux__ /* On Linux, we pretend that /dev/shm is PMEM */
if (srv_operation < SRV_OPERATION_BACKUP)
if (flags != MAP_SHARED && srv_operation < SRV_OPERATION_BACKUP)
{
flags= MAP_SHARED;
struct stat st;
if (!fstat(file, &st))
{
@ -283,6 +288,7 @@ static void *log_mmap(os_file_t file,
is_pmem= st.st_dev == st_dev;
if (!is_pmem)
return ptr; /* MAP_FAILED */
goto remap;
}
}
}