Don't drop new table if there are any @triggers_not_dropped.

This commit is contained in:
Daniel Nichter
2013-06-07 13:51:29 -07:00
parent cb68de027d
commit df0eb984d7
3 changed files with 136 additions and 9 deletions

View File

@@ -0,0 +1,80 @@
#!/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;
require "$trunk/bin/pt-online-schema-change";
require VersionParser;
use Time::HiRes qw(sleep);
use Data::Dumper;
$Data::Dumper::Indent = 1;
$Data::Dumper::Sortkeys = 1;
$Data::Dumper::Quotekeys = 0;
my $dp = new DSNParser(opts=>$dsn_opts);
my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
my $dbh1 = $sb->get_dbh_for('master');
my $dbh2 = $sb->get_dbh_for('master');
if ( !$dbh1 || !$dbh2 ) {
plan skip_all => 'Cannot connect to sandbox master';
}
elsif ( $sandbox_version lt '5.5' ) {
plan skip_all => "Metadata locks require MySQL 5.5 and newer";
}
my $output;
my $master_dsn = $sb->dsn_for('master');
my $sample = "t/pt-online-schema-change/samples";
my $plugin = "$trunk/$sample/plugins";
my $exit;
my $rows;
# Loads pt_osc.t with cols id (pk), c (unique index),, d.
$sb->load_file('master', "$sample/basic_no_fks_innodb.sql");
# #############################################################################
# Meta-block on create_triggers.
# #############################################################################
($output) = full_output(
sub { pt_online_schema_change::main(
"$master_dsn,D=pt_osc,t=t",
qw(--statistics --execute --tries drop_triggers:1:0.01),
qw(--set-vars lock_wait_timeout=1 --print --no-swap-tables),
'--plugin', "$plugin/make_drop_trigger_fail.pm",
)},
stderr => 1,
);
my $triggers = $dbh1->selectall_arrayref("SHOW TRIGGERS FROM pt_osc");
is(
@$triggers,
3,
"Bug 1188002: triggers not dropped"
) or diag(Dumper($triggers));
my $tables = $dbh1->selectall_arrayref("SHOW TABLES FROM pt_osc");
is_deeply(
$tables,
[ ['_t_new'], ['t'] ],
"Bug 1188002: new table not dropped"
) or diag(Dumper($tables));
# #############################################################################
# Done.
# #############################################################################
$sb->wipe_clean($dbh1);
ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
done_testing;

View File

@@ -0,0 +1,36 @@
package pt_online_schema_change_plugin;
use strict;
use warnings FATAL => 'all';
use English qw(-no_match_vars);
use constant PTDEBUG => $ENV{PTDEBUG} || 0;
sub new {
my ($class, %args) = @_;
my $self = { %args };
return bless $self, $class;
}
sub init {
my ($self, %args) = @_;
print "PLUGIN: init()\n";
$self->{orig_tbl} = $args{orig_tbl};
}
sub before_drop_triggers {
my ($self, %args) = @_;
print "PLUGIN: before_drop_triggers()\n";
my $dbh = $self->{aux_cxn}->dbh;
my $orig_tbl = $self->{orig_tbl};
# Start a trx and get a metadata lock on the table being altered.
$dbh->do('SET autocommit=0');
$dbh->{AutoCommit} = 0;
$dbh->do("START TRANSACTION");
$dbh->do("SELECT * FROM " . $orig_tbl->{name});
return;
}
1;