Skip to content

M
MariaDB
Commit 5f5e73f1 authored by Thirunarayanan Balathandayuthapani's avatar Thirunarayanan Balathandayuthapani Committed by Marko Mäkelä
Browse files
Options

MDEV-17957 Make Innodb_checksum_algorithm stricter for strict_* values 

Problem:

  Innodb_checksum_algorithm checks for all checksum algorithm to
validate the page checksum even though the algorithm is specified as
strict_crc32, strict_innodb, strict_none.

Fix:

   Remove the checks for all checksum algorithm to validate the page
checksum if the algo is specified as strict_* values.
parent ce1669af
Hide whitespace changes
Inline Side-by-side
Showing with 199 additions and 465 deletions
storage/innobase/buf/buf0buf.cc
View file @ 5f5e73f1
...@@ -581,6 +581,8 @@ buf_page_is_corrupted( ...@@ -581,6 +581,8 @@ buf_page_is_corrupted(
ulint checksum_field1; ulint checksum_field1;
ulint checksum_field2; ulint checksum_field2;
ib_uint32_t crc32 = ULINT32_UNDEFINED;
bool crc32_inited = false;
if (!zip_size if (!zip_size
&& memcmp(read_buf + FIL_PAGE_LSN + 4, && memcmp(read_buf + FIL_PAGE_LSN + 4,
...@@ -660,120 +662,124 @@ buf_page_is_corrupted( ...@@ -660,120 +662,124 @@ buf_page_is_corrupted(
return(FALSE); return(FALSE);
} }
ulint page_no = mach_read_from_4(read_buf + FIL_PAGE_OFFSET);
ulint space_id = mach_read_from_4(read_buf + FIL_PAGE_SPACE_ID);
const srv_checksum_algorithm_t curr_algo = const srv_checksum_algorithm_t curr_algo =
static_cast<srv_checksum_algorithm_t>(srv_checksum_algorithm); static_cast<srv_checksum_algorithm_t>(srv_checksum_algorithm);
switch (curr_algo) { switch (curr_algo) {
case SRV_CHECKSUM_ALGORITHM_CRC32:
case SRV_CHECKSUM_ALGORITHM_STRICT_CRC32: case SRV_CHECKSUM_ALGORITHM_STRICT_CRC32:
if (buf_page_is_checksum_valid_crc32(read_buf, checksum_field1,
if (buf_page_is_checksum_valid_crc32(read_buf, checksum_field2)) {
checksum_field1, checksum_field2)) { return FALSE;
return(FALSE);
} }
if (buf_page_is_checksum_valid_none(read_buf, return TRUE;
checksum_field1, checksum_field2)) { case SRV_CHECKSUM_ALGORITHM_STRICT_INNODB:
if (curr_algo if (buf_page_is_checksum_valid_innodb(read_buf, checksum_field1,
== SRV_CHECKSUM_ALGORITHM_STRICT_CRC32) { checksum_field2)) {
page_warn_strict_checksum( return FALSE;
curr_algo, }
SRV_CHECKSUM_ALGORITHM_NONE,
space_id, page_no);
}
return(FALSE); return TRUE;
case SRV_CHECKSUM_ALGORITHM_STRICT_NONE:
if (buf_page_is_checksum_valid_none(read_buf, checksum_field1,
checksum_field2)) {
return FALSE;
} }
if (buf_page_is_checksum_valid_innodb(read_buf, return TRUE;
checksum_field1, checksum_field2)) { case SRV_CHECKSUM_ALGORITHM_CRC32:
if (curr_algo case SRV_CHECKSUM_ALGORITHM_INNODB:
== SRV_CHECKSUM_ALGORITHM_STRICT_CRC32) { /* Verify old versions of InnoDB only stored 8 byte lsn to the
page_warn_strict_checksum( start and end of the page. */
curr_algo,
SRV_CHECKSUM_ALGORITHM_INNODB,
space_id, page_no);
}
return(FALSE); /* Since innodb_checksum_algorithm is not strict_* allow
} any of the algos to match for the old field. */
return(TRUE); if (checksum_field2
!= mach_read_from_4(read_buf + FIL_PAGE_LSN)
&& checksum_field2 != BUF_NO_CHECKSUM_MAGIC) {
case SRV_CHECKSUM_ALGORITHM_INNODB: if (srv_checksum_algorithm
case SRV_CHECKSUM_ALGORITHM_STRICT_INNODB: == SRV_CHECKSUM_ALGORITHM_CRC32) {
if (buf_page_is_checksum_valid_innodb(read_buf, crc32 = buf_calc_page_crc32(read_buf);
checksum_field1, checksum_field2)) { crc32_inited = true;
return(FALSE);
}
if (buf_page_is_checksum_valid_none(read_buf, if (checksum_field2 != crc32
checksum_field1, checksum_field2)) { && checksum_field2
if (curr_algo != buf_calc_page_old_checksum(read_buf)) {
== SRV_CHECKSUM_ALGORITHM_STRICT_INNODB) { return TRUE;
page_warn_strict_checksum( }
curr_algo, } else {
SRV_CHECKSUM_ALGORITHM_NONE, ut_ad(srv_checksum_algorithm
space_id, page_no); == SRV_CHECKSUM_ALGORITHM_INNODB);
}
return(FALSE); if (checksum_field2
} != buf_calc_page_old_checksum(read_buf)) {
if (buf_page_is_checksum_valid_crc32(read_buf, crc32 = buf_calc_page_crc32(read_buf);
checksum_field1, checksum_field2)) { crc32_inited = TRUE;
if (curr_algo
== SRV_CHECKSUM_ALGORITHM_STRICT_INNODB) {
page_warn_strict_checksum(
curr_algo,
SRV_CHECKSUM_ALGORITHM_CRC32,
space_id, page_no);
}
return(FALSE); if (checksum_field2 != crc32) {
return TRUE;
}
}
}
} }
return(TRUE); /* Old field is fine, check the new field */
case SRV_CHECKSUM_ALGORITHM_STRICT_NONE: if (checksum_field1 != 0
&& checksum_field1 != BUF_NO_CHECKSUM_MAGIC) {
if (buf_page_is_checksum_valid_none(read_buf, if (srv_checksum_algorithm
checksum_field1, checksum_field2)) { == SRV_CHECKSUM_ALGORITHM_CRC32) {
return(FALSE);
}
if (buf_page_is_checksum_valid_crc32(read_buf, if (!crc32_inited) {
checksum_field1, checksum_field2)) { crc32 = buf_calc_page_crc32(read_buf);
page_warn_strict_checksum( crc32_inited = TRUE;
curr_algo, }
SRV_CHECKSUM_ALGORITHM_CRC32,
space_id, page_no); if (checksum_field1 != crc32
return(FALSE); && checksum_field1
!= buf_calc_page_new_checksum(read_buf)) {
return TRUE;
}
} else {
ut_ad(srv_checksum_algorithm
== SRV_CHECKSUM_ALGORITHM_INNODB);
if (checksum_field1
!= buf_calc_page_new_checksum(read_buf)) {
if (!crc32_inited) {
crc32 = buf_calc_page_crc32(
read_buf);
crc32_inited = TRUE;
}
if (checksum_field1 != crc32) {
return TRUE;
}
}
}
} }
if (buf_page_is_checksum_valid_innodb(read_buf, if (crc32_inited
checksum_field1, checksum_field2)) { && ((checksum_field1 == crc32
page_warn_strict_checksum( && checksum_field2 != crc32)
curr_algo, || (checksum_field1 != crc32
SRV_CHECKSUM_ALGORITHM_INNODB, && checksum_field2 == crc32))) {
space_id, page_no); return TRUE;
return(FALSE);
} }
return(TRUE); break;
case SRV_CHECKSUM_ALGORITHM_NONE: case SRV_CHECKSUM_ALGORITHM_NONE:
/* should have returned FALSE earlier */ ut_error;
break;
/* no default so the compiler will emit a warning if new enum
is added and not handled here */
} }
ut_error; return FALSE;
return(FALSE);
} }
/** Dump a page to stderr. /** Dump a page to stderr.
......
storage/innobase/include/page0page.h
View file @ 5f5e73f1
/***************************************************************************** /*****************************************************************************
Copyright (c) 1994, 2016, Oracle and/or its affiliates. All Rights Reserved. Copyright (c) 1994, 2016, Oracle and/or its affiliates. All Rights Reserved.
Copyright (c) 2013, 2016, MariaDB Corporation Copyright (c) 2013, 2018, MariaDB Corporation.
This program is free software; you can redistribute it and/or modify it under This program is free software; you can redistribute it and/or modify it under
the terms of the GNU General Public License as published by the Free Software the terms of the GNU General Public License as published by the Free Software
...@@ -1123,19 +1123,6 @@ const rec_t* ...@@ -1123,19 +1123,6 @@ const rec_t*
page_find_rec_max_not_deleted( page_find_rec_max_not_deleted(
const page_t* page); const page_t* page);
/** Issue a warning when the checksum that is stored in the page is valid,
but different than the global setting innodb_checksum_algorithm.
@param[in] current_algo current checksum algorithm
@param[in] page_checksum page valid checksum
@param[in] space_id tablespace id
@param[in] page_no page number */
void
page_warn_strict_checksum(
srv_checksum_algorithm_t curr_algo,
srv_checksum_algorithm_t page_checksum,
ulint space_id,
ulint page_no);
#ifdef UNIV_MATERIALIZE #ifdef UNIV_MATERIALIZE
#undef UNIV_INLINE #undef UNIV_INLINE
#define UNIV_INLINE UNIV_INLINE_ORIGINAL #define UNIV_INLINE UNIV_INLINE_ORIGINAL
......
storage/innobase/include/page0zip.h
View file @ 5f5e73f1
...@@ -546,21 +546,6 @@ from outside the buffer pool. ...@@ -546,21 +546,6 @@ from outside the buffer pool.
# define UNIV_INLINE UNIV_INLINE_ORIGINAL # define UNIV_INLINE UNIV_INLINE_ORIGINAL
#endif #endif
#ifdef UNIV_INNOCHECKSUM
/** Issue a warning when the checksum that is stored in the page is valid,
but different than the global setting innodb_checksum_algorithm.
@param[in] current_algo current checksum algorithm
@param[in] page_checksum page valid checksum
@param[in] space_id tablespace id
@param[in] page_no page number */
void
page_warn_strict_checksum(
srv_checksum_algorithm_t curr_algo,
srv_checksum_algorithm_t page_checksum,
ulint space_id,
ulint page_no);
#endif /* UNIV_INNOCHECKSUM */
#ifndef UNIV_INNOCHECKSUM #ifndef UNIV_INNOCHECKSUM
#ifndef UNIV_NONINL #ifndef UNIV_NONINL
# include "page0zip.ic" # include "page0zip.ic"
......
storage/innobase/page/page0page.cc
View file @ 5f5e73f1
...@@ -2807,45 +2807,3 @@ page_find_rec_max_not_deleted( ...@@ -2807,45 +2807,3 @@ page_find_rec_max_not_deleted(
} }
return(prev_rec); return(prev_rec);
} }
/** Issue a warning when the checksum that is stored in the page is valid,
but different than the global setting innodb_checksum_algorithm.
@param[in] current_algo current checksum algorithm
@param[in] page_checksum page valid checksum
@param[in] space_id tablespace id
@param[in] page_no page number */
void
page_warn_strict_checksum(
srv_checksum_algorithm_t curr_algo,
srv_checksum_algorithm_t page_checksum,
ulint space_id,
ulint page_no)
{
srv_checksum_algorithm_t curr_algo_nonstrict;
switch (curr_algo) {
case SRV_CHECKSUM_ALGORITHM_STRICT_CRC32:
curr_algo_nonstrict = SRV_CHECKSUM_ALGORITHM_CRC32;
break;
case SRV_CHECKSUM_ALGORITHM_STRICT_INNODB:
curr_algo_nonstrict = SRV_CHECKSUM_ALGORITHM_INNODB;
break;
case SRV_CHECKSUM_ALGORITHM_STRICT_NONE:
curr_algo_nonstrict = SRV_CHECKSUM_ALGORITHM_NONE;
break;
default:
ut_error;
}
ib_logf(IB_LOG_LEVEL_WARN,
"innodb_checksum_algorithm is set to \"%s\""
" but the page [page id: space=" ULINTPF ","
" page number=" ULINTPF "] contains a valid checksum \"%s\"."
" Accepting the page as valid. Change innodb_checksum_algorithm"
" to \"%s\" to silently accept such pages or rewrite all pages"
" so that they contain \"%s\" checksum.",
buf_checksum_algorithm_name(curr_algo),
space_id, page_no,
buf_checksum_algorithm_name(page_checksum),
buf_checksum_algorithm_name(curr_algo_nonstrict),
buf_checksum_algorithm_name(curr_algo_nonstrict));
}
storage/innobase/page/page0zip.cc
View file @ 5f5e73f1
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
Copyright (c) 2005, 2016, Oracle and/or its affiliates. All Rights Reserved. Copyright (c) 2005, 2016, Oracle and/or its affiliates. All Rights Reserved.
Copyright (c) 2012, Facebook Inc. Copyright (c) 2012, Facebook Inc.
Copyright (c) 2017, MariaDB Corporation. Copyright (c) 2014, 2018, MariaDB Corporation.
This program is free software; you can redistribute it and/or modify it under This program is free software; you can redistribute it and/or modify it under
the terms of the GNU General Public License as published by the Free Software the terms of the GNU General Public License as published by the Free Software
...@@ -48,8 +48,6 @@ using namespace std; ...@@ -48,8 +48,6 @@ using namespace std;
#include "btr0cur.h" #include "btr0cur.h"
#include "page0types.h" #include "page0types.h"
#include "log0recv.h" #include "log0recv.h"
#else
#define page_warn_strict_checksum(A,B,C,D)
#endif /* !UNIV_INNOCHECKSUM */ #endif /* !UNIV_INNOCHECKSUM */
#include "zlib.h" #include "zlib.h"
#ifndef UNIV_HOTBACKUP #ifndef UNIV_HOTBACKUP
...@@ -4926,13 +4924,6 @@ page_zip_verify_checksum( ...@@ -4926,13 +4924,6 @@ page_zip_verify_checksum(
stored = static_cast<ib_uint32_t>(mach_read_from_4( stored = static_cast<ib_uint32_t>(mach_read_from_4(
static_cast<const unsigned char*>(data) + FIL_PAGE_SPACE_OR_CHKSUM)); static_cast<const unsigned char*>(data) + FIL_PAGE_SPACE_OR_CHKSUM));
ulint page_no MY_ATTRIBUTE((unused)) =
mach_read_from_4(static_cast<const unsigned char*>
(data) + FIL_PAGE_OFFSET);
ulint space_id MY_ATTRIBUTE((unused)) =
mach_read_from_4(static_cast<const unsigned char*>
(data) + FIL_PAGE_SPACE_ID);
#if FIL_PAGE_LSN % 8 #if FIL_PAGE_LSN % 8
#error "FIL_PAGE_LSN must be 64 bit aligned" #error "FIL_PAGE_LSN must be 64 bit aligned"
#endif #endif
...@@ -4974,97 +4965,31 @@ page_zip_verify_checksum( ...@@ -4974,97 +4965,31 @@ page_zip_verify_checksum(
switch (curr_algo) { switch (curr_algo) {
case SRV_CHECKSUM_ALGORITHM_STRICT_CRC32: case SRV_CHECKSUM_ALGORITHM_STRICT_CRC32:
case SRV_CHECKSUM_ALGORITHM_CRC32: case SRV_CHECKSUM_ALGORITHM_STRICT_INNODB:
case SRV_CHECKSUM_ALGORITHM_STRICT_NONE:
return stored == calc;
case SRV_CHECKSUM_ALGORITHM_CRC32:
if (stored == BUF_NO_CHECKSUM_MAGIC) { if (stored == BUF_NO_CHECKSUM_MAGIC) {
if (curr_algo
== SRV_CHECKSUM_ALGORITHM_STRICT_CRC32) {
page_warn_strict_checksum(
curr_algo,
SRV_CHECKSUM_ALGORITHM_NONE,
space_id, page_no);
}
return(TRUE); return(TRUE);
} }
crc32 = calc;
innodb = static_cast<ib_uint32_t>(page_zip_calc_checksum( innodb = static_cast<ib_uint32_t>(page_zip_calc_checksum(
data, size, SRV_CHECKSUM_ALGORITHM_INNODB)); data, size, SRV_CHECKSUM_ALGORITHM_INNODB));
if (stored == innodb) {
if (curr_algo
== SRV_CHECKSUM_ALGORITHM_STRICT_CRC32) {
page_warn_strict_checksum(
curr_algo,
SRV_CHECKSUM_ALGORITHM_INNODB,
space_id, page_no);
}
return(TRUE);
}
break; break;
case SRV_CHECKSUM_ALGORITHM_STRICT_INNODB:
case SRV_CHECKSUM_ALGORITHM_INNODB: case SRV_CHECKSUM_ALGORITHM_INNODB:
if (stored == BUF_NO_CHECKSUM_MAGIC) { if (stored == BUF_NO_CHECKSUM_MAGIC) {
if (curr_algo return TRUE;
== SRV_CHECKSUM_ALGORITHM_STRICT_INNODB) {
page_warn_strict_checksum(
curr_algo,
SRV_CHECKSUM_ALGORITHM_NONE,
space_id, page_no);
}
return(TRUE);
} }
crc32 = static_cast<ib_uint32_t>(page_zip_calc_checksum( crc32 = static_cast<ib_uint32_t>(page_zip_calc_checksum(
data, size, SRV_CHECKSUM_ALGORITHM_CRC32)); data, size, SRV_CHECKSUM_ALGORITHM_CRC32));
innodb = calc;
if (stored == crc32) {
if (curr_algo
== SRV_CHECKSUM_ALGORITHM_STRICT_INNODB) {
page_warn_strict_checksum(
curr_algo,
SRV_CHECKSUM_ALGORITHM_CRC32,
space_id, page_no);
}
return(TRUE);
}
break;
case SRV_CHECKSUM_ALGORITHM_STRICT_NONE:
crc32 = static_cast<ib_uint32_t>(page_zip_calc_checksum(
data, size, SRV_CHECKSUM_ALGORITHM_CRC32));
if (stored == crc32) {
page_warn_strict_checksum(
curr_algo, SRV_CHECKSUM_ALGORITHM_CRC32,
space_id, page_no);
return(TRUE);
}
innodb = static_cast<ib_uint32_t>(page_zip_calc_checksum(
data, size, SRV_CHECKSUM_ALGORITHM_INNODB));
if (stored == innodb) {
page_warn_strict_checksum(
curr_algo,
SRV_CHECKSUM_ALGORITHM_INNODB,
space_id, page_no);
return(TRUE);
}
break; break;
case SRV_CHECKSUM_ALGORITHM_NONE: case SRV_CHECKSUM_ALGORITHM_NONE:
ut_error; return TRUE;
/* no default so the compiler will emit a warning if new enum
is added and not handled here */
} }
return(FALSE); return (stored == crc32 || stored == innodb);
} }
storage/xtradb/buf/buf0buf.cc
View file @ 5f5e73f1
...@@ -653,6 +653,8 @@ buf_page_is_corrupted( ...@@ -653,6 +653,8 @@ buf_page_is_corrupted(
ulint checksum_field1; ulint checksum_field1;
ulint checksum_field2; ulint checksum_field2;
ib_uint32_t crc32 = ULINT32_UNDEFINED;
bool crc32_inited = false;
if (!zip_size if (!zip_size
&& memcmp(read_buf + FIL_PAGE_LSN + 4, && memcmp(read_buf + FIL_PAGE_LSN + 4,
...@@ -732,120 +734,124 @@ buf_page_is_corrupted( ...@@ -732,120 +734,124 @@ buf_page_is_corrupted(
return(FALSE); return(FALSE);
} }
ulint page_no = mach_read_from_4(read_buf + FIL_PAGE_OFFSET);
ulint space_id = mach_read_from_4(read_buf + FIL_PAGE_SPACE_ID);
const srv_checksum_algorithm_t curr_algo = const srv_checksum_algorithm_t curr_algo =
static_cast<srv_checksum_algorithm_t>(srv_checksum_algorithm); static_cast<srv_checksum_algorithm_t>(srv_checksum_algorithm);
switch (curr_algo) { switch (curr_algo) {
case SRV_CHECKSUM_ALGORITHM_CRC32:
case SRV_CHECKSUM_ALGORITHM_STRICT_CRC32: case SRV_CHECKSUM_ALGORITHM_STRICT_CRC32:
if (buf_page_is_checksum_valid_crc32(read_buf, checksum_field1,
if (buf_page_is_checksum_valid_crc32(read_buf, checksum_field2)) {
checksum_field1, checksum_field2)) { return FALSE;
return(FALSE);
} }
if (buf_page_is_checksum_valid_none(read_buf, return TRUE;
checksum_field1, checksum_field2)) {
if (curr_algo
== SRV_CHECKSUM_ALGORITHM_STRICT_CRC32) {
page_warn_strict_checksum(
curr_algo,
SRV_CHECKSUM_ALGORITHM_NONE,
space_id, page_no);
}
return(FALSE); case SRV_CHECKSUM_ALGORITHM_STRICT_INNODB:
if (buf_page_is_checksum_valid_innodb(read_buf, checksum_field1,
checksum_field2)) {
return FALSE;
} }
if (buf_page_is_checksum_valid_innodb(read_buf, return TRUE;
checksum_field1, checksum_field2)) { case SRV_CHECKSUM_ALGORITHM_STRICT_NONE:
if (curr_algo if (buf_page_is_checksum_valid_none(read_buf, checksum_field1,
== SRV_CHECKSUM_ALGORITHM_STRICT_CRC32) { checksum_field2)) {
page_warn_strict_checksum( return FALSE;
curr_algo,
SRV_CHECKSUM_ALGORITHM_INNODB,
space_id, page_no);
}
return(FALSE);
} }
return(TRUE); return TRUE;
case SRV_CHECKSUM_ALGORITHM_CRC32:
case SRV_CHECKSUM_ALGORITHM_INNODB: case SRV_CHECKSUM_ALGORITHM_INNODB:
case SRV_CHECKSUM_ALGORITHM_STRICT_INNODB: /* Verify old versions of InnoDB only stored 8 byte lsn to the
start and end of the page. */
if (buf_page_is_checksum_valid_innodb(read_buf, /* Since innodb_checksum_algorithm is not strict_* allow
checksum_field1, checksum_field2)) { any of the algos to match for the old field. */
return(FALSE);
}
if (buf_page_is_checksum_valid_none(read_buf, if (checksum_field2
checksum_field1, checksum_field2)) { != mach_read_from_4(read_buf + FIL_PAGE_LSN)
if (curr_algo && checksum_field2 != BUF_NO_CHECKSUM_MAGIC) {
== SRV_CHECKSUM_ALGORITHM_STRICT_INNODB) {
page_warn_strict_checksum(
curr_algo,
SRV_CHECKSUM_ALGORITHM_NONE,
space_id, page_no);
}
return(FALSE); if (srv_checksum_algorithm
} == SRV_CHECKSUM_ALGORITHM_CRC32) {
if (buf_page_is_checksum_valid_crc32(read_buf, crc32 = buf_calc_page_crc32(read_buf);
checksum_field1, checksum_field2)) { crc32_inited = true;
if (curr_algo
== SRV_CHECKSUM_ALGORITHM_STRICT_INNODB) {
page_warn_strict_checksum(
curr_algo,
SRV_CHECKSUM_ALGORITHM_CRC32,
space_id, page_no);
}
return(FALSE); if (checksum_field2 != crc32
} && checksum_field2
!= buf_calc_page_old_checksum(read_buf)) {
return TRUE;
}
} else {
ut_ad(srv_checksum_algorithm
== SRV_CHECKSUM_ALGORITHM_INNODB);
return(TRUE); if (checksum_field2
!= buf_calc_page_old_checksum(read_buf)) {
case SRV_CHECKSUM_ALGORITHM_STRICT_NONE: crc32 = buf_calc_page_crc32(read_buf);
crc32_inited = TRUE;
if (buf_page_is_checksum_valid_none(read_buf, if (checksum_field2 != crc32) {
checksum_field1, checksum_field2)) { return TRUE;
return(FALSE); }
}
}
} }
if (buf_page_is_checksum_valid_crc32(read_buf, /* Old field is fine, check the new field */
checksum_field1, checksum_field2)) {
page_warn_strict_checksum(
curr_algo,
SRV_CHECKSUM_ALGORITHM_CRC32,
space_id, page_no);
return(FALSE);
}
if (buf_page_is_checksum_valid_innodb(read_buf, if (checksum_field1 != 0
checksum_field1, checksum_field2)) { && checksum_field1 != BUF_NO_CHECKSUM_MAGIC) {
page_warn_strict_checksum(
curr_algo, if (srv_checksum_algorithm
SRV_CHECKSUM_ALGORITHM_INNODB, == SRV_CHECKSUM_ALGORITHM_CRC32) {
space_id, page_no);
return(FALSE); if (!crc32_inited) {
crc32 = buf_calc_page_crc32(read_buf);
crc32_inited = TRUE;
}
if (checksum_field1 != crc32
&& checksum_field1
!= buf_calc_page_new_checksum(read_buf)) {
return TRUE;
}
} else {
ut_ad(srv_checksum_algorithm
== SRV_CHECKSUM_ALGORITHM_INNODB);
if (checksum_field1
!= buf_calc_page_new_checksum(read_buf)) {
if (!crc32_inited) {
crc32 = buf_calc_page_crc32(
read_buf);
crc32_inited = TRUE;
}
if (checksum_field1 != crc32) {
return TRUE;
}
}
}
} }
return(TRUE); if (crc32_inited
&& ((checksum_field1 == crc32
&& checksum_field2 != crc32)
|| (checksum_field1 != crc32
&& checksum_field2 == crc32))) {
return TRUE;
}
case SRV_CHECKSUM_ALGORITHM_NONE:
/* should have returned FALSE earlier */
break; break;
/* no default so the compiler will emit a warning if new enum case SRV_CHECKSUM_ALGORITHM_NONE:
is added and not handled here */ ut_error;
} }
ut_error; return FALSE;
return(FALSE);
} }
/** Dump a page to stderr. /** Dump a page to stderr.
......
storage/xtradb/include/page0page.h
View file @ 5f5e73f1
/***************************************************************************** /*****************************************************************************
Copyright (c) 1994, 2016, Oracle and/or its affiliates. All Rights Reserved. Copyright (c) 1994, 2016, Oracle and/or its affiliates. All Rights Reserved.
Copyright (c) 2013, 2018, MariaDB Corporation.
This program is free software; you can redistribute it and/or modify it under This program is free software; you can redistribute it and/or modify it under
the terms of the GNU General Public License as published by the Free Software the terms of the GNU General Public License as published by the Free Software
...@@ -1109,23 +1110,6 @@ const rec_t* ...@@ -1109,23 +1110,6 @@ const rec_t*
page_find_rec_max_not_deleted( page_find_rec_max_not_deleted(
const page_t* page); const page_t* page);
#endif /* #ifndef UNIV_INNOCHECKSUM */
/** Issue a warning when the checksum that is stored in the page is valid,
but different than the global setting innodb_checksum_algorithm.
@param[in] current_algo current checksum algorithm
@param[in] page_checksum page valid checksum
@param[in] space_id tablespace id
@param[in] page_no page number */
void
page_warn_strict_checksum(
srv_checksum_algorithm_t curr_algo,
srv_checksum_algorithm_t page_checksum,
ulint space_id,
ulint page_no);
#ifndef UNIV_INNOCHECKSUM
#ifdef UNIV_MATERIALIZE #ifdef UNIV_MATERIALIZE
#undef UNIV_INLINE #undef UNIV_INLINE
#define UNIV_INLINE UNIV_INLINE_ORIGINAL #define UNIV_INLINE UNIV_INLINE_ORIGINAL
......
storage/xtradb/page/page0page.cc
View file @ 5f5e73f1
...@@ -2814,49 +2814,3 @@ page_find_rec_max_not_deleted( ...@@ -2814,49 +2814,3 @@ page_find_rec_max_not_deleted(
} }
#endif /* #ifndef UNIV_INNOCHECKSUM */ #endif /* #ifndef UNIV_INNOCHECKSUM */
/** Issue a warning when the checksum that is stored in the page is valid,
but different than the global setting innodb_checksum_algorithm.
@param[in] current_algo current checksum algorithm
@param[in] page_checksum page valid checksum
@param[in] space_id tablespace id
@param[in] page_no page number */
void
page_warn_strict_checksum(
srv_checksum_algorithm_t curr_algo,
srv_checksum_algorithm_t page_checksum,
ulint space_id,
ulint page_no)
{
srv_checksum_algorithm_t curr_algo_nonstrict = srv_checksum_algorithm_t();
switch (curr_algo) {
case SRV_CHECKSUM_ALGORITHM_STRICT_CRC32:
curr_algo_nonstrict = SRV_CHECKSUM_ALGORITHM_CRC32;
break;
case SRV_CHECKSUM_ALGORITHM_STRICT_INNODB:
curr_algo_nonstrict = SRV_CHECKSUM_ALGORITHM_INNODB;
break;
case SRV_CHECKSUM_ALGORITHM_STRICT_NONE:
curr_algo_nonstrict = SRV_CHECKSUM_ALGORITHM_NONE;
break;
default:
ut_error;
}
#ifdef UNIV_INNOCHECKSUM
fprintf(stderr,
#else
ib_logf(IB_LOG_LEVEL_WARN,
#endif
"innodb_checksum_algorithm is set to \"%s\""
" but the page [page id: space=" ULINTPF ","
" page number=" ULINTPF "] contains a valid checksum \"%s\"."
" Accepting the page as valid. Change innodb_checksum_algorithm"
" to \"%s\" to silently accept such pages or rewrite all pages"
" so that they contain \"%s\" checksum.",
buf_checksum_algorithm_name(curr_algo),
space_id, page_no,
buf_checksum_algorithm_name(page_checksum),
buf_checksum_algorithm_name(curr_algo_nonstrict),
buf_checksum_algorithm_name(curr_algo_nonstrict));
}
storage/xtradb/page/page0zip.cc
View file @ 5f5e73f1
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
Copyright (c) 2005, 2016, Oracle and/or its affiliates. All Rights Reserved. Copyright (c) 2005, 2016, Oracle and/or its affiliates. All Rights Reserved.
Copyright (c) 2012, Facebook Inc. Copyright (c) 2012, Facebook Inc.
Copyright (c) 2014, SkySQL Ab. All Rights Reserved. Copyright (c) 2014, 2018, MariaDB Corporation.
This program is free software; you can redistribute it and/or modify it under This program is free software; you can redistribute it and/or modify it under
the terms of the GNU General Public License as published by the Free Software the terms of the GNU General Public License as published by the Free Software
...@@ -4934,10 +4934,6 @@ page_zip_verify_checksum( ...@@ -4934,10 +4934,6 @@ page_zip_verify_checksum(
stored = static_cast<ib_uint32_t>(mach_read_from_4( stored = static_cast<ib_uint32_t>(mach_read_from_4(
static_cast<const unsigned char*>(data) + FIL_PAGE_SPACE_OR_CHKSUM)); static_cast<const unsigned char*>(data) + FIL_PAGE_SPACE_OR_CHKSUM));
ulint page_no = mach_read_from_4(static_cast<const unsigned char*> (data) + FIL_PAGE_OFFSET);
ulint space_id = mach_read_from_4(static_cast<const unsigned char*>
(data) + FIL_PAGE_SPACE_ID);
#if FIL_PAGE_LSN % 8 #if FIL_PAGE_LSN % 8
#error "FIL_PAGE_LSN must be 64 bit aligned" #error "FIL_PAGE_LSN must be 64 bit aligned"
#endif #endif
...@@ -4974,97 +4970,30 @@ page_zip_verify_checksum( ...@@ -4974,97 +4970,30 @@ page_zip_verify_checksum(
switch (curr_algo) { switch (curr_algo) {
case SRV_CHECKSUM_ALGORITHM_STRICT_CRC32: case SRV_CHECKSUM_ALGORITHM_STRICT_CRC32:
case SRV_CHECKSUM_ALGORITHM_STRICT_INNODB:
case SRV_CHECKSUM_ALGORITHM_STRICT_NONE:
return stored == calc;
case SRV_CHECKSUM_ALGORITHM_CRC32: case SRV_CHECKSUM_ALGORITHM_CRC32:
if (stored == BUF_NO_CHECKSUM_MAGIC) { if (stored == BUF_NO_CHECKSUM_MAGIC) {
if (curr_algo
== SRV_CHECKSUM_ALGORITHM_STRICT_CRC32) {
page_warn_strict_checksum(
curr_algo,
SRV_CHECKSUM_ALGORITHM_NONE,
space_id, page_no);
}
return(TRUE); return(TRUE);
} }
crc32 = calc;
innodb = static_cast<ib_uint32_t>(page_zip_calc_checksum( innodb = static_cast<ib_uint32_t>(page_zip_calc_checksum(
data, size, SRV_CHECKSUM_ALGORITHM_INNODB)); data, size, SRV_CHECKSUM_ALGORITHM_INNODB));
if (stored == innodb) {
if (curr_algo
== SRV_CHECKSUM_ALGORITHM_STRICT_CRC32) {
page_warn_strict_checksum(
curr_algo,
SRV_CHECKSUM_ALGORITHM_INNODB,
space_id, page_no);
}
return(TRUE);
}
break; break;
case SRV_CHECKSUM_ALGORITHM_STRICT_INNODB:
case SRV_CHECKSUM_ALGORITHM_INNODB: case SRV_CHECKSUM_ALGORITHM_INNODB:
if (stored == BUF_NO_CHECKSUM_MAGIC) { if (stored == BUF_NO_CHECKSUM_MAGIC) {
if (curr_algo
== SRV_CHECKSUM_ALGORITHM_STRICT_INNODB) {
page_warn_strict_checksum(
curr_algo,
SRV_CHECKSUM_ALGORITHM_NONE,
space_id, page_no);
}
return(TRUE); return(TRUE);
} }
crc32 = static_cast<ib_uint32_t>(page_zip_calc_checksum( crc32 = static_cast<ib_uint32_t>(page_zip_calc_checksum(
data, size, SRV_CHECKSUM_ALGORITHM_CRC32)); data, size, SRV_CHECKSUM_ALGORITHM_CRC32));
innodb = calc;
if (stored == crc32) {
if (curr_algo
== SRV_CHECKSUM_ALGORITHM_STRICT_INNODB) {
page_warn_strict_checksum(
curr_algo,
SRV_CHECKSUM_ALGORITHM_CRC32,
space_id, page_no);
}
return(TRUE);
}
break;
case SRV_CHECKSUM_ALGORITHM_STRICT_NONE:
crc32 = static_cast<ib_uint32_t>(page_zip_calc_checksum(
data, size, SRV_CHECKSUM_ALGORITHM_CRC32));
if (stored == crc32) {
page_warn_strict_checksum(
curr_algo, SRV_CHECKSUM_ALGORITHM_CRC32,
space_id, page_no);
return(TRUE);
}
innodb = static_cast<ib_uint32_t>(page_zip_calc_checksum(
data, size, SRV_CHECKSUM_ALGORITHM_INNODB));
if (stored == innodb) {
page_warn_strict_checksum(
curr_algo,
SRV_CHECKSUM_ALGORITHM_INNODB,
space_id, page_no);
return(TRUE);
}
break; break;
case SRV_CHECKSUM_ALGORITHM_NONE: case SRV_CHECKSUM_ALGORITHM_NONE:
ut_error; return TRUE;
/* no default so the compiler will emit a warning if new enum
is added and not handled here */
} }
return(FALSE); return (stored == crc32 || stored == innodb);
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7