Browse Source
MDEV-11623 MariaDB 10.1 fails to start datadir created with
MDEV-11623 MariaDB 10.1 fails to start datadir created with
MariaDB 10.0/MySQL 5.6 using innodb-page-size!=16K The storage format of FSP_SPACE_FLAGS was accidentally broken already in MariaDB 10.1.0. This fix is bringing the format in line with other MySQL and MariaDB release series. Please refer to the comments that were added to fsp0fsp.h for details. This is an INCOMPATIBLE CHANGE that affects users of page_compression and non-default innodb_page_size. Upgrading to this release will correct the flags in the data files. If you want to downgrade to earlier MariaDB 10.1.x, please refer to the test innodb.101_compatibility how to reset the FSP_SPACE_FLAGS in the files. NOTE: MariaDB 10.1.0 to 10.1.20 can misinterpret uncompressed data files with innodb_page_size=4k or 64k as compressed innodb_page_size=16k files, and then probably fail when trying to access the pages. See the comments in the function fsp_flags_convert_from_101() for detailed analysis. Move PAGE_COMPRESSION to FSP_SPACE_FLAGS bit position 16. In this way, compressed innodb_page_size=16k tablespaces will not be mistaken for uncompressed ones by MariaDB 10.1.0 to 10.1.20. Derive PAGE_COMPRESSION_LEVEL, ATOMIC_WRITES and DATA_DIR from the dict_table_t::flags when the table is available, in fil_space_for_table_exists_in_mem() or fil_open_single_table_tablespace(). During crash recovery, fil_load_single_table_tablespace() will use innodb_compression_level for the PAGE_COMPRESSION_LEVEL. FSP_FLAGS_MEM_MASK: A bitmap of the memory-only fil_space_t::flags that are not to be written to FSP_SPACE_FLAGS. Currently, these will include PAGE_COMPRESSION_LEVEL, ATOMIC_WRITES and DATA_DIR. Introduce the macro FSP_FLAGS_PAGE_SSIZE(). We only support one innodb_page_size for the whole instance. When creating a dummy tablespace for the redo log, use fil_space_t::flags=0. The flags are never written to the redo log files. Remove many FSP_FLAGS_SET_ macros. dict_tf_verify_flags(): Remove. This is basically only duplicating the logic of dict_tf_to_fsp_flags(), used in a debug assertion. fil_space_t::mark: Remove. This flag was not used for anything. fil_space_for_table_exists_in_mem(): Remove the unnecessary parameter mark_space, and add a parameter for table flags. Check that fil_space_t::flags match the table flags, and adjust the (memory-only) flags based on the table flags. fil_node_open_file(): Remove some redundant or unreachable conditions, do not use stderr for output, and avoid unnecessary server aborts. fil_user_tablespace_restore_page(): Convert the flags, so that the correct page_size will be used when restoring a page from the doublewrite buffer. fil_space_get_page_compressed(), fsp_flags_is_page_compressed(): Remove. It suffices to have fil_space_is_page_compressed(). FSP_FLAGS_WIDTH_DATA_DIR, FSP_FLAGS_WIDTH_PAGE_COMPRESSION_LEVEL, FSP_FLAGS_WIDTH_ATOMIC_WRITES: Remove, because these flags do not exist in the FSP_SPACE_FLAGS but only in memory. fsp_flags_try_adjust(): New function, to adjust the FSP_SPACE_FLAGS in page 0. Called by fil_open_single_table_tablespace(), fil_space_for_table_exists_in_mem(), innobase_start_or_create_for_mysql() except if --innodb-read-only is active. fsp_flags_is_valid(ulint): Reimplement from the scratch, with accurate comments. Do not display any details of detected inconsistencies, because the output could be confusing when dealing with MariaDB 10.1.x data files. fsp_flags_convert_from_101(ulint): Convert flags from buggy MariaDB 10.1.x format, or return ULINT_UNDEFINED if the flags cannot be in MariaDB 10.1.x format. fsp_flags_match(): Check the flags when probing files. Implemented based on fsp_flags_is_valid() and fsp_flags_convert_from_101(). dict_check_tablespaces_and_store_max_id(): Do not access the page after committing the mini-transaction. IMPORT TABLESPACE fixes: AbstractCallback::init(): Convert the flags. FetchIndexRootPages::operator(): Check that the tablespace flags match the table flags. Do not attempt to convert tablespace flags to table flags, because the conversion would necessarily be lossy. PageConverter::update_header(): Write back the correct flags. This takes care of the flags in IMPORT TABLESPACE.pull/287/head
Marko Mäkelä
9 years ago
39 changed files with 1483 additions and 1497 deletions
-
25mysql-test/suite/innodb/include/ibd_convert.pl
-
48mysql-test/suite/innodb/r/101_compatibility.result
-
2mysql-test/suite/innodb/r/doublewrite.result
-
5mysql-test/suite/innodb/r/innodb-wl5522-debug-zip.result
-
101mysql-test/suite/innodb/t/101_compatibility.test
-
42mysql-test/suite/innodb/t/doublewrite.test
-
3mysql-test/suite/innodb/t/innodb-wl5522-debug-zip.test
-
15storage/innobase/buf/buf0dblwr.cc
-
20storage/innobase/dict/dict0load.cc
-
396storage/innobase/fil/fil0fil.cc
-
3storage/innobase/fsp/fsp0fsp.cc
-
40storage/innobase/include/dict0dict.ic
-
13storage/innobase/include/dict0pagecompress.h
-
88storage/innobase/include/dict0pagecompress.ic
-
41storage/innobase/include/fil0fil.h
-
13storage/innobase/include/fil0pagecompress.h
-
430storage/innobase/include/fsp0fsp.h
-
153storage/innobase/include/fsp0fsp.ic
-
11storage/innobase/include/fsp0pagecompress.h
-
28storage/innobase/include/fsp0pagecompress.ic
-
94storage/innobase/row/row0import.cc
-
11storage/innobase/row/row0mysql.cc
-
18storage/innobase/srv/srv0start.cc
-
15storage/xtradb/buf/buf0dblwr.cc
-
20storage/xtradb/dict/dict0load.cc
-
395storage/xtradb/fil/fil0fil.cc
-
3storage/xtradb/fsp/fsp0fsp.cc
-
40storage/xtradb/include/dict0dict.ic
-
13storage/xtradb/include/dict0pagecompress.h
-
88storage/xtradb/include/dict0pagecompress.ic
-
41storage/xtradb/include/fil0fil.h
-
13storage/xtradb/include/fil0pagecompress.h
-
437storage/xtradb/include/fsp0fsp.h
-
153storage/xtradb/include/fsp0fsp.ic
-
11storage/xtradb/include/fsp0pagecompress.h
-
28storage/xtradb/include/fsp0pagecompress.ic
-
94storage/xtradb/row/row0import.cc
-
11storage/xtradb/row/row0mysql.cc
-
18storage/xtradb/srv/srv0start.cc
@ -0,0 +1,25 @@ |
|||
#!/usr/bin/perl |
|||
# Convert tablespace flags to the format understood by MariaDB 10.1.0..10.1.20, |
|||
# with the assumption that the flags were correct. |
|||
|
|||
sub convert_to_mariadb_101 |
|||
{ |
|||
my ($file, $page_size) = @_; |
|||
open(FILE, "+<", $file) or die "Unable to open $file\n"; |
|||
sysread(FILE, $_, $page_size)==$page_size||die "Unable to read $file\n"; |
|||
sysseek(FILE, 0, 0)||die "Unable to seek $file\n"; |
|||
|
|||
# FIL_PAGE_DATA + FSP_SPACE_FLAGS = 38 + 16 = 54 bytes from the start |
|||
my($flags) = unpack "x[54]N"; |
|||
my $badflags = ($flags & 0x3f); |
|||
my $compression_level=6; |
|||
$badflags |= 1<<6|$compression_level<<7 if ($flags & 1 << 16); |
|||
$badflags |= ($flags & 15 << 6) << 7; # PAGE_SSIZE |
|||
|
|||
substr ($_, 54, 4) = pack("N", $badflags); |
|||
# Replace the innodb_checksum_algorithm=none checksum |
|||
substr ($_, 0, 4) = pack("N", 0xdeadbeef); |
|||
substr ($_, $page_size - 8, 4) = pack("N", 0xdeadbeef); |
|||
syswrite(FILE, $_, $page_size)==$page_size||die "Unable to write $file\n"; |
|||
close(FILE); |
|||
} |
|||
@ -0,0 +1,48 @@ |
|||
# |
|||
# MDEV-11623 MariaDB 10.1 fails to start datadir created with |
|||
# MariaDB 10.0/MySQL 5.6 using innodb-page-size!=16K |
|||
# |
|||
call mtr.add_suppression("InnoDB: adjusting FSP_SPACE_FLAGS of tablespace"); |
|||
SET GLOBAL innodb_file_per_table=1; |
|||
SET GLOBAL innodb_file_format=Barracuda; |
|||
CREATE TABLE tr(a INT)ENGINE=InnoDB ROW_FORMAT=REDUNDANT; |
|||
CREATE TABLE tc(a INT)ENGINE=InnoDB ROW_FORMAT=COMPACT; |
|||
CREATE TABLE td(a INT)ENGINE=InnoDB ROW_FORMAT=DYNAMIC; |
|||
CREATE TABLE tz(a INT)ENGINE=InnoDB ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=1; |
|||
CREATE TABLE tdd(a INT) ENGINE=InnoDB, DATA DIRECTORY='MYSQL_TMP_DIR'; |
|||
CREATE TABLE tp(a INT) ENGINE=InnoDB page_compressed=1; |
|||
CREATE TABLE ti(a INT) ENGINE=InnoDB; |
|||
FLUSH TABLES ti FOR EXPORT; |
|||
backup: ti |
|||
UNLOCK TABLES; |
|||
ALTER TABLE ti DISCARD TABLESPACE; |
|||
restore: ti .ibd and .cfg files |
|||
ALTER TABLE ti IMPORT TABLESPACE; |
|||
BEGIN; |
|||
INSERT INTO tr VALUES(1); |
|||
INSERT INTO tc VALUES(1); |
|||
INSERT INTO td VALUES(1); |
|||
INSERT INTO tz VALUES(1); |
|||
INSERT INTO tdd VALUES(1); |
|||
INSERT INTO tp VALUES(1); |
|||
INSERT INTO ti VALUES(1); |
|||
# Kill the server |
|||
CHECK TABLE tr,tc,td,tz,tdd,tp,ti; |
|||
Table Op Msg_type Msg_text |
|||
test.tr check status OK |
|||
test.tc check status OK |
|||
test.td check status OK |
|||
test.tz check status OK |
|||
test.tdd check status OK |
|||
test.tp check status OK |
|||
test.ti check status OK |
|||
CHECK TABLE tr,tc,td,tz,tdd,tp,ti; |
|||
Table Op Msg_type Msg_text |
|||
test.tr check status OK |
|||
test.tc check status OK |
|||
test.td check status OK |
|||
test.tz check status OK |
|||
test.tdd check status OK |
|||
test.tp check status OK |
|||
test.ti check status OK |
|||
DROP TABLE tr,tc,td,tz,tdd,tp,ti; |
|||
@ -0,0 +1,101 @@ |
|||
--source include/have_innodb.inc |
|||
--source include/not_embedded.inc |
|||
|
|||
-- echo # |
|||
-- echo # MDEV-11623 MariaDB 10.1 fails to start datadir created with |
|||
-- echo # MariaDB 10.0/MySQL 5.6 using innodb-page-size!=16K |
|||
-- echo # |
|||
|
|||
# This is actually testing the opposite: starting the fixed 10.1 with |
|||
# buggy 10.1 files (by manually converting the flags in the files). |
|||
|
|||
call mtr.add_suppression("InnoDB: adjusting FSP_SPACE_FLAGS of tablespace"); |
|||
SET GLOBAL innodb_file_per_table=1; |
|||
SET GLOBAL innodb_file_format=Barracuda; |
|||
let INNODB_PAGE_SIZE=`select @@innodb_page_size`; |
|||
let MYSQLD_DATADIR=`select @@datadir`; |
|||
|
|||
CREATE TABLE tr(a INT)ENGINE=InnoDB ROW_FORMAT=REDUNDANT; |
|||
CREATE TABLE tc(a INT)ENGINE=InnoDB ROW_FORMAT=COMPACT; |
|||
CREATE TABLE td(a INT)ENGINE=InnoDB ROW_FORMAT=DYNAMIC; |
|||
--disable_warnings |
|||
CREATE TABLE tz(a INT)ENGINE=InnoDB ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=1; |
|||
--enable_warnings |
|||
|
|||
--replace_result $MYSQL_TMP_DIR MYSQL_TMP_DIR |
|||
EVAL CREATE TABLE tdd(a INT) ENGINE=InnoDB, DATA DIRECTORY='$MYSQL_TMP_DIR'; |
|||
|
|||
CREATE TABLE tp(a INT) ENGINE=InnoDB page_compressed=1; |
|||
CREATE TABLE ti(a INT) ENGINE=InnoDB; |
|||
FLUSH TABLES ti FOR EXPORT; |
|||
perl; |
|||
do "$ENV{MTR_SUITE_DIR}/include/innodb-util.pl"; |
|||
ib_backup_tablespaces("test", "ti"); |
|||
EOF |
|||
UNLOCK TABLES; |
|||
ALTER TABLE ti DISCARD TABLESPACE; |
|||
perl; |
|||
do "$ENV{MTR_SUITE_DIR}/include/innodb-util.pl"; |
|||
ib_discard_tablespaces("test", "ti"); |
|||
ib_restore_tablespaces("test", "ti"); |
|||
do "$ENV{MTR_SUITE_DIR}/include/ibd_convert.pl"; |
|||
my $ps = $ENV{INNODB_PAGE_SIZE}; |
|||
my $dd = $ENV{MYSQLD_DATADIR}; |
|||
convert_to_mariadb_101("$dd/test/ti.ibd", $ps); |
|||
EOF |
|||
|
|||
ALTER TABLE ti IMPORT TABLESPACE; |
|||
|
|||
BEGIN; |
|||
INSERT INTO tr VALUES(1); |
|||
INSERT INTO tc VALUES(1); |
|||
INSERT INTO td VALUES(1); |
|||
INSERT INTO tz VALUES(1); |
|||
INSERT INTO tdd VALUES(1); |
|||
INSERT INTO tp VALUES(1); |
|||
INSERT INTO ti VALUES(1); |
|||
|
|||
--source include/kill_mysqld.inc |
|||
|
|||
perl; |
|||
do "$ENV{MTR_SUITE_DIR}/include/ibd_convert.pl"; |
|||
my $ps = $ENV{INNODB_PAGE_SIZE}; |
|||
my $dd = $ENV{MYSQLD_DATADIR}; |
|||
|
|||
convert_to_mariadb_101("$dd/ibdata1", $ps); |
|||
convert_to_mariadb_101("$dd/test/tr.ibd", $ps); |
|||
convert_to_mariadb_101("$dd/test/tc.ibd", $ps); |
|||
convert_to_mariadb_101("$dd/test/td.ibd", $ps); |
|||
convert_to_mariadb_101("$dd/test/tz.ibd", 1024) if $ps<32768; |
|||
convert_to_mariadb_101("$dd/test/tp.ibd", $ps); |
|||
convert_to_mariadb_101("$dd/test/ti.ibd", $ps); |
|||
convert_to_mariadb_101("$ENV{MYSQL_TMP_DIR}/test/tdd.ibd", $ps); |
|||
EOF |
|||
|
|||
--source include/start_mysqld.inc |
|||
CHECK TABLE tr,tc,td,tz,tdd,tp,ti; |
|||
--source include/shutdown_mysqld.inc |
|||
|
|||
perl; |
|||
do "$ENV{MTR_SUITE_DIR}/include/ibd_convert.pl"; |
|||
my $ps = $ENV{INNODB_PAGE_SIZE}; |
|||
my $dd = $ENV{MYSQLD_DATADIR}; |
|||
|
|||
convert_to_mariadb_101("$dd/ibdata1", $ps); |
|||
convert_to_mariadb_101("$dd/test/tr.ibd", $ps); |
|||
convert_to_mariadb_101("$dd/test/tc.ibd", $ps); |
|||
convert_to_mariadb_101("$dd/test/td.ibd", $ps); |
|||
convert_to_mariadb_101("$dd/test/tz.ibd", 1024) if $ps<32768; |
|||
convert_to_mariadb_101("$dd/test/tp.ibd", $ps); |
|||
convert_to_mariadb_101("$dd/test/ti.ibd", $ps); |
|||
convert_to_mariadb_101("$ENV{MYSQL_TMP_DIR}/test/tdd.ibd", $ps); |
|||
EOF |
|||
|
|||
--let $restart_parameters=--innodb-read-only |
|||
--source include/start_mysqld.inc |
|||
CHECK TABLE tr,tc,td,tz,tdd,tp,ti; |
|||
--source include/shutdown_mysqld.inc |
|||
|
|||
--let $restart_parameters= |
|||
--source include/start_mysqld.inc |
|||
DROP TABLE tr,tc,td,tz,tdd,tp,ti; |
|||
Write
Preview
Loading…
Cancel
Save
Reference in new issue