diff options
| author | Thirunarayanan Balathandayuthapani <thiru@mariadb.com> | 2019-05-07 12:53:50 +0530 |
|---|---|---|
| committer | Thirunarayanan Balathandayuthapani <thiru@mariadb.com> | 2019-05-07 12:53:50 +0530 |
| commit | b2c599d62e6ba746b35f640708f9866da313b84b (patch) | |
| tree | 9a288efb7c1e0e6d64e20de3ddb1c9277abc9c63 | |
| parent | a5cfa416b4f5d888db856739c69fbb0124fdd8a3 (diff) | |
| download | mariadb-git-bb-10.2-MDEV-13893.tar.gz | |
MDEV-13893 encryption.innodb-redo-badkey failed in buildbot with page cannot be decryptedbb-10.2-MDEV-13893
- Remove the warning that shows "copy of doublewrite buffer page is
corrupted" from buf_dblwr_process().
| -rw-r--r-- | storage/innobase/buf/buf0dblwr.cc | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/storage/innobase/buf/buf0dblwr.cc b/storage/innobase/buf/buf0dblwr.cc index 200a65ba6ef..0993b104c80 100644 --- a/storage/innobase/buf/buf0dblwr.cc +++ b/storage/innobase/buf/buf0dblwr.cc @@ -652,18 +652,13 @@ bad: ulint decomp = fil_page_decompress(buf, page); if (!decomp || (decomp != srv_page_size && page_size.is_compressed())) { - goto bad_doublewrite; + continue; } if (expect_encrypted && mach_read_from_4( page + FIL_PAGE_FILE_FLUSH_LSN_OR_KEY_VERSION) ? !fil_space_verify_crypt_checksum(page, page_size) : buf_page_is_corrupted(true, page, page_size, space)) { - if (!is_all_zero) { -bad_doublewrite: - ib::warn() << "A doublewrite copy of page " - << page_id << " is corrupted."; - } /* Theoretically we could have another good copy for this page in the doublewrite buffer. If not, we will report a fatal error |