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-33980 mariadb-backup --backup is missing retry logic for undo tablespaces

Browse source 
Problem:
========
- Currently mariabackup have to reread the pages in case they are
modified by server concurrently. But while reading the undo
tablespace, mariabackup failed to do reread the page in case of
error.

Fix:
===
Mariabackup --backup functionality should have retry logic
while reading the undo tablespaces.
This commit is contained in:
Thirunarayanan Balathandayuthapani 2024-04-30 14:16:08 +05:30
parent a586b6dbc8
commit f378e76434
4 changed files with 46 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
mysql-test/suite/mariabackup/undo_space_id.result
View file

@ -11,3 +11,10 @@ undo004
undo003
undo004
DROP TABLE t1;
#
# MDEV-33980 mariadb-backup --backup is missing
# retry logic for undo tablespaces
#
# xtrabackup backup
# Display undo log files from target directory
FOUND 5 /Retrying to read undo tablespace*/ in backup.log

19
mysql-test/suite/mariabackup/undo_space_id.test
View file

@ -23,3 +23,22 @@ list_files $basedir undo*;
DROP TABLE t1;
rmdir $basedir;
--echo #
--echo # MDEV-33980 mariadb-backup --backup is missing
--echo # retry logic for undo tablespaces
--echo #
let $backuplog= $MYSQLTEST_VARDIR/tmp/backup.log;
--echo # xtrabackup backup
--disable_result_log
--error 1
exec $XTRABACKUP --defaults-file=$MYSQLTEST_VARDIR/my.cnf --backup --target-dir=$basedir --dbug=+d,undo_space_read_fail > $backuplog;
--enable_result_log
--echo # Display undo log files from target directory
list_files $basedir undo*;
--let SEARCH_PATTERN=Retrying to read undo tablespace*
--let SEARCH_FILE=$backuplog
--source include/search_pattern_in_file.inc
rmdir $basedir;
remove_file $backuplog;

8
storage/innobase/os/os0file.cc
View file

@ -7560,7 +7560,15 @@ invalid:
}
ut_free(buf2);
DBUG_EXECUTE_IF("undo_space_read_fail",
if (space_id == srv_undo_space_id_start) {
goto wrong_space_id;
});
if (UNIV_UNLIKELY(space_id != space->id)) {
#ifndef DBUG_OFF
wrong_space_id:
#endif
ib::error() << "Expected tablespace id " << space->id
<< " but found " << space_id
<< " in the file " << name;

13
storage/innobase/srv/srv0start.cc
View file

@ -100,6 +100,7 @@ Created 2/16/1996 Heikki Tuuri
#include "zlib.h"
#include "ut0crc32.h"
#include "btr0scrub.h"
#include "log.h"
/** Log sequence number immediately after startup */
lsn_t srv_start_lsn;
@ -656,10 +657,11 @@ static bool srv_undo_tablespace_open(const char* name, ulint space_id,
pfs_os_file_t fh;
bool success;
char undo_name[sizeof "innodb_undo000"];
ulint n_retries = 5;
snprintf(undo_name, sizeof(undo_name),
"innodb_undo%03u", static_cast<unsigned>(space_id));
undo_retry:
fh = os_file_create(
innodb_data_file_key, name, OS_FILE_OPEN
| OS_FILE_ON_ERROR_NO_EXIT | OS_FILE_ON_ERROR_SILENT,
@ -716,6 +718,15 @@ static bool srv_undo_tablespace_open(const char* name, ulint space_id,
mutex_exit(&fil_system.mutex);
if (!success && n_retries &&
srv_operation == SRV_OPERATION_BACKUP) {
sql_print_information("InnoDB: Retrying to read undo "
"tablespace %s", undo_name);
fil_space_free(space_id, false);
n_retries--;
goto undo_retry;
}
return success;
}