percona/percona-toolkit
1
0
Fork 0
mirror of https://github.com/percona/percona-toolkit.git synced 2026-02-28 02:07:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #30 from percona/pt-osc-meaningful-errors-1446928

Browse Source 
Pt osc meaningful errors 1446928
This commit is contained in:
Frank Cizmich
2015-08-20 17:35:13 -04:00
parent 51f79918b5 703f803ae6
commit d1aaf7daa7
2 changed files with 33 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
bin/pt-online-schema-change
View File

@@ -8415,14 +8415,19 @@ sub main {
my $cleanup = new CleanupTask(
sub {
# XXX We shouldn't copy $EVAL_ERROR here, but I found that
# errors are not re-thrown in tests. If you comment out this
# errors are not re-thrown in tests. If you comment (*) out this
# line and the die below, an error fails:
# not ok 5 - Doesn't try forever to find a new table name
# Failed test 'Doesn't try forever to find a new table name'
# at /Users/daniel/p/pt-osc-2.1.1/lib/PerconaTest.pm line 559.
# ''
# doesn't match '(?-xism:Failed to find a unique new table name)'
my $original_error = $EVAL_ERROR;
# (*) Frank: commented them out because it caused infinite loop
# and the mentioned test error doesn't arise
#my $original_error = $EVAL_ERROR;
foreach my $task ( reverse @cleanup_tasks ) {
eval {
$task->();
@@ -8431,7 +8436,7 @@ sub main {
warn "Error cleaning up: $EVAL_ERROR\n";
}
}
die $original_error if $original_error; # rethrow original error
#die $original_error if $original_error; # rethrow original error
return;
}
);

25
t/pt-online-schema-change/bugs.t
View File

@@ -433,6 +433,31 @@ $output = output(
# clear databases
$sb->load_file('master', "$sample/bug-1340728_cleanup.sql");
# #############################################################################
# Issue LP 1446928
# Avoids an error trapping loop when --alter option contains an invalid
# statement.
# If this test fails it might lead to "segmentation fault" or "out of memory"
# #############################################################################
$output = output(
sub { pt_online_schema_change::main(@args, "$master_dsn,D=sakila,t=actor",
'--execute',
'--alter-foreign-keys-method=drop_swap',
'--alter', "GIBBERISH",
'--nocheck-plan',
),
},
stderr => 1,
);
like(
$output,
qr/Error altering new table/s,
"Bug 1446928: Avoid error trapping loop when --alter is invalid",
);
# #############################################################################
# Done.
# #############################################################################