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

PT-169 Handle drop-swap errors in pt-online-schema-change (#467)

Browse Source 
* PT-169 Fixed drop-swap error handling

* PT-169 Fixed drop_swap error handling
This commit is contained in:
Carlos Salguero
2020-10-12 15:36:45 -03:00
committed by GitHub
parent 1090f017a1
commit d7a7a1c7a5
4 changed files with 130 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -8788,6 +8788,7 @@ sub main {
my $flow_ctl_pr; # Progress for FlowControlWaiter
my $sys_load; # MySQLStatusWaiter object
my $sys_load_pr; # Progress for MySQLStatusWaiter object
my $process_error; # Used if drop_swap fails
if ( $o->get('execute') ) {
# #####################################################################
@@ -9150,7 +9151,7 @@ sub main {
}
# No child tables and --alter-fk-method wasn't specified,
# so nothing to do.
}
}
else {
print "Child tables:\n";
foreach my $child_table ( @$child_tables ) {
@@ -9414,6 +9415,9 @@ sub main {
. "cause MySQL error 1146 (42S02): \"Table $new_tbl->{name} "
. " doesn't exist\".\n";
}
elsif ($process_error) {
print "Not dropping new table because FKs processing has failed.\n";
}
else {
print ts("Dropping new table...\n");
print $sql, "\n" if $o->get('print');
@@ -10208,8 +10212,9 @@ sub main {
}
};
if ( $EVAL_ERROR ) {
# TODO: improve error message and handling.
_die("Error updating foreign key constraints: $EVAL_ERROR", ERROR_UPDATING_FKS);
#$oktorun = 0;
$process_error = "Error updating foreign key constraints: $EVAL_ERROR";
_die($process_error, ERROR_UPDATING_FKS);
}
# --plugin hook
@@ -10273,7 +10278,8 @@ sub main {
# ########################################################################
# Done.
# ########################################################################
$orig_tbl->{success} = 1; # flag for cleanup tasks
$orig_tbl->{success} = 1; # flag for cleanup tasks
$cleanup = undef; # exec cleanup tasks
# --plugin hook