mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-28 17:54:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

MDEV-26794 MariaBackup does not recognize added providers upon prepare of incremental backup

Browse source 
* Change InnoDB message text to mention compression.
* make "not loaded compression provider" warning to be issued
  also when current_thd == 0.
This commit is contained in:
Sergei Golubchik 2021-10-11 13:45:19 +02:00
parent 2be6804650
commit 5a330d4cce
13 changed files with 23 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
mysql-test/suite/encryption/t/corrupted_during_recovery.test
View file

@ -6,7 +6,7 @@ call mtr.add_suppression("InnoDB: Plugin initialization aborted");
call mtr.add_suppression("Plugin 'InnoDB' init function returned error");
call mtr.add_suppression("Plugin 'InnoDB' registration as a STORAGE ENGINE failed");
call mtr.add_suppression("InnoDB: Database page corruption on disk or a failed read of file '.*test.t1\\.ibd' page");
call mtr.add_suppression("InnoDB: Failed to read page [123] from file '.*test.t1\\.ibd': Table is encrypted but decrypt failed");
call mtr.add_suppression("InnoDB: Failed to read page [123] from file '.*test.t1\\.ibd': Table is compressed or encrypted but uncompress or decrypt failed");
call mtr.add_suppression("InnoDB: The page \\[page id: space=\\d+, page number=3\\] in file '.*test.t1\\.ibd' cannot be decrypted");
call mtr.add_suppression("InnoDB: Table in tablespace \\d+ encrypted. However key management plugin or used key_version \\d+ is not found or used encryption algorithm or method does not match. Can't continue opening the table.");
--enable_query_log

4
mysql-test/suite/mariabackup/compression_providers_unloaded.result
View file

@ -1,5 +1,5 @@
call mtr.add_suppression("Background Page read failed to read or decrypt");
call mtr.add_suppression("InnoDB: Failed to read page \\d+ from file './test/t1.ibd': Table is encrypted but decrypt failed");
call mtr.add_suppression("Background Page read failed to read, uncompress, or decrypt");
call mtr.add_suppression("Table is compressed or encrypted but uncompress or decrypt failed");
#
# Testing mariabackup with bzip2 compression
#

4
mysql-test/suite/mariabackup/compression_providers_unloaded.test
View file

