percona/percona-toolkit
1
0
Fork 0
mirror of https://github.com/percona/percona-toolkit.git synced 2025-09-09 07:30:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

pt-osc generate random table prefix after 10th try

Browse Source
This commit is contained in:
frank-cizmich
2016-02-26 21:03:18 -03:00
parent 805577fcc3
commit 3f90f9ea82
3 changed files with 62 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -9546,6 +9546,7 @@ sub main {
my $old_tbl;
if ( $o->get('swap-tables') ) {
eval {
$old_tbl = swap_tables(
orig_tbl => $orig_tbl,
@@ -10084,7 +10085,7 @@ sub swap_tables {
my $prefix = '_';
my $table_name = $orig_tbl->{tbl} . ($args{suffix} || '');
my $name_tries = 10; # don't try forever
my $name_tries = 20; # don't try forever
my $table_exists = qr/table.+?already exists/i;
# This sub only works for --execute. Since the options are
@@ -10119,6 +10120,16 @@ sub swap_tables {
print ts("Swapping tables...\n");
while ( $name_tries-- ) {
# https://bugs.launchpad.net/percona-toolkit/+bug/1526105
if ( $name_tries <= 10 ) { # we've already added 10 underscores?
# time to try a small random string
my @chars = ("A".."Z", "0".."9");
$prefix = '';
$prefix .= $chars[rand @chars] for 1..6;
$prefix .= "_";
}
$table_name = $prefix . $table_name;
if ( length($table_name) > 64 ) {
@@ -10131,6 +10142,7 @@ sub swap_tables {
my $sql = "RENAME TABLE $orig_tbl->{name} "
. "TO " . $q->quote($orig_tbl->{db}, $table_name)
. ", $new_tbl->{name} TO $orig_tbl->{name}";
eval {
osc_retry(
Cxn => $cxn,
@@ -10150,6 +10162,7 @@ sub swap_tables {
# other purposes.
$table_exists,
],
operation => "swap_tables",
);
};
if ( my $e = $EVAL_ERROR ) {
@@ -10169,10 +10182,8 @@ sub swap_tables {
name => $q->quote($orig_tbl->{db}, $table_name),
};
}
# This shouldn't happen.
# Here and in the attempt to find a new table name we probably ought to
# use --tries (and maybe a Retry object?)
die ts("Failed to find a unique old table name after "
. "serveral attempts.\n");
}
@@ -10699,6 +10710,9 @@ sub osc_retry {
PTDEBUG && _d('Retry fail:', $error);
if ( $ignore_errors ) {
if ($error =~ /table.+?already exists/i) {
PTDEBUG && _d('Aborting retries because of table name conflict. Trying with different name');
}
return 0 if grep { $error =~ $_ } @$ignore_errors;
}
@@ -10901,6 +10915,7 @@ sub sig_int {
exit 1;
}
sub _d {
my ($package, undef, $line) = caller 0;
@_ = map { (my $temp = $_) =~ s/\n/\n# /g; $temp; }