mirror of
https://github.com/percona/percona-toolkit.git
synced 2025-09-14 15:33:49 +00:00
Retry metadata locks. Add --plugin to make testing this easier. Print --statistics in cleanup tasks. Add a helper script for myself: sandbox/set-mysql.
This commit is contained in:
File diff suppressed because it is too large
Load Diff
23
sandbox/set-mysql
Executable file
23
sandbox/set-mysql
Executable file
@@ -0,0 +1,23 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
if [ ! -d "$HOME/mysql-bin" ]; then
|
||||||
|
echo "$HOME/mysql-bin does not exist." >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
VER=$1
|
||||||
|
if [ "$VER" ]; then
|
||||||
|
if [ "$VER" != "4.1" -a "$VER" != "5.0" -a "$VER" != "5.1" -a "$VER" != "5.5" -a "$VER" != "5.6" ]; then
|
||||||
|
echo "VERSION must be 4.1, 5.0, 5.1, 5.5, or 5.6. Or, do not specify a version to select all available versions." >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
VER='';
|
||||||
|
fi
|
||||||
|
|
||||||
|
select choice in $(ls -d $HOME/mysql-bin/mysql-$VER* | sort -r); do
|
||||||
|
echo "export PERCONA_TOOLKIT_SANDBOX=$choice"
|
||||||
|
break
|
||||||
|
done
|
||||||
|
|
||||||
|
exit
|
102
t/pt-online-schema-change/metadata_locks.t
Normal file
102
t/pt-online-schema-change/metadata_locks.t
Normal file
@@ -0,0 +1,102 @@
|
|||||||
|
#!/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 --retries 2 --set-vars lock_wait_timeout=1),
|
||||||
|
'--plugin', "$plugin/block_create_triggers.pm",
|
||||||
|
)},
|
||||||
|
stderr => 1,
|
||||||
|
);
|
||||||
|
|
||||||
|
like(
|
||||||
|
$output,
|
||||||
|
qr/Error creating triggers: .+? Lock wait timeout exceeded/,
|
||||||
|
"Lock wait timeout creating triggers"
|
||||||
|
);
|
||||||
|
|
||||||
|
like(
|
||||||
|
$output,
|
||||||
|
qr/lock_wait_timeout\s+2/,
|
||||||
|
"Retried create triggers"
|
||||||
|
);
|
||||||
|
|
||||||
|
# #############################################################################
|
||||||
|
# Meta-block on swap_tables.
|
||||||
|
# #############################################################################
|
||||||
|
|
||||||
|
($output) = full_output(
|
||||||
|
sub { pt_online_schema_change::main(
|
||||||
|
"$master_dsn,D=pt_osc,t=t",
|
||||||
|
qw(--statistics --execute --retries 2 --set-vars lock_wait_timeout=1),
|
||||||
|
'--plugin', "$plugin/block_swap_tables.pm",
|
||||||
|
)},
|
||||||
|
stderr => 1,
|
||||||
|
);
|
||||||
|
|
||||||
|
like(
|
||||||
|
$output,
|
||||||
|
qr/Error swapping tables: .+? Lock wait timeout exceeded/,
|
||||||
|
"Lock wait timeout swapping tables"
|
||||||
|
);
|
||||||
|
|
||||||
|
like(
|
||||||
|
$output,
|
||||||
|
qr/lock_wait_timeout\s+2/,
|
||||||
|
"Retried swap tables"
|
||||||
|
);
|
||||||
|
|
||||||
|
# #############################################################################
|
||||||
|
# Done.
|
||||||
|
# #############################################################################
|
||||||
|
$sb->wipe_clean($dbh1);
|
||||||
|
ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
|
||||||
|
done_testing;
|
@@ -0,0 +1,46 @@
|
|||||||
|
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_create_triggers {
|
||||||
|
my ($self, %args) = @_;
|
||||||
|
print "PLUGIN: before_create_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;
|
||||||
|
}
|
||||||
|
|
||||||
|
sub after_create_triggers {
|
||||||
|
my ($self, %args) = @_;
|
||||||
|
print "PLUGIN: after_create_triggers()\n";
|
||||||
|
|
||||||
|
my $dbh = $self->{aux_cxn}->dbh;
|
||||||
|
|
||||||
|
# Commit the trx to release the metadata lock.
|
||||||
|
$dbh->commit();
|
||||||
|
}
|
||||||
|
|
||||||
|
1;
|
@@ -0,0 +1,46 @@
|
|||||||
|
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_swap_tables {
|
||||||
|
my ($self, %args) = @_;
|
||||||
|
print "PLUGIN: before_swap_tables()\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;
|
||||||
|
}
|
||||||
|
|
||||||
|
sub before_drop_triggers {
|
||||||
|
my ($self, %args) = @_;
|
||||||
|
print "PLUGIN: before_drop_triggers()\n";
|
||||||
|
|
||||||
|
my $dbh = $self->{aux_cxn}->dbh;
|
||||||
|
|
||||||
|
# Commit the trx to release the metadata lock.
|
||||||
|
$dbh->commit();
|
||||||
|
}
|
||||||
|
|
||||||
|
1;
|
@@ -2,6 +2,9 @@ Starting a dry run. `bug_1045317`.`bits` will not be altered. Specify --execut
|
|||||||
Not dropping triggers because this is a dry run.
|
Not dropping triggers because this is a dry run.
|
||||||
Dropping new table...
|
Dropping new table...
|
||||||
Dropped new table OK.
|
Dropped new table OK.
|
||||||
|
# Event Count
|
||||||
|
# ====== =====
|
||||||
|
# INSERT 0
|
||||||
Dry run complete. `bug_1045317`.`bits` was not altered.
|
Dry run complete. `bug_1045317`.`bits` was not altered.
|
||||||
Creating new table...
|
Creating new table...
|
||||||
Created new table bug_1045317._bits_new OK.
|
Created new table bug_1045317._bits_new OK.
|
||||||
@@ -11,6 +14,3 @@ Not creating triggers because this is a dry run.
|
|||||||
Not copying rows because this is a dry run.
|
Not copying rows because this is a dry run.
|
||||||
Not swapping tables because this is a dry run.
|
Not swapping tables because this is a dry run.
|
||||||
Not dropping old table because this is a dry run.
|
Not dropping old table because this is a dry run.
|
||||||
# Event Count
|
|
||||||
# ====== =====
|
|
||||||
# INSERT 0
|
|
||||||
|
@@ -1,6 +1,10 @@
|
|||||||
Altering `bug_1045317`.`bits`...
|
Altering `bug_1045317`.`bits`...
|
||||||
Dropping triggers...
|
Dropping triggers...
|
||||||
Dropped triggers OK.
|
Dropped triggers OK.
|
||||||
|
# Event Count
|
||||||
|
# ================== =====
|
||||||
|
# INSERT 1
|
||||||
|
# mysql_warning_1592 1
|
||||||
Successfully altered `bug_1045317`.`bits`.
|
Successfully altered `bug_1045317`.`bits`.
|
||||||
Creating new table...
|
Creating new table...
|
||||||
Created new table bug_1045317._bits_new OK.
|
Created new table bug_1045317._bits_new OK.
|
||||||
@@ -14,7 +18,3 @@ Swapping tables...
|
|||||||
Swapped original and new tables OK.
|
Swapped original and new tables OK.
|
||||||
Dropping old table...
|
Dropping old table...
|
||||||
Dropped old table `bug_1045317`.`_bits_old` OK.
|
Dropped old table `bug_1045317`.`_bits_old` OK.
|
||||||
# Event Count
|
|
||||||
# ================== =====
|
|
||||||
# INSERT 1
|
|
||||||
# mysql_warning_1592 1
|
|
||||||
|
Reference in New Issue
Block a user