Skip to content

Commit 1b49c89

Browse files
committed
Re-enable the test mariabackup.unsupported_redo
Remove the logic for skipping the test if a log checkpoint occurred, and the logic for tolerating failures. Thanks to MDEV-16791, MLOG_INDEX_LOAD is supposed to always work.
1 parent f926c5f commit 1b49c89

File tree

3 files changed

+2
-36
lines changed

3 files changed

+2
-36
lines changed

mysql-test/suite/mariabackup/disabled.def

Lines changed: 0 additions & 1 deletion
This file was deleted.

mysql-test/suite/mariabackup/unsupported_redo.result

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ call mtr.add_suppression("InnoDB: Cannot open datafile for read-only: ");
77
call mtr.add_suppression("Table .* in the InnoDB data dictionary has tablespace id .*, but tablespace with that id or name does not exist");
88
CREATE TABLE t1(i INT PRIMARY KEY auto_increment, a int) ENGINE INNODB;
99
ALTER TABLE t1 FORCE, ALGORITHM=INPLACE;
10-
# Fails during full backup
10+
# No longer fails during full backup
1111
DROP TABLE t1;
1212
CREATE TABLE t1(i INT PRIMARY KEY auto_increment, a int) ENGINE INNODB;
1313
INSERT INTO t1(a) select 1 union select 2 union select 3;

mysql-test/suite/mariabackup/unsupported_redo.test

Lines changed: 1 addition & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -11,33 +11,15 @@ let $basedir=$MYSQLTEST_VARDIR/tmp/backup;
1111
let $incremental_dir=$MYSQLTEST_VARDIR/tmp/backup_inc1;
1212

1313
CREATE TABLE t1(i INT PRIMARY KEY auto_increment, a int) ENGINE INNODB;
14-
--source ../../suite/innodb/include/no_checkpoint_start.inc
1514
ALTER TABLE t1 FORCE, ALGORITHM=INPLACE;
1615

17-
# Below mariabackup operation may complete successfully if checkpoint happens
18-
# after the alter table command.
19-
20-
echo # Fails during full backup;
16+
echo # No longer fails during full backup;
2117
--disable_result_log
22-
--error 0,1
2318
exec $XTRABACKUP --defaults-file=$MYSQLTEST_VARDIR/my.cnf --backup --target-dir=$basedir;
2419
--enable_result_log
2520

2621
DROP TABLE t1;
2722

28-
--let MYSQLD_DATADIR=$basedir/
29-
perl;
30-
open(OUT, ">$ENV{MYSQLTEST_VARDIR}/log/check.txt") || die;
31-
print OUT '
32-
--let no_checkpoint_end=1
33-
--let CLEANUP_IF_CHECKPOINT=rmdir $basedir;
34-
--source ../../suite/innodb/include/no_checkpoint_end.inc
35-
--exit Backup failed to fail despite MLOG_INDEX_LOAD record
36-
' if (-f "$ENV{MYSQLD_DATADIR}/xtrabackup_info");
37-
close(OUT);
38-
EOF
39-
--source $MYSQLTEST_VARDIR/log/check.txt
40-
--remove_file $MYSQLTEST_VARDIR/log/check.txt
4123
rmdir $basedir;
4224

4325
CREATE TABLE t1(i INT PRIMARY KEY auto_increment, a int) ENGINE INNODB;
@@ -50,29 +32,14 @@ INSERT INTO t1(a) select 1 union select 2 union select 3;
5032
exec $XTRABACKUP --defaults-file=$MYSQLTEST_VARDIR/my.cnf --backup --target-dir=$basedir;
5133
--enable_result_log
5234

53-
--source ../../suite/innodb/include/no_checkpoint_start.inc
5435
ALTER TABLE t1 FORCE, ALGORITHM=INPLACE;
5536

5637
--disable_result_log
57-
--error 0,1
5838
exec $XTRABACKUP --defaults-file=$MYSQLTEST_VARDIR/my.cnf --backup --target-dir=$incremental_dir --incremental-basedir=$basedir;
5939
--enable_result_log
6040

6141
DROP TABLE t1;
6242

63-
--let MYSQLD_DATADIR=$incremental_dir/
64-
perl;
65-
open(OUT, ">$ENV{MYSQLTEST_VARDIR}/log/check.txt") || die;
66-
print OUT '
67-
--let no_checkpoint_end=1
68-
--let CLEANUP_IF_CHECKPOINT=rmdir $basedir;rmdir $incremental_dir;
69-
--source ../../suite/innodb/include/no_checkpoint_end.inc
70-
--exit Backup failed to fail despite MLOG_INDEX_LOAD record
71-
' if (-f "$ENV{MYSQLD_DATADIR}/xtrabackup_info");
72-
close(OUT);
73-
EOF
74-
--source $MYSQLTEST_VARDIR/log/check.txt
75-
--remove_file $MYSQLTEST_VARDIR/log/check.txt
7643
rmdir $basedir;rmdir $incremental_dir;
7744

7845
CREATE TABLE t1(i INT) ENGINE INNODB;

0 commit comments

Comments
 (0)