@ -1,6 +1,6 @@
let $alg = $MTR_COMBINATIONS;
call mtr.add_suppression("Background Page read failed to read or decrypt");
call mtr.add_suppression("InnoDB: Failed to read page \\d+ from file './test/t1.ibd': Table is encrypted but decrypt failed");
call mtr.add_suppression("Background Page read failed to read, uncompress, or decrypt");
call mtr.add_suppression("Table is compressed or encrypted but uncompress or decrypt failed");
if (`select count(*) = 0 from information_schema.plugins where plugin_name = 'provider_$alg' and plugin_status='active'`)
{

4
mysql-test/suite/plugins/r/compression,innodb-lz4.rdiff
View file

@ -8,8 +8,8 @@
call mtr.add_suppression("MariaDB tried to use the .+ compression, but its provider plugin is not loaded");
-set global innodb_compression_algorithm = bzip2;
+set global innodb_compression_algorithm = lz4;
call mtr.add_suppression("InnoDB: Background Page read failed to read or decrypt \\[page id: space=\\d+, page number=\\d+\\]");
call mtr.add_suppression("InnoDB: Failed to read page \\d+ from file './test/t1.ibd': Table is encrypted but decrypt failed");
call mtr.add_suppression("Background Page read failed to read, uncompress, or decrypt");
call mtr.add_suppression("Table is compressed or encrypted but uncompress or decrypt failed");
call mtr.add_suppression("InnoDB: Table `test`.`t1` is compressed with (\\w+) \\(\\d\\), which is not currently loaded. Please load the '\\1' provider plugin to open the table.");
create table t1 (a int, b text ) engine = innodb page_compressed = 1;
@@ -14,7 +14,7 @@

4
mysql-test/suite/plugins/r/compression,innodb-lzma.rdiff
View file

@ -8,8 +8,8 @@
call mtr.add_suppression("MariaDB tried to use the .+ compression, but its provider plugin is not loaded");
-set global innodb_compression_algorithm = bzip2;
+set global innodb_compression_algorithm = lzma;
call mtr.add_suppression("InnoDB: Background Page read failed to read or decrypt \\[page id: space=\\d+, page number=\\d+\\]");
call mtr.add_suppression("InnoDB: Failed to read page \\d+ from file './test/t1.ibd': Table is encrypted but decrypt failed");
call mtr.add_suppression("Background Page read failed to read, uncompress, or decrypt");
call mtr.add_suppression("Table is compressed or encrypted but uncompress or decrypt failed");
call mtr.add_suppression("InnoDB: Table `test`.`t1` is compressed with (\\w+) \\(\\d\\), which is not currently loaded. Please load the '\\1' provider plugin to open the table.");
create table t1 (a int, b text ) engine = innodb page_compressed = 1;
@@ -14,7 +14,7 @@

4
mysql-test/suite/plugins/r/compression,innodb-lzo.rdiff
View file

@ -8,8 +8,8 @@
call mtr.add_suppression("MariaDB tried to use the .+ compression, but its provider plugin is not loaded");
-set global innodb_compression_algorithm = bzip2;
+set global innodb_compression_algorithm = lzo;
call mtr.add_suppression("InnoDB: Background Page read failed to read or decrypt \\[page id: space=\\d+, page number=\\d+\\]");
call mtr.add_suppression("InnoDB: Failed to read page \\d+ from file './test/t1.ibd': Table is encrypted but decrypt failed");
call mtr.add_suppression("Background Page read failed to read, uncompress, or decrypt");
call mtr.add_suppression("Table is compressed or encrypted but uncompress or decrypt failed");
call mtr.add_suppression("InnoDB: Table `test`.`t1` is compressed with (\\w+) \\(\\d\\), which is not currently loaded. Please load the '\\1' provider plugin to open the table.");
create table t1 (a int, b text ) engine = innodb page_compressed = 1;
@@ -14,7 +14,7 @@

4
mysql-test/suite/plugins/r/compression,innodb-snappy.rdiff
View file

@ -8,8 +8,8 @@
call mtr.add_suppression("MariaDB tried to use the .+ compression, but its provider plugin is not loaded");
-set global innodb_compression_algorithm = bzip2;
+set global innodb_compression_algorithm = snappy;
call mtr.add_suppression("InnoDB: Background Page read failed to read or decrypt \\[page id: space=\\d+, page number=\\d+\\]");
call mtr.add_suppression("InnoDB: Failed to read page \\d+ from file './test/t1.ibd': Table is encrypted but decrypt failed");
call mtr.add_suppression("Background Page read failed to read, uncompress, or decrypt");
call mtr.add_suppression("Table is compressed or encrypted but uncompress or decrypt failed");
call mtr.add_suppression("InnoDB: Table `test`.`t1` is compressed with (\\w+) \\(\\d\\), which is not currently loaded. Please load the '\\1' provider plugin to open the table.");
create table t1 (a int, b text ) engine = innodb page_compressed = 1;
@@ -14,7 +14,7 @@

4
mysql-test/suite/plugins/r/compression,mroonga-lz4.rdiff
View file

@ -7,8 +7,8 @@
#
call mtr.add_suppression("MariaDB tried to use the .+ compression, but its provider plugin is not loaded");
-set global innodb_compression_algorithm = bzip2;
-call mtr.add_suppression("InnoDB: Background Page read failed to read or decrypt \\[page id: space=\\d+, page number=\\d+\\]");
-call mtr.add_suppression("InnoDB: Failed to read page \\d+ from file './test/t1.ibd': Table is encrypted but decrypt failed");
-call mtr.add_suppression("Background Page read failed to read, uncompress, or decrypt");
-call mtr.add_suppression("Table is compressed or encrypted but uncompress or decrypt failed");
-call mtr.add_suppression("InnoDB: Table `test`.`t1` is compressed with (\\w+), which is not currently loaded. Please load the \\1 provider plugin to open the table");
-create table t1 (a int, b text ) engine = innodb page_compressed = 1;
+create table t1 (a int, b text COMMENT 'FLAGS "COLUMN_SCALAR|COMPRESS_LZ4"') engine = mroonga charset = utf8;

4
mysql-test/suite/plugins/r/compression.result
View file

@ -3,8 +3,8 @@
#
call mtr.add_suppression("MariaDB tried to use the .+ compression, but its provider plugin is not loaded");
set global innodb_compression_algorithm = bzip2;
call mtr.add_suppression("InnoDB: Background Page read failed to read or decrypt \\[page id: space=\\d+, page number=\\d+\\]");
call mtr.add_suppression("InnoDB: Failed to read page \\d+ from file './test/t1.ibd': Table is encrypted but decrypt failed");
call mtr.add_suppression("Background Page read failed to read, uncompress, or decrypt");
call mtr.add_suppression("Table is compressed or encrypted but uncompress or decrypt failed");
call mtr.add_suppression("InnoDB: Table `test`.`t1` is compressed with (\\w+), which is not currently loaded. Please load the \\1 provider plugin to open the table");
create table t1 (a int, b text ) engine = innodb page_compressed = 1;
insert t1 (a, b) values (0, repeat("abc", 100));

4
mysql-test/suite/plugins/t/compression.test
View file

@ -19,8 +19,8 @@ call mtr.add_suppression("MariaDB tried to use the .+ compression, but its provi
if ($engine == "innodb") {
eval set global innodb_compression_algorithm = $alg;
let $table_params = page_compressed = 1;
call mtr.add_suppression("InnoDB: Background Page read failed to read or decrypt \\[page id: space=\\d+, page number=\\d+\\]");
call mtr.add_suppression("InnoDB: Failed to read page \\d+ from file './test/t1.ibd': Table is encrypted but decrypt failed");
call mtr.add_suppression("Background Page read failed to read, uncompress, or decrypt");
call mtr.add_suppression("Table is compressed or encrypted but uncompress or decrypt failed");
call mtr.add_suppression("InnoDB: Table `test`.`t1` is compressed with (\\w+), which is not currently loaded. Please load the \\1 provider plugin to open the table");
}
if ($engine == "mroonga") {

4
sql/sql_plugin_services.ic
View file

@ -249,10 +249,10 @@ struct sql_service_st sql_service_handler=
#define DEFINE_warning_function(name, ret) { \
static query_id_t last_query_id= -1; \
THD *thd= current_thd; \
if(thd && thd->query_id != last_query_id) \
if((thd ? thd->query_id : 0) != last_query_id) \
{ \
my_error(ER_PROVIDER_NOT_LOADED, MYF(ME_ERROR_LOG|ME_WARNING), name); \
last_query_id= thd->query_id; \
last_query_id= thd ? thd->query_id : 0; \
} \
return ret; \
}

2
storage/innobase/buf/buf0rea.cc
View file

@ -514,7 +514,7 @@ void buf_read_page_background(fil_space_t *space, const page_id_t page_id,
case DB_DECRYPTION_FAILED:
ib::error()
<< "Background Page read failed to "
"read or decrypt " << page_id;
"read, uncompress, or decrypt " << page_id;
break;
default:
ib::fatal() << "Error " << err << " in background read of "

2
storage/innobase/ut/ut0ut.cc
View file

@ -447,7 +447,7 @@ ut_strerr(
case DB_FTS_TOO_MANY_WORDS_IN_PHRASE:
return("Too many words in a FTS phrase or proximity search");
case DB_DECRYPTION_FAILED:
return("Table is encrypted but decrypt failed.");
return("Table is compressed or encrypted but uncompress or decrypt failed.");
case DB_IO_PARTIAL_FAILED:
return("Partial IO failed");
case DB_FORCED_ABORT: