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

Merge pull request #184 from percona/PT-105

Browse Source 
PT-105 Fixed pt-table-checksum fails if a database is dropped while the tool is running
This commit is contained in:
Carlos Salguero
2017-03-16 19:45:36 +02:00
committed by GitHub
parent 7b0d02b8b8 148be75a0e
commit 9244b3e515
6 changed files with 124 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
bin/pt-duplicate-key-checker
View File

@@ -3443,7 +3443,14 @@ sub _iterate_dbh {
&& $self->_resume_from_table($tbl)
&& $self->table_is_allowed($self->{db}, $tbl);
}
@{$dbh->selectall_arrayref($sql)};
eval { @{$dbh->selectall_arrayref($sql)}; };
if ($EVAL_ERROR) {
warn "Skipping $self->{db}...";
$self->{db} = undef;
next;
}
PTDEBUG && _d('Found', scalar @tbls, 'tables in database',$self->{db});
$self->{tbls} = \@tbls;
}

9
bin/pt-index-usage
View File

@@ -4221,7 +4221,14 @@ sub _iterate_dbh {
&& $self->_resume_from_table($tbl)
&& $self->table_is_allowed($self->{db}, $tbl);
}
@{$dbh->selectall_arrayref($sql)};
eval { @{$dbh->selectall_arrayref($sql)}; };
if ($EVAL_ERROR) {
warn "Skipping $self->{db}...";
$self->{db} = undef;
next;
}
PTDEBUG && _d('Found', scalar @tbls, 'tables in database',$self->{db});
$self->{tbls} = \@tbls;
}

9
bin/pt-table-checksum
View File

@@ -7566,7 +7566,14 @@ sub _iterate_dbh {
&& $self->_resume_from_table($tbl)
&& $self->table_is_allowed($self->{db}, $tbl);
}
@{$dbh->selectall_arrayref($sql)};
eval { @{$dbh->selectall_arrayref($sql)}; };
if ($EVAL_ERROR) {
warn "Skipping $self->{db}...";
$self->{db} = undef;
next;
}
PTDEBUG && _d('Found', scalar @tbls, 'tables in database',$self->{db});
$self->{tbls} = \@tbls;
}

9
bin/pt-table-sync
View File

@@ -7777,7 +7777,14 @@ sub _iterate_dbh {
&& $self->_resume_from_table($tbl)
&& $self->table_is_allowed($self->{db}, $tbl);
}
@{$dbh->selectall_arrayref($sql)};
eval { @{$dbh->selectall_arrayref($sql)}; };
if ($EVAL_ERROR) {
warn "Skipping $self->{db}...";
$self->{db} = undef;
next;
}
PTDEBUG && _d('Found', scalar @tbls, 'tables in database',$self->{db});
$self->{tbls} = \@tbls;
}

9
lib/SchemaIterator.pm
View File

@@ -353,7 +353,14 @@ sub _iterate_dbh {
&& $self->_resume_from_table($tbl)
&& $self->table_is_allowed($self->{db}, $tbl);
}
@{$dbh->selectall_arrayref($sql)};
eval { @{$dbh->selectall_arrayref($sql)}; };
if ($EVAL_ERROR) {
warn "Skipping $self->{db}...";
$self->{db} = undef;
next;
}
PTDEBUG && _d('Found', scalar @tbls, 'tables in database',$self->{db});
$self->{tbls} = \@tbls;
}

84
t/pt-table-checksum/pt-105.t Normal file
View File

@@ -0,0 +1,84 @@
#!/usr/bin/env perl
BEGIN {
die "The PERCONA_TOOLKIT_BRANCH environment variable is not set.\n"
unless $ENV{PERCONA_TOOLKIT_BRANCH} && -d $ENV{PERCONA_TOOLKIT_BRANCH};
unshift @INC, "$ENV{PERCONA_TOOLKIT_BRANCH}/lib";
};
use strict;
use warnings FATAL => 'all';
use English qw(-no_match_vars);
use Test::More;
use PerconaTest;
use Sandbox;
use SqlModes;
use threads;
use Time::HiRes qw( usleep );
use constant PTDEBUG => $ENV{PTDEBUG} || 0;
require "$trunk/bin/pt-table-checksum";
my $dp = new DSNParser(opts=>$dsn_opts);
my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
my $dbh = $sb->get_dbh_for('master');
if ( !$dbh ) {
plan skip_all => 'Cannot connect to sandbox master';
}
else {
plan tests => 2;
}
my $db_count = 100;
sub start_thread {
my ($dsn_opts, $initial_sleep_time, $sleep_time, $db_count) = @_;
my $dp = new DSNParser(opts=>$dsn_opts);
my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
my $dbh = $sb->get_dbh_for('master');
PTDEBUG && diag("Thread started: Sleeping $initial_sleep_time milliseconds before start dropping DBs");
usleep($initial_sleep_time );
for (my $i=0; $i < $db_count; $i++) {
PTDEBUG && diag("Dropping drop_test_$i");
$dbh->do("DROP DATABASE IF EXISTS drop_test_$i");
usleep($sleep_time * 1000)
}
PTDEBUG && diag("Exit thread")
}
my $thr = threads->create('start_thread', $dsn_opts, 1000, 100, $db_count);
threads->yield();
sleep(3);
for (my $i=0; $i < $db_count; $i++) {
$dbh->do("DROP DATABASE IF EXISTS drop_test_$i");
$dbh->do("CREATE SCHEMA drop_test_$i")
}
# The sandbox servers run with lock_wait_timeout=3 and it's not dynamic
# so we need to specify --set-vars innodb_lock_wait_timeout=3 else the tool will die.
# And --max-load "" prevents waiting for status variables.
my $master_dsn = 'h=127.1,P=12345,u=msandbox,p=msandbox';
my @args = ($master_dsn, qw(--no-check-binlog-format));
my $output;
$output = output(
sub { pt_table_checksum::main(@args) },
stderr => 1,
);
unlike(
$output,
qr/db selectall_arrayref failed/,
"Dropping tables while checksum is running"
);
$thr->join();
# #############################################################################
# Done.
# #############################################################################
$sb->wipe_clean($dbh);
ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
exit;