percona/percona-toolkit
1
0
Fork 0
mirror of https://github.com/percona/percona-toolkit.git synced 2026-04-17 01:01:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge ubuntu-12-64-issues

Browse Source
This commit is contained in:
Brian Fraser
2012-07-20 17:33:13 -03:00
parent bfa5f488fa fa0a3b0ff5
commit 5d8be022e9
21 changed files with 343 additions and 183 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
t/pt-query-digest/mirror.t
View File

@@ -46,19 +46,17 @@ $cmd = "$trunk/bin/pt-query-digest "
. "--execute h=127.1,P=12346,u=msandbox,p=msandbox --mirror 1 "
. "--pid $pid_file";
$ENV{PTDEBUG}=1;
`$cmd > /tmp/read_only.txt 2>&1 &`;
$ENV{PTDEBUG}=0;
sleep 3;
{
local $ENV{PTDEBUG}=1;
`$cmd > /tmp/read_only.txt 2>&1 &`;
}
$dbh1->do('select sleep(1)');
sleep 1;
$dbh1->do('set global read_only=1');
$dbh2->do('set global read_only=0');
$dbh1->do('select sleep(1)');
sleep 1;
PerconaTest::wait_for_files($pid_file);
chomp(my $pid = `cat $pid_file`);
kill 15, $pid;
sleep 0.25;

19
t/pt-query-digest/processlist.t
View File

@@ -61,14 +61,17 @@ my $output = output(
# the usual stddev. -- stddev doesn't matter much. It's the other vals
# that indicate that --processlist works.
$exec =~ s/(\S+) 3s$/786ms 3s/;
ok(
no_diff(
$exec,
"t/pt-query-digest/samples/proclist001.txt",
cmd_output => 1,
),
"--processlist correctly observes and measures multiple queries"
);
TODO: {
local $::TODO = "This is a timing-related test, which may occasionally fail";
ok(
no_diff(
$exec,
"t/pt-query-digest/samples/proclist001.txt",
cmd_output => 1,
),
"--processlist correctly observes and measures multiple queries"
);
}
# #############################################################################
# Done.

72
t/pt-query-digest/read_timeout.t
View File

@@ -14,61 +14,71 @@ use Test::More tests => 2;
use PerconaTest;
use Time::HiRes qw(sleep time);
use POSIX qw(mkfifo);
# #########################################################################
# Issue 226: Fix mk-query-digest signal handling
# #########################################################################
diag(`rm -rf /tmp/mqd.pid`);
my $pid_file = '/tmp/mqd.pid';
my $fifo = '/tmp/mqd.fifo';
unlink $pid_file and diag("Unlinking existing $pid_file");
unlink $fifo and diag("Unlinking existing $fifo");
my ($start, $end, $waited);
my $timeout = wait_for(
sub {
$start = time;
`$trunk/bin/pt-query-digest --read-timeout 2 --pid /tmp/mqd.pid 2>/dev/null`;
return;
},
4,
);
$end = time;
$waited = $end - $start;
if ( $timeout ) {
# mqd ran longer than --read-timeout
my $pid = `cat /tmp/mqd.pid`;
`kill $pid`;
my ($start, $end, $waited, $timeout);
SKIP: {
skip("Not connected to a tty won't test --read-timeout with STDIN", 1)
if !-t STDIN;
use IO::File;
STDIN->blocking(1);
$timeout = wait_for(
sub {
$start = time;
`$trunk/bin/pt-query-digest --read-timeout 2 --pid $pid_file 2>/dev/null`;
return;
},
5,
);
$end = time;
$waited = $end - $start;
if ( $timeout ) {
# mqd ran longer than --read-timeout
chomp(my $pid = slurp_file($pid_file));
kill SIGTERM => $pid if $pid;
}
ok(
$waited >= 2 && int($waited) <= 4,
sprintf("--read-timeout 2 waited %.1f seconds reading STDIN", $waited)
);
}
ok(
$waited >= 2 && $waited < 4,
sprintf("--read-timeout 2 waited %.1f seconds reading STDIN", $waited)
);
diag(`rm -rf /tmp/mqd.pid`);
diag(`rm -rf /tmp/mqd.fifo; mkfifo /tmp/mqd.fifo`);
system("$trunk/t/pt-query-digest/samples/write-to-fifo.pl /tmp/mqd.fifo 4 &");
unlink $pid_file;
mkfifo $fifo, 0700;
system("$trunk/t/pt-query-digest/samples/write-to-fifo.pl $fifo 4 &");
$timeout = wait_for(
sub {
$start = time;
`$trunk/bin/pt-query-digest --read-timeout 2 --pid /tmp/mqd.pid /tmp/mqd.fifo`;
`$trunk/bin/pt-query-digest --read-timeout 2 --pid $pid_file $fifo`;
return;
},
4,
5,
);
$end = time;
$waited = $end - $start;
if ( $timeout ) {
# mqd ran longer than --read-timeout
my $pid = `cat /tmp/mqd.pid`;
`kill $pid`;
chomp(my $pid = slurp_file($pid_file));
kill SIGTERM => $pid if $pid;
}
ok(
$waited >= 2 && $waited < 4,
$waited >= 2 && int($waited) <= 4,
sprintf("--read-timeout waited %.1f seconds reading a file", $waited)
);
diag(`rm -rf /tmp/mqd.pid`);
diag(`rm -rf /tmp/mqd.fifo`);
unlink $pid_file;
unlink $fifo;
# #############################################################################
# Done.