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

Test and fix deadlock parsing with partition info.

Browse Source
This commit is contained in:
Daniel Nichter
2012-10-22 15:30:29 -06:00
parent b59d94fccb
commit b406f02f5b
3 changed files with 88 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bin/pt-deadlock-logger
View File

@@ -4072,7 +4072,7 @@ sub parse_deadlocks {
$hash->{wait_hold} = $what eq 'WAITING FOR THIS LOCK TO BE GRANTED' ? 'w' : 'h'; $hash->{wait_hold} = $what eq 'WAITING FOR THIS LOCK TO BE GRANTED' ? 'w' : 'h';
@{$hash}{ qw(lock_type idx db tbl txn_id lock_mode) } @{$hash}{ qw(lock_type idx db tbl txn_id lock_mode) }
= $body = $body
=~ m{^(RECORD|TABLE) LOCKS? (?:space id \d+ page no \d+ n bits \d+ index `?$n`? of )?table `$n(?:/|`\.`)$n` trx id $t lock.mode (\S+)}m; =~ m{^(RECORD|TABLE) LOCKS? (?:space id \d+ page no \d+ n bits \d+ index `?$n`? of )?table `$n(?:/|`\.`)$n`.*?trx id $t lock.mode (\S+)}m;
if ( $hash->{txn_id} ) { if ( $hash->{txn_id} ) {
my ( $high, $low ) = $hash->{txn_id} =~ m/^(\d+) (\d+)$/; my ( $high, $low ) = $hash->{txn_id} =~ m/^(\d+) (\d+)$/;
$hash->{txn_id} = $high ? ( $low + ($high << 32) ) : $low; $hash->{txn_id} = $high ? ( $low + ($high << 32) ) : $low;

105
t/pt-deadlock-logger/basics.t
View File

@@ -23,9 +23,6 @@ my $dbh2 = $sb->get_dbh_for('master', { PrintError => 0, RaiseError => 1, AutoCo
if ( !$dbh1 || !$dbh2 ) { if ( !$dbh1 || !$dbh2 ) {
plan skip_all => 'Cannot connect to sandbox master'; plan skip_all => 'Cannot connect to sandbox master';
} }
else {
plan tests => 10;
}
my $output; my $output;
my $cnf = "/tmp/12345/my.sandbox.cnf"; my $cnf = "/tmp/12345/my.sandbox.cnf";
@@ -44,46 +41,50 @@ $dbh2->commit;
$dbh1->{InactiveDestroy} = 1; $dbh1->{InactiveDestroy} = 1;
$dbh2->{InactiveDestroy} = 1; $dbh2->{InactiveDestroy} = 1;
# Fork off two children to deadlock against each other. sub make_deadlock {
my %children; # Fork off two children to deadlock against each other.
foreach my $child ( 0..1 ) { my %children;
my $pid = fork(); foreach my $child ( 0..1 ) {
if ( defined($pid) && $pid == 0 ) { # I am a child my $pid = fork();
eval { if ( defined($pid) && $pid == 0 ) { # I am a child
my $dbh = ($dbh1, $dbh2)[$child]; eval {
my @stmts = ( my $dbh = ($dbh1, $dbh2)[$child];
"set transaction isolation level serializable", my @stmts = (
"begin", "set transaction isolation level serializable",
"select * from test.dl where a = $child", "begin",
"update test.dl set a = $child where a <> $child", "select * from test.dl where a = $child",
); "update test.dl set a = $child where a <> $child",
foreach my $stmt (@stmts[0..2]) { );
$dbh->do($stmt); foreach my $stmt (@stmts[0..2]) {
} $dbh->do($stmt);
sleep(1 + $child); }
$dbh->do($stmts[-1]); sleep(1 + $child);
}; $dbh->do($stmts[-1]);
if ( $EVAL_ERROR ) { };
if ( $EVAL_ERROR !~ m/Deadlock found/ ) { if ( $EVAL_ERROR ) {
die $EVAL_ERROR; if ( $EVAL_ERROR !~ m/Deadlock found/ ) {
die $EVAL_ERROR;
}
} }
exit(0);
} }
exit(0); elsif ( !defined($pid) ) {
} die("Unable to fork for clearing deadlocks!\n");
elsif ( !defined($pid) ) { }
die("Unable to fork for clearing deadlocks!\n");
# I already exited if I'm a child, so I'm the parent.
$children{$child} = $pid;
} }
# I already exited if I'm a child, so I'm the parent. # Wait for the children to exit.
$children{$child} = $pid; foreach my $child ( keys %children ) {
my $pid = waitpid($children{$child}, 0);
}
$dbh1->commit;
$dbh2->commit;
} }
# Wait for the children to exit. make_deadlock();
foreach my $child ( keys %children ) {
my $pid = waitpid($children{$child}, 0);
}
$dbh1->commit;
$dbh2->commit;
# Test that there is a deadlock # Test that there is a deadlock
$output = $dbh1->selectrow_hashref('show /*!40101 engine*/ innodb status')->{status}; $output = $dbh1->selectrow_hashref('show /*!40101 engine*/ innodb status')->{status};
@@ -162,6 +163,35 @@ ok(
'Deadlocks recorded in table again' 'Deadlocks recorded in table again'
); );
# #############################################################################
# Bug 1043528: pt-deadlock-logger can't parse db/tbl/index on partitioned tables
# #############################################################################
SKIP: {
skip "Deadlock with partitions test requires MySQL 5.1 and newer", 1
unless $sandbox_version ge '5.1';
$dbh1->do('rollback');
$dbh2->do('rollback');
$output = 'foo';
$dbh1->do('TRUNCATE TABLE test.deadlocks');
$sb->load_file('master', "t/pt-deadlock-logger/samples/dead-lock-with-partitions.sql");
make_deadlock();
$output = output(
sub { pt_deadlock_logger::main("F=/tmp/12345/my.sandbox.cnf",
qw(--print) );
}
);
like(
$output,
qr/test dl PRIMARY RECORD/,
"Deadlock with partitions (bug 1043528)"
);
}
# ############################################################################# # #############################################################################
# Done. # Done.
# ############################################################################# # #############################################################################
@@ -169,4 +199,5 @@ $dbh1->commit;
$dbh2->commit; $dbh2->commit;
$sb->wipe_clean($dbh1); $sb->wipe_clean($dbh1);
ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox"); ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
done_testing;
exit; exit;

19
t/pt-deadlock-logger/samples/dead-lock-with-partitions.sql Normal file
View File

@@ -0,0 +1,19 @@
drop database if exists test;
create database test;
use test;
CREATE TABLE dl (
id INT NOT NULL,
store_id INT NOT NULL,
a INT NOT NULL,
primary key (id, store_id),
unique key (store_id)
) ENGINE=InnoDB
PARTITION BY RANGE (store_id) (
PARTITION p0 VALUES LESS THAN (6),
PARTITION p1 VALUES LESS THAN (11)
);
insert into test.dl values
(1, 1, 0), (2, 2, 0), (3, 3, 0), (4, 4, 1), (5, 5, 1), (6, 6, 1);