-
Notifications
You must be signed in to change notification settings - Fork 1.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
This patch fixes the following issues in Aria error reporting in case of read errors & crashed tables: - Added the table name to the most error messages, including in case of read errors or when encrypting/decrypting a table. The format for error messages was changed sligtly to accomodate logging of errors from lower level routines. - If we got an read error from storage (hard disk, ssd, S3 etc) we only reported 'table is crashed'. Now the error number from the storage is reported. - Added checking of read failure from records_in_range() - Calls to ma_set_fatal_error() did not inform the SQL level of errors (to not spam the user with multiple error messages). Now the first error message and any fatal error messages are reported to the user.
- Loading branch information
Showing
30 changed files
with
235 additions
and
151 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,15 +1,17 @@ | ||
call mtr.add_suppression('Unknown key id 1. Can''t continue'); | ||
call mtr.add_suppression('Unknown key id 1'); | ||
call mtr.add_suppression('try to repair it'); | ||
call mtr.add_suppression('Index is corrupted'); | ||
set global aria_encrypt_tables= 1; | ||
create table t1 (pk int primary key, a int, key(a)) engine=aria transactional=1; | ||
alter table t1 disable keys; | ||
insert into t1 values (1,1); | ||
alter table t1 enable keys; | ||
ERROR HY000: Unknown key id 1. Can't continue! | ||
ERROR HY000: Unknown key id 1 for ./test/t1. Can't continue! | ||
repair table t1 use_frm; | ||
Table Op Msg_type Msg_text | ||
test.t1 repair warning Number of rows changed from 0 to 1 | ||
test.t1 repair Error Unknown key id 1. Can't continue! | ||
test.t1 repair Error Unknown key id 1. Can't continue! | ||
test.t1 repair Error Unknown key id 1 for ./test/t1. Can't continue! | ||
test.t1 repair Error Unknown key id 1 for ./test/t1. Can't continue! | ||
test.t1 repair status OK | ||
drop table t1; | ||
set global aria_encrypt_tables= default; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,14 +1,18 @@ | ||
# | ||
# MDEV-18496 Crash when Aria encryption is enabled but plugin not available | ||
# | ||
call mtr.add_suppression('Unknown key id 1. Can''t continue'); | ||
call mtr.add_suppression('Unknown key id 1'); | ||
call mtr.add_suppression('try to repair it'); | ||
call mtr.add_suppression('Index is corrupted'); | ||
|
||
set global aria_encrypt_tables= 1; | ||
create table t1 (pk int primary key, a int, key(a)) engine=aria transactional=1; | ||
alter table t1 disable keys; | ||
insert into t1 values (1,1); | ||
error 192; | ||
--replace_result \\ / | ||
--error 192 | ||
alter table t1 enable keys; | ||
--replace_result \\ / | ||
repair table t1 use_frm; | ||
drop table t1; | ||
set global aria_encrypt_tables= default; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.