mirror of
https://github.com/MariaDB/server.git
synced 2025-08-08 11:22:35 +03:00
MDEV-35699 Multi-batch recovery occasionally fails
recv_sys_t::parse<storing=NO>(): Do invoke
fil_space_set_recv_size_and_flags() and do parse enough of page 0
to facilitate that.
This fixes a regression that had been introduced in
commit b249a059da
(MDEV-34850).
In a multi-batch crash recovery, we would fail to invoke
fil_space_set_recv_size_and_flags() while parsing the remaining log,
before starting the first recovery batch.
Reviewed by: Debarun Banerjee
Tested by: Matthias Leich
This commit is contained in:
15
mysql-test/suite/encryption/r/recovery_memory.result
Normal file
15
mysql-test/suite/encryption/r/recovery_memory.result
Normal file
@@ -0,0 +1,15 @@
|
|||||||
|
CREATE TABLE t1(f1 text, index idx(f1(20))) ENGINE INNODB;
|
||||||
|
set global innodb_fast_shutdown=0;
|
||||||
|
# restart: --debug_dbug=+d,ib_log_checkpoint_avoid_hard --innodb_flush_sync=0
|
||||||
|
set global debug_dbug="+d,ib_log_checkpoint_avoid_hard";
|
||||||
|
INSERT INTO t1 SELECT repeat('a', 8000) FROM seq_1_to_1280;
|
||||||
|
DELETE FROM t1;
|
||||||
|
SET GLOBAL innodb_max_purge_lag_wait=0;
|
||||||
|
INSERT INTO t1 VALUES('a');
|
||||||
|
# XTRABACKUP PREPARE
|
||||||
|
# restart
|
||||||
|
SELECT COUNT(*) FROM t1;
|
||||||
|
COUNT(*)
|
||||||
|
1
|
||||||
|
ALTER TABLE t1 FORCE;
|
||||||
|
DROP TABLE t1;
|
8
mysql-test/suite/encryption/t/recovery_memory.opt
Normal file
8
mysql-test/suite/encryption/t/recovery_memory.opt
Normal file
@@ -0,0 +1,8 @@
|
|||||||
|
--innodb_doublewrite=0
|
||||||
|
--innodb_log_file_size=24m
|
||||||
|
--innodb_immediate_scrub_data_uncompressed=1
|
||||||
|
--plugin-load-add=$FILE_KEY_MANAGEMENT_SO
|
||||||
|
--loose-file-key-management
|
||||||
|
--loose-file-key-management-filename=$MYSQL_TEST_DIR/std_data/logkey.txt
|
||||||
|
--file-key-management-encryption-algorithm=aes_cbc
|
||||||
|
--innodb-encrypt-log=1
|
45
mysql-test/suite/encryption/t/recovery_memory.test
Normal file
45
mysql-test/suite/encryption/t/recovery_memory.test
Normal file
@@ -0,0 +1,45 @@
|
|||||||
|
--source include/have_debug.inc
|
||||||
|
--source include/have_innodb.inc
|
||||||
|
--source include/have_sequence.inc
|
||||||
|
--source filekeys_plugin.inc
|
||||||
|
|
||||||
|
let $basedir=$MYSQLTEST_VARDIR/tmp/backup;
|
||||||
|
let MYSQLD_DATADIR=`select @@datadir`;
|
||||||
|
|
||||||
|
CREATE TABLE t1(f1 text, index idx(f1(20))) ENGINE INNODB;
|
||||||
|
|
||||||
|
# No checkpoint happens during this restart
|
||||||
|
|
||||||
|
let $shutdown_timeout=;
|
||||||
|
set global innodb_fast_shutdown=0;
|
||||||
|
let $restart_parameters=--debug_dbug=+d,ib_log_checkpoint_avoid_hard --innodb_flush_sync=0;
|
||||||
|
--source include/restart_mysqld.inc
|
||||||
|
set global debug_dbug="+d,ib_log_checkpoint_avoid_hard";
|
||||||
|
|
||||||
|
--disable_result_log
|
||||||
|
exec $XTRABACKUP --defaults-file=$MYSQLTEST_VARDIR/my.cnf --backup --target-dir=$basedir;
|
||||||
|
--enable_result_log
|
||||||
|
|
||||||
|
INSERT INTO t1 SELECT repeat('a', 8000) FROM seq_1_to_1280;
|
||||||
|
DELETE FROM t1;
|
||||||
|
SET GLOBAL innodb_max_purge_lag_wait=0;
|
||||||
|
INSERT INTO t1 VALUES('a');
|
||||||
|
|
||||||
|
--echo # XTRABACKUP PREPARE
|
||||||
|
exec $XTRABACKUP --prepare --target-dir=$basedir;
|
||||||
|
|
||||||
|
let $shutdown_timeout=0;
|
||||||
|
--source include/shutdown_mysqld.inc
|
||||||
|
|
||||||
|
# Since there is no checkpoint during previous run, we can
|
||||||
|
# Copy the datafile from t1.ibd and start the server
|
||||||
|
|
||||||
|
remove_file $MYSQLD_DATADIR/test/t1.ibd;
|
||||||
|
copy_file $basedir/test/t1.ibd $MYSQLD_DATADIR/test/t1.ibd;
|
||||||
|
--enable_result_log
|
||||||
|
let $restart_parameters=;
|
||||||
|
--source include/start_mysqld.inc
|
||||||
|
|
||||||
|
SELECT COUNT(*) FROM t1;
|
||||||
|
ALTER TABLE t1 FORCE;
|
||||||
|
DROP TABLE t1;
|
@@ -2509,7 +2509,7 @@ restart:
|
|||||||
ut_ad(log_sys.is_latest());
|
ut_ad(log_sys.is_latest());
|
||||||
|
|
||||||
alignas(8) byte iv[MY_AES_BLOCK_SIZE];
|
alignas(8) byte iv[MY_AES_BLOCK_SIZE];
|
||||||
byte *decrypt_buf= storing == YES
|
byte *decrypt_buf= storing != BACKUP
|
||||||
? static_cast<byte*>(alloca(srv_page_size)) : nullptr;
|
? static_cast<byte*>(alloca(srv_page_size)) : nullptr;
|
||||||
|
|
||||||
const lsn_t start_lsn{lsn};
|
const lsn_t start_lsn{lsn};
|
||||||
@@ -2654,7 +2654,7 @@ restart:
|
|||||||
sql_print_warning("InnoDB: Ignoring malformed log record at LSN "
|
sql_print_warning("InnoDB: Ignoring malformed log record at LSN "
|
||||||
LSN_PF, lsn);
|
LSN_PF, lsn);
|
||||||
/* the next record must not be same_page */
|
/* the next record must not be same_page */
|
||||||
if (storing == YES) last_offset= 1;
|
if (storing != BACKUP) last_offset= 1;
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
if (srv_operation == SRV_OPERATION_BACKUP)
|
if (srv_operation == SRV_OPERATION_BACKUP)
|
||||||
@@ -2664,7 +2664,7 @@ restart:
|
|||||||
lsn, b, l - recs + rlen, space_id, page_no));
|
lsn, b, l - recs + rlen, space_id, page_no));
|
||||||
goto same_page;
|
goto same_page;
|
||||||
}
|
}
|
||||||
if (storing == YES) last_offset= 0;
|
if (storing != BACKUP) last_offset= 0;
|
||||||
idlen= mlog_decode_varint_length(*l);
|
idlen= mlog_decode_varint_length(*l);
|
||||||
if (UNIV_UNLIKELY(idlen > 5 || idlen >= rlen))
|
if (UNIV_UNLIKELY(idlen > 5 || idlen >= rlen))
|
||||||
{
|
{
|
||||||
@@ -2695,7 +2695,7 @@ restart:
|
|||||||
goto page_id_corrupted;
|
goto page_id_corrupted;
|
||||||
l+= idlen;
|
l+= idlen;
|
||||||
rlen-= idlen;
|
rlen-= idlen;
|
||||||
if (storing == YES)
|
if (storing != BACKUP)
|
||||||
{
|
{
|
||||||
mach_write_to_4(iv + 8, space_id);
|
mach_write_to_4(iv + 8, space_id);
|
||||||
mach_write_to_4(iv + 12, page_no);
|
mach_write_to_4(iv + 12, page_no);
|
||||||
@@ -2745,15 +2745,15 @@ restart:
|
|||||||
ut_d(if ((b & 0x70) == INIT_PAGE || (b & 0x70) == OPTION)
|
ut_d(if ((b & 0x70) == INIT_PAGE || (b & 0x70) == OPTION)
|
||||||
freed.erase(id));
|
freed.erase(id));
|
||||||
ut_ad(freed.find(id) == freed.end());
|
ut_ad(freed.find(id) == freed.end());
|
||||||
const byte *cl= storing == NO ? nullptr : l.ptr;
|
const byte *cl= nullptr; /* avoid bogus -Wmaybe-uninitialized */
|
||||||
switch (b & 0x70) {
|
switch (b & 0x70) {
|
||||||
case FREE_PAGE:
|
case FREE_PAGE:
|
||||||
ut_ad(freed.emplace(id).second);
|
ut_ad(freed.emplace(id).second);
|
||||||
/* the next record must not be same_page */
|
/* the next record must not be same_page */
|
||||||
if (storing == YES) last_offset= 1;
|
if (storing != BACKUP) last_offset= 1;
|
||||||
goto free_or_init_page;
|
goto free_or_init_page;
|
||||||
case INIT_PAGE:
|
case INIT_PAGE:
|
||||||
if (storing == YES) last_offset= FIL_PAGE_TYPE;
|
if (storing != BACKUP) last_offset= FIL_PAGE_TYPE;
|
||||||
free_or_init_page:
|
free_or_init_page:
|
||||||
if (storing == BACKUP)
|
if (storing == BACKUP)
|
||||||
continue;
|
continue;
|
||||||
@@ -2808,13 +2808,14 @@ restart:
|
|||||||
trim({space_id, 0}, start_lsn);
|
trim({space_id, 0}, start_lsn);
|
||||||
truncated_undo_spaces[space_id - srv_undo_space_id_start]=
|
truncated_undo_spaces[space_id - srv_undo_space_id_start]=
|
||||||
{ start_lsn, page_no };
|
{ start_lsn, page_no };
|
||||||
if (storing == BACKUP && undo_space_trunc)
|
if (storing != BACKUP)
|
||||||
|
/* the next record must not be same_page */
|
||||||
|
last_offset= 1;
|
||||||
|
else if (undo_space_trunc)
|
||||||
undo_space_trunc(space_id);
|
undo_space_trunc(space_id);
|
||||||
/* the next record must not be same_page */
|
|
||||||
if (storing == YES) last_offset= 1;
|
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
if (storing == YES) last_offset= FIL_PAGE_TYPE;
|
if (storing != BACKUP) last_offset= FIL_PAGE_TYPE;
|
||||||
break;
|
break;
|
||||||
case OPTION:
|
case OPTION:
|
||||||
if (storing == YES && rlen == 5 && *l == OPT_PAGE_CHECKSUM)
|
if (storing == YES && rlen == 5 && *l == OPT_PAGE_CHECKSUM)
|
||||||
@@ -2825,7 +2826,13 @@ restart:
|
|||||||
case WRITE:
|
case WRITE:
|
||||||
case MEMMOVE:
|
case MEMMOVE:
|
||||||
case MEMSET:
|
case MEMSET:
|
||||||
if (storing != YES)
|
if (storing == BACKUP)
|
||||||
|
continue;
|
||||||
|
if (storing == NO && UNIV_LIKELY(page_no != 0))
|
||||||
|
/* fil_space_set_recv_size_and_flags() is mandatory for storing==NO.
|
||||||
|
It is only applicable to page_no == 0. Other than that, we can just
|
||||||
|
ignore the payload and only compute the mini-transaction checksum;
|
||||||
|
there will be a subsequent call with storing==YES. */
|
||||||
continue;
|
continue;
|
||||||
if (UNIV_UNLIKELY(rlen == 0 || last_offset == 1))
|
if (UNIV_UNLIKELY(rlen == 0 || last_offset == 1))
|
||||||
goto record_corrupted;
|
goto record_corrupted;
|
||||||
@@ -2867,7 +2874,7 @@ restart:
|
|||||||
last_offset)
|
last_offset)
|
||||||
: file_name_t::initial_flags;
|
: file_name_t::initial_flags;
|
||||||
if (it == recv_spaces.end())
|
if (it == recv_spaces.end())
|
||||||
ut_ad(space_id == TRX_SYS_SPACE ||
|
ut_ad(storing == NO || space_id == TRX_SYS_SPACE ||
|
||||||
srv_is_undo_tablespace(space_id));
|
srv_is_undo_tablespace(space_id));
|
||||||
else if (!it->second.space)
|
else if (!it->second.space)
|
||||||
{
|
{
|
||||||
|
Reference in New Issue
Block a user