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

added fix for pt-deadlock-logger-introduces-a-noise-to-mysql-1258135

Browse Source
This commit is contained in:
Frank Cizmich
2014-07-04 11:45:14 -03:00
parent 9b8af748f3 9a06fef87e
commit e5383b597d
1 changed files with 36 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

71
bin/pt-deadlock-logger
View File

@@ -4616,43 +4616,44 @@ sub main {
}
}
else {
if ( $ins_sth ) {
eval {
PTDEBUG && _d('Saving deadlock to --dest');
foreach my $txn (
sort { $a->{thread} <=> $b->{thread} } values %txns
) {
$ins_sth->execute(@{$txn}{@cols});
}
$dst->dbh->commit();
};
if ( my $e = $EVAL_ERROR ) {
PTDEBUG && _d('Error saving to --dest:', $e);
if ( $dst->lost_connection($e) ) {
eval {
$ins_sth->finish() if $ins_sth;
$dst->dbh->disconnect() if $dst->dbh;
$dst->connect(AutoCommit => 0);
$ins_sth = $dst->dbh->prepare($ins_sql);
};
if ( $EVAL_ERROR ) {
warn "Lost connection to " . $dst->name . ". Will try "
. "to reconnect in the next iteration.\n";
}
else {
PTDEBUG && _d('Reconnected to MySQL (--dest)');
redo ITERATION;
}
}
else {
warn "Error saving to --dest: $EVAL_ERROR";
$exit_status |= 1;
}
}
}
if ( $fingerprint ne $last_fingerprint ) {
PTDEBUG && _d('New deadlock');
if ( $ins_sth ) {
eval {
PTDEBUG && _d('Saving deadlock to --dest');
foreach my $txn (
sort { $a->{thread} <=> $b->{thread} } values %txns
) {
$ins_sth->execute(@{$txn}{@cols});
}
$dst->dbh->commit();
};
if ( my $e = $EVAL_ERROR ) {
PTDEBUG && _d('Error saving to --dest:', $e);
if ( $dst->lost_connection($e) ) {
eval {
$ins_sth->finish() if $ins_sth;
$dst->dbh->disconnect() if $dst->dbh;
$dst->connect(AutoCommit => 0);
$ins_sth = $dst->dbh->prepare($ins_sql);
};
if ( $EVAL_ERROR ) {
warn "Lost connection to " . $dst->name . ". Will try "
. "to reconnect in the next iteration.\n";
}
else {
PTDEBUG && _d('Reconnected to MySQL (--dest)');
redo ITERATION;
}
}
else {
warn "Error saving to --dest: $EVAL_ERROR";
$exit_status |= 1;
}
}
}
if ( !$o->get('quiet') ) {
print join($sep, @cols), "\n";
foreach my $txn (