diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-02-12 16:40:05 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-02-12 16:56:01 +0200 |
| commit | 00f0c039d2f4213ccf0a0202349ecb162a799989 (patch) | |
| tree | 6a2c82488899d0162ddf4e015414113da89ad14d /storage/innobase/log | |
| parent | 33f70c4d9c42b6e4da062312e1e4a4fb370313df (diff) | |
| download | mariadb-git-00f0c039d2f4213ccf0a0202349ecb162a799989.tar.gz | |
MDEV-15270 Mariabackup should not try to use doublewrite buffermariadb-10.2.13
When Mariabackup gets a bad read of the first page of the system
tablespace file, it would inappropriately try to apply the doublewrite
buffer and write changes back to the data file (to the source file)!
This is very wrong and must be prevented.
The correct action would be to retry reading the system tablespace
as well as any other files whose first page was read incorrectly.
Fixing this was not attempted.
xb_load_tablespaces(): Shorten a bogus message to be more relevant.
The message can be displayed by --backup or --prepare.
xtrabackup_backup_func(), os_file_write_func(): Add a missing space
to a message.
Datafile::restore_from_doublewrite(): Do not even attempt the
operation in Mariabackup.
recv_init_crash_recovery_spaces(): Do not attempt to restore the
doublewrite buffer in Mariabackup (--prepare or --export), because
all pages should have been copied correctly in --backup already,
and because --backup should ignore the doublewrite buffer.
SysTablespace::read_lsn_and_check_flags(): Do not attempt to initialize
the doublewrite buffer in Mariabackup.
innodb_make_page_dirty(): Correct the bounds check.
Datafile::read_first_page(): Correct the name of the parameter.
Diffstat (limited to 'storage/innobase/log')
| -rw-r--r-- | storage/innobase/log/log0recv.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/storage/innobase/log/log0recv.cc b/storage/innobase/log/log0recv.cc index 818a0f0422e..e55c01aca3a 100644 --- a/storage/innobase/log/log0recv.cc +++ b/storage/innobase/log/log0recv.cc @@ -3147,7 +3147,9 @@ recv_init_crash_recovery_spaces() << "', but there were no modifications either."; } - buf_dblwr_process(); + if (srv_operation == SRV_OPERATION_NORMAL) { + buf_dblwr_process(); + } if (srv_force_recovery < SRV_FORCE_NO_LOG_REDO) { /* Spawn the background thread to flush dirty pages |