database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

MDEV-34552 innodb.temp_tablespace_freed fails with ER_WRONG_ARGUMENTS

Browse Source 
Problem:
========
- innodb.temp_truncate_freed fails with ER_WRONG_ARGUMENTS and
states that another buffer pool resize is already in progress.
Test case has wait condition to ensure that buffer pool
resize is completed. There is a possibility that wait condition
check could get false impression that InnoDB buffer pool resize
completed due to previous buffer pool resize.

Fix:
===
Add more elaborate wait_condition to ensure the current buffer
pool resize completed.

buf_pool_t::resize(): Set the buffer pool resize status only
after setting previous buffer pool size to current buffer pool
size. This should help the test case to make reliable.
This commit is contained in:
Thirunarayanan Balathandayuthapani
2024-07-09 17:51:25 +05:30
parent 0437ac3ae0
commit c9284ae6d1
3 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/suite/innodb/r/temp_truncate_freed.result
View File

@@ -7,5 +7,5 @@ INSERT INTO t1 VALUES (repeat(1,16777215));
DROP TEMPORARY TABLE t1; DROP TEMPORARY TABLE t1;
SET GLOBAL innodb_truncate_temporary_tablespace_now=1; SET GLOBAL innodb_truncate_temporary_tablespace_now=1;
SET GLOBAL innodb_buffer_pool_size=10485760; SET GLOBAL innodb_buffer_pool_size=10485760;
set global innodb_buffer_pool_size = @old_innodb_buffer_pool_size;
set global innodb_immediate_scrub_data_uncompressed = @old_immediate_scrub_data_val; set global innodb_immediate_scrub_data_uncompressed = @old_immediate_scrub_data_val;
set global innodb_buffer_pool_size = @old_innodb_buffer_pool_size;

15
mysql-test/suite/innodb/t/temp_truncate_freed.test
View File

@@ -3,8 +3,14 @@
set @old_innodb_buffer_pool_size = @@innodb_buffer_pool_size; set @old_innodb_buffer_pool_size = @@innodb_buffer_pool_size;
set @old_immediate_scrub_data_val= @@innodb_immediate_scrub_data_uncompressed; set @old_immediate_scrub_data_val= @@innodb_immediate_scrub_data_uncompressed;
let $wait_condition =
SELECT SUBSTR(variable_value, 1, 30) = 'Completed resizing buffer pool'
FROM information_schema.global_status
WHERE LOWER(variable_name) = 'innodb_buffer_pool_resize_status';
SET GLOBAL innodb_immediate_scrub_data_uncompressed=1; SET GLOBAL innodb_immediate_scrub_data_uncompressed=1;
SET GLOBAL innodb_buffer_pool_size= 16777216; SET GLOBAL innodb_buffer_pool_size= 16777216;
--source include/wait_condition.inc
CREATE TEMPORARY TABLE t1(c1 MEDIUMTEXT) ENGINE=InnoDB; CREATE TEMPORARY TABLE t1(c1 MEDIUMTEXT) ENGINE=InnoDB;
INSERT INTO t1 VALUES (repeat(1,16777215)); INSERT INTO t1 VALUES (repeat(1,16777215));
@@ -13,13 +19,18 @@ SET GLOBAL innodb_truncate_temporary_tablespace_now=1;
let $wait_timeout = 180; let $wait_timeout = 180;
let $wait_condition = let $wait_condition =
SELECT SUBSTR(variable_value, 1, 30) = 'Completed resizing buffer pool' SELECT SUBSTR(variable_value, 1, 45) = 'Completed resizing buffer pool from 16777216'
FROM information_schema.global_status FROM information_schema.global_status
WHERE LOWER(variable_name) = 'innodb_buffer_pool_resize_status'; WHERE LOWER(variable_name) = 'innodb_buffer_pool_resize_status';
SET GLOBAL innodb_buffer_pool_size=10485760; SET GLOBAL innodb_buffer_pool_size=10485760;
--source include/wait_condition.inc --source include/wait_condition.inc
set global innodb_buffer_pool_size = @old_innodb_buffer_pool_size;
set global innodb_immediate_scrub_data_uncompressed = @old_immediate_scrub_data_val; set global innodb_immediate_scrub_data_uncompressed = @old_immediate_scrub_data_val;
let $wait_condition =
SELECT SUBSTR(variable_value, 1, 45) = 'Completed resizing buffer pool from 10485760'
FROM information_schema.global_status
WHERE LOWER(variable_name) = 'innodb_buffer_pool_resize_status';
set global innodb_buffer_pool_size = @old_innodb_buffer_pool_size;
--source include/wait_condition.inc --source include/wait_condition.inc

8
storage/innobase/buf/buf0buf.cc
View File

@@ -2061,10 +2061,12 @@ calc_buf_pool_size:
} }
if (srv_buf_pool_old_size != srv_buf_pool_size) { if (srv_buf_pool_old_size != srv_buf_pool_size) {
std::ostringstream sout;
buf_resize_status("Completed resizing buffer pool from %zu to %zu bytes." sout << "Completed resizing buffer pool from "
,srv_buf_pool_old_size, srv_buf_pool_size); << srv_buf_pool_old_size << " to "
<< srv_buf_pool_size <<" bytes.";
srv_buf_pool_old_size = srv_buf_pool_size; srv_buf_pool_old_size = srv_buf_pool_size;
buf_resize_status(sout.str().c_str());
} }
#ifdef BTR_CUR_HASH_ADAPT #ifdef BTR_CUR_HASH_ADAPT