mirror of
https://github.com/MariaDB/server.git
synced 2025-07-21 10:48:15 +02:00
fa8a46eb68
By design, InnoDB has always hung when permanently running out of buffer pool, for example when several threads are waiting to allocate a block, and all of the buffer pool is buffer-fixed by the active threads. The hang that we are fixing here occurs when the buffer pool is only temporarily running out and the situation could be rescued by writing out some dirty pages or evicting some clean pages. buf_LRU_get_free_block(): Simplify the way how we wait for the buf_flush_page_cleaner thread. This fixes occasional hangs of the test encryption.innochecksum that were introduced by commita55b951e60(MDEV-26827). To play it safe, we use a timed wait when waiting for the buf_flush_page_cleaner() thread to perform its job. Should that thread get stuck, we will invoke buf_pool.LRU_warn() in order to display a message that pages could not be freed, and keep trying to wake up the buf_flush_page_cleaner() thread. The INFORMATION_SCHEMA.INNODB_METRICS counters buffer_LRU_single_flush_failure_count and buffer_LRU_get_free_waits will be removed. The latter is represented by buffer_pool_wait_free. Also removed will be the message "InnoDB: Difficult to find free blocks in the buffer pool" because ind34479dc66we introduced a more precise message "InnoDB: Could not free any blocks in the buffer pool" in the buf_flush_page_cleaner thread. buf_pool_t::LRU_warn(): Issue the warning message that we could not free any blocks in the buffer pool. This may also be invoked by buf_LRU_get_free_block() if buf_flush_page_cleaner() appears to be stuck. buf_pool_t::n_flush_dec(): Remove. buf_pool_t::n_flush_dec_holding_mutex(): Rename to n_flush_dec(). buf_flush_LRU_list_batch(): Increment the eviction counter for blocks of temporary, discarded or dropped tablespaces. buf_flush_LRU(): Make static, and remove the constant parameter evict=false. The only caller will be the buf_flush_page_cleaner() thread. IORequest::is_LRU(): Remove. The only case of evicting pages on write completion will be when we are writing out pages of the temporary tablespace. Those pages are not in buf_pool.flush_list, only in buf_pool.LRU. buf_page_t::flush(): Remove the parameter evict. buf_page_t::write_complete(): Change the parameter "bool temporary" to "bool persistent" and add a parameter for an already read state(). Reviewed by: Debarun Banerjee
94 lines
3.3 KiB
Text
94 lines
3.3 KiB
Text
--source include/have_innodb.inc
|
|
--source include/have_debug.inc
|
|
--source include/have_debug_sync.inc
|
|
--source include/not_embedded.inc
|
|
--source include/no_valgrind_without_big.inc
|
|
|
|
--echo #
|
|
--echo # MDEV-11415 AVOID INTERMEDIATE COMMIT WHILE DOING
|
|
--echo # ALTER TABLE...ALGORITHM=COPY
|
|
--echo #
|
|
|
|
CREATE TABLE t(a SERIAL, b INT, c INT, d INT) ENGINE=InnoDB;
|
|
CREATE TABLE t1(a INT, b TEXT, c TEXT,
|
|
FULLTEXT(b), FULLTEXT(c(3)), FULLTEXT(b,c)) ENGINE=InnoDB;
|
|
|
|
let $c = 999;
|
|
BEGIN;
|
|
--disable_query_log
|
|
while ($c) {
|
|
INSERT INTO t() VALUES();
|
|
dec $c;
|
|
}
|
|
--enable_query_log
|
|
COMMIT;
|
|
|
|
SELECT COUNT(*) FROM t;
|
|
# try to make the to-be-created secondary index keys randomly distributed
|
|
UPDATE t SET b=a%7, c=a%11, d=a%13;
|
|
|
|
INSERT INTO t1 VALUES(1, 'This is a first b column', 'This is a first c column');
|
|
INSERT INTO t1 VALUES(2, 'This is a second b column', 'This is a second c column');
|
|
INSERT INTO t1(a) VALUES(3);
|
|
INSERT INTO t1 VALUES(4, 'This is a third b column', 'This is a third c column');
|
|
DELETE FROM t1 WHERE a = 2;
|
|
SELECT * FROM t1 WHERE MATCH(b) AGAINST ('first');
|
|
SELECT * FROM t1 WHERE MATCH(c) AGAINST ('first');
|
|
SELECT * FROM t1 WHERE MATCH(b,c) AGAINST ('column');
|
|
SHOW CREATE TABLE t1;
|
|
ALTER TABLE t1 FORCE, ALGORITHM=COPY;
|
|
|
|
# kill right after the last write_row(), before the first commit of ALTER TABLE
|
|
connect (hang,localhost,root);
|
|
|
|
SET DEBUG_SYNC='alter_table_copy_trans_commit SIGNAL hung WAIT_FOR ever';
|
|
send
|
|
# create 32 secondary indexes
|
|
ALTER TABLE t ADD INDEX(b,c,d,a),ADD INDEX(b,c,a,d),ADD INDEX(b,a,c,d),ADD INDEX(b,a,d,c),
|
|
ADD INDEX(b,d,a,c),ADD INDEX(b,d,c,a),ADD INDEX(a,b,c,d),ADD INDEX(a,b,d,c),
|
|
ADD INDEX(a,c,b,d),ADD INDEX(a,c,d,b),ADD INDEX(a,d,b,c),ADD INDEX(a,d,c,b),
|
|
ADD INDEX(c,a,b,d),ADD INDEX(c,a,d,b),ADD INDEX(c,b,a,d),ADD INDEX(c,b,d,a),
|
|
ADD INDEX(c,d,a,b),ADD INDEX(c,d,b,a),ADD INDEX(d,a,b,c),ADD INDEX(d,a,c,b),
|
|
ADD INDEX(d,b,a,c),ADD INDEX(d,b,c,a),ADD INDEX(d,c,a,b),ADD INDEX(d,c,b,a),
|
|
ADD INDEX(a,b,c), ADD INDEX(a,c,b), ADD INDEX(a,c,d), ADD INDEX(a,d,c),
|
|
ADD INDEX(a,b,d), ADD INDEX(a,d,b), ADD INDEX(b,c,d), ADD INDEX(b,d,c),
|
|
ALGORITHM=COPY;
|
|
|
|
connection default;
|
|
SET DEBUG_SYNC='now WAIT_FOR hung';
|
|
let $shutdown_timeout=0;
|
|
--let $restart_parameters= --innodb-force-recovery=3
|
|
--source include/restart_mysqld.inc
|
|
disconnect hang;
|
|
let $shutdown_timeout=;
|
|
let $datadir=`select @@datadir`;
|
|
--replace_regex /FTS_[0-9a-f]*_[0-9a-f]*/FTS/
|
|
--list_files $datadir/test
|
|
SHOW CREATE TABLE t;
|
|
SELECT COUNT(*) FROM t;
|
|
CHECK TABLE t;
|
|
SELECT * FROM t1 WHERE MATCH(b) AGAINST ('first');
|
|
SELECT * FROM t1 WHERE MATCH(c) AGAINST ('first');
|
|
SELECT * FROM t1 WHERE MATCH(b,c) AGAINST ('column');
|
|
SHOW CREATE TABLE t1;
|
|
CHECK TABLE t1;
|
|
|
|
--let $restart_parameters= --innodb-read-only
|
|
--source include/restart_mysqld.inc
|
|
--replace_regex /FTS_[0-9a-f]*_[0-9a-f]*/FTS/
|
|
|
|
--list_files $datadir/test
|
|
SHOW CREATE TABLE t;
|
|
SELECT COUNT(*) FROM t;
|
|
CHECK TABLE t;
|
|
SELECT * FROM t1 WHERE MATCH(b) AGAINST ('first');
|
|
SELECT * FROM t1 WHERE MATCH(c) AGAINST ('first');
|
|
SELECT * FROM t1 WHERE MATCH(b,c) AGAINST ('column');
|
|
SHOW CREATE TABLE t1;
|
|
CHECK TABLE t1;
|
|
|
|
--let $restart_parameters=
|
|
--source include/restart_mysqld.inc
|
|
--replace_regex /FTS_[0-9a-f]*_[0-9a-f]*/FTS/
|
|
--list_files $datadir/test
|
|
DROP TABLE t1,t;
|