From 3e8cab51cb78f3e60e139af944eef8f25502fc81 Mon Sep 17 00:00:00 2001 From: Thirunarayanan Balathandayuthapani Date: Tue, 7 May 2019 12:53:50 +0530 Subject: [PATCH] MDEV-13893 encryption.innodb-redo-badkey failed in buildbot with page cannot be decrypted buf_dblwr_process(): Remove the useless warning that a copy of a page in the doublewrite buffer is corrupted. We already report an error if a corrupted page cannot be recovered from the doublewrite buffer. Note: In MariaDB 10.1, the original bug reported in MDEV-13893 could still be easily repeatable. In MariaDB 10.2.24, MDEV-12699 should have reduced the probability considerably. --- storage/innobase/buf/buf0dblwr.cc | 9 +-------- storage/xtradb/buf/buf0dblwr.cc | 9 +-------- 2 files changed, 2 insertions(+), 16 deletions(-) diff --git a/storage/innobase/buf/buf0dblwr.cc b/storage/innobase/buf/buf0dblwr.cc index 2046d8736c6..7e7f3859658 100644 --- a/storage/innobase/buf/buf0dblwr.cc +++ b/storage/innobase/buf/buf0dblwr.cc @@ -612,20 +612,13 @@ bad: ulint decomp = fil_page_decompress(buf, page); if (!decomp || (decomp != srv_page_size && zip_size)) { - 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, zip_size) : buf_page_is_corrupted(true, page, zip_size, space())) { - if (!is_all_zero) { -bad_doublewrite: - ib_logf(IB_LOG_LEVEL_WARN, - "A doublewrite copy of page " - ULINTPF ":" ULINTPF " is corrupted.", - space_id, page_no); - } /* Theoretically we could have another good copy for this page in the doublewrite buffer. If not, we will report a fatal error diff --git a/storage/xtradb/buf/buf0dblwr.cc b/storage/xtradb/buf/buf0dblwr.cc index 245ec68593a..74fa82eb155 100644 --- a/storage/xtradb/buf/buf0dblwr.cc +++ b/storage/xtradb/buf/buf0dblwr.cc @@ -612,20 +612,13 @@ bad: ulint decomp = fil_page_decompress(buf, page); if (!decomp || (decomp != srv_page_size && zip_size)) { - 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, zip_size) : buf_page_is_corrupted(true, page, zip_size, space())) { - if (!is_all_zero) { -bad_doublewrite: - ib_logf(IB_LOG_LEVEL_WARN, - "A doublewrite copy of page " - ULINTPF ":" ULINTPF " is corrupted.", - space_id, page_no); - } /* Theoretically we could have another good copy for this page in the doublewrite buffer. If not, we will report a fatal error