mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-16 03:52:35 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

MDEV-34169 Don't allow innodb_open_files to be lesser than

Browse source 
number of non-user tablespace.

- InnoDB only closes the user tablespace when the number of open
files exceeds innodb_open_files limit. In that case, InnoDB should
make sure that innodb_open_files value should be greater
than number of undo tablespace, system and temporary tablespace files.
This commit is contained in:
Thirunarayanan Balathandayuthapani 2024-06-07 13:11:17 +05:30
parent 238798d978
commit b7a75fbb8a
4 changed files with 31 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
mysql-test/suite/innodb/r/open_files_limit.result Normal file
View file

@ -0,0 +1,4 @@
call mtr.add_suppression("\\[Warning\\] InnoDB: innodb_open_files=.* is not greater than the number of system tablespace files, temporary tablespace files, innodb_undo_tablespaces=.*");
FOUND 1 /\[Warning\] InnoDB: innodb_open_files=.* is not greater than the number of system tablespace files, temporary tablespace files, innodb_undo_tablespaces=.*/ in mysqld.1.err
CREATE TABLE t1(f1 INT NOT NULL)ENGINE=InnoDB;
DROP TABLE t1;

3
mysql-test/suite/innodb/t/open_files_limit.opt Normal file
View file

@ -0,0 +1,3 @@
--innodb_undo_tablespaces=8
--innodb_open_files=10
--innodb_temp_data_file_path=ibtmp1:32M;ibtmp2:32M:autoextend

9
mysql-test/suite/innodb/t/open_files_limit.test Normal file
View file

@ -0,0 +1,9 @@
--source include/have_innodb.inc
--source include/not_embedded.inc
call mtr.add_suppression("\\[Warning\\] InnoDB: innodb_open_files=.* is not greater than the number of system tablespace files, temporary tablespace files, innodb_undo_tablespaces=.*");
let SEARCH_PATTERN= \[Warning\] InnoDB: innodb_open_files=.* is not greater than the number of system tablespace files, temporary tablespace files, innodb_undo_tablespaces=.*;
let SEARCH_FILE= $MYSQLTEST_VARDIR/log/mysqld.1.err;
--source include/search_pattern_in_file.inc
CREATE TABLE t1(f1 INT NOT NULL)ENGINE=InnoDB;
DROP TABLE t1;

15
storage/innobase/handler/ha_innodb.cc
View file

@ -3860,6 +3860,21 @@ static int innodb_init_params()
}
}
ulint min_open_files_limit = srv_undo_tablespaces
+ srv_sys_space.m_files.size()
+ srv_tmp_space.m_files.size() + 1;
if (min_open_files_limit > innobase_open_files) {
sql_print_warning(
"InnoDB: innodb_open_files=%lu is not greater "
"than the number of system tablespace files, "
"temporary tablespace files, "
"innodb_undo_tablespaces=%lu; adjusting "
"to innodb_open_files=%zu",
innobase_open_files, srv_undo_tablespaces,
min_open_files_limit);
innobase_open_files = (ulong) min_open_files_limit;
}
srv_max_n_open_files = innobase_open_files;
srv_innodb_status = (ibool) innobase_create_status_file;