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

Fix for 1160338: pt-query-digest 2.2 prints unwanted debug info on tcpdump parsing errors

Browse Source
This commit is contained in:
Brian Fraser
2013-04-16 12:20:34 -03:00
parent f8999689b5
commit ce3e868fa6
4 changed files with 105 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
t/lib/MySQLProtocolParser.t
View File

@@ -1759,14 +1759,14 @@ my $out = output(sub {
$protocol->parse_event(%parser_args, event => $p);
}
close $fh;
});
}, stderr => 1);
like(
$out,
qr/had errors, will save them in /,
"Saves errors by default"
);
close $protocol->{errors_fh}; # flush the handle
like(
@@ -1775,6 +1775,53 @@ like(
"The right error is saved"
);
$out = output(sub {
open my $fh, "<", "$sample/tcpdump032.txt" or die "Cannot open tcpdump032.txt: $OS_ERROR";
my %parser_args = (
next_event => sub { return <$fh>; },
tell => sub { return tell($fh); },
);
while ( my $p = $tcpdump->parse_event(%parser_args) ) {
$protocol->parse_event(%parser_args, event => $p);
}
close $fh;
}, stderr => 1);
is(
$out,
'',
"No warnings the second time around"
);
{
$protocol = new MySQLProtocolParser(server=>'127.0.0.1',port=>'3306');
# ..but allow setting the filename through an ENV var:
local $ENV{PERCONA_TOOLKIT_TCP_ERRORS_FILE} = '/dev/null';
$out = output(sub {
open my $fh, "<", "$sample/tcpdump032.txt" or die "Cannot open tcpdump032.txt: $OS_ERROR";
my %parser_args = (
next_event => sub { return <$fh>; },
tell => sub { return tell($fh); },
);
while ( my $p = $tcpdump->parse_event(%parser_args) ) {
$protocol->parse_event(%parser_args, event => $p);
}
close $fh;
}, stderr => 1);
like(
$out,
qr/had errors, will save them in /,
"Still tries saving the errors with PERCONA_TOOLKIT_TCP_ERRORS_FILE"
);
is(
$protocol->{errors_file},
'/dev/null',
"...but uses the provided file"
);
}
# #############################################################################
# Done.
# #############################################################################