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

Clean up t/pt-diskstats/pt-diskstats.t and update samples: I'm guessing the diff is just cosmetic since no data has changed.

Browse Source
This commit is contained in:
Daniel Nichter
2013-08-09 17:18:44 +00:00
parent 08154b84cf
commit 1987744a1d
4 changed files with 47 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
t/pt-diskstats/expected/all_int_bug-1035311.txt
View File

@@ -310,7 +310,6 @@
20.0 {8} 504.4 42.0 20.7 0% 1.8 28.9 320.2 10.9 3.4 0% 0.4 9.8 32% 21 824.6 18.0 3.1
21.0 {8} 744.0 42.3 30.8 0% 0.7 7.4 1223.0 9.5 11.3 5% 0.6 3.5 17% 0 1967.1 4.2 0.7
22.0 {8} 704.0 40.5 27.9 0% 0.9 10.7 1473.0 8.6 12.3 3% 0.8 4.2 26% 0 2177.0 5.3 0.9
#ts device rd_s rd_avkb rd_mb_s rd_mrg rd_cnc rd_rt wr_s wr_avkb wr_mb_s wr_mrg wr_cnc wr_rt busy in_prg io_s qtime stime
23.0 {8} 651.2 42.4 27.0 0% 0.7 8.4 720.9 12.9 9.1 9% 0.4 3.9 17% 0 1372.1 5.0 1.0
24.0 {8} 228.6 42.0 9.4 0% 1.4 47.7 566.5 7.0 3.9 0% 2.3 31.9 29% 105 795.2 62.9 2.9
25.0 {8} 342.0 39.9 13.3 0% 2.2 52.5 733.1 22.0 15.7 3% 6.5 68.3 35% 34 1075.1 32.8 2.5
@@ -331,10 +330,10 @@ Enter a disk/device pattern: #ts device rd_s rd_avkb rd_mb_s rd_mrg rd_cnc
10.0 xvdb1 273.4 37.4 10.0 0% 3.3 11.9 416.3 28.0 11.4 13% 4.1 8.6 92% 55 689.6 8.3 1.2
11.0 xvdb1 114.3 36.7 4.1 0% 5.8 50.7 229.6 25.9 5.8 11% 4.7 18.2 92% 7 343.8 23.6 2.5
12.0 xvdb1 72.1 39.0 2.7 0% 5.6 77.8 101.7 34.6 3.4 0% 3.1 30.8 100% 31 173.8 40.2 5.7
#ts device rd_s rd_avkb rd_mb_s rd_mrg rd_cnc rd_rt wr_s wr_avkb wr_mb_s wr_mrg wr_cnc wr_rt busy in_prg io_s qtime stime
13.0 xvdb1 94.3 41.4 3.8 0% 5.4 57.7 377.4 32.0 11.8 28% 12.4 23.5 97% 106 471.7 24.8 1.6
14.0 xvdb1 272.7 40.4 10.8 1% 4.1 14.9 658.6 26.8 17.3 19% 15.6 19.3 88% 2 931.3 15.5 0.8
15.0 xvdb1 173.2 39.9 6.8 0% 2.0 11.4 215.8 13.3 2.8 9% 1.3 5.5 76% 7 389.0 10.3 1.9
#ts device rd_s rd_avkb rd_mb_s rd_mrg rd_cnc rd_rt wr_s wr_avkb wr_mb_s wr_mrg wr_cnc wr_rt busy in_prg io_s qtime stime
16.0 xvdb1 230.5 41.8 9.4 0% 5.9 25.7 277.0 19.9 5.4 0% 4.3 15.5 88% 1 507.5 14.7 1.7
17.0 xvdb1 214.0 42.1 8.8 0% 1.0 4.8 481.1 7.1 3.3 3% 1.4 2.8 54% 7 695.1 2.6 0.8
18.0 xvdb1 103.1 42.4 4.3 0% 4.6 44.8 122.2 9.0 1.1 0% 2.4 19.5 85% 1 225.3 27.1 3.8

4
t/pt-diskstats/expected/disk_int_bug-1035311.txt
View File

@@ -24,6 +24,7 @@
13.0 {8} 283.0 41.4 11.4 0% 2.0 57.7 1491.3 29.6 43.2 18% 5.3 23.3 37% 356 1774.3 24.5 1.4
14.0 {8} 815.0 40.3 32.1 1% 1.6 15.1 2054.0 24.0 48.1 13% 6.4 21.7 33% 6 2869.0 17.0 0.8
15.0 {8} 525.6 40.0 20.5 0% 0.7 11.2 691.9 12.4 8.4 6% 0.5 5.8 29% 24 1217.5 10.3 1.8
#ts device rd_s rd_avkb rd_mb_s rd_mrg rd_cnc rd_rt wr_s wr_avkb wr_mb_s wr_mrg wr_cnc wr_rt busy in_prg io_s qtime stime
16.0 {8} 685.4 41.7 27.9 0% 2.2 25.9 855.2 19.4 16.2 0% 1.7 15.9 42% 3 1540.7 14.6 2.2
17.0 {8} 648.1 42.1 26.6 0% 0.4 4.7 1553.3 6.7 10.1 3% 0.5 2.7 20% 24 2201.4 2.6 0.7
18.0 {8} 303.4 42.4 12.6 0% 1.7 45.6 398.5 8.6 3.3 3% 0.9 17.4 32% 3 701.9 25.6 3.6
@@ -31,7 +32,6 @@
20.0 {8} 504.4 42.0 20.7 0% 1.8 28.9 320.2 10.9 3.4 0% 0.4 9.8 32% 21 824.6 18.0 3.1
21.0 {8} 744.0 42.3 30.8 0% 0.7 7.4 1223.0 9.5 11.3 5% 0.6 3.5 17% 0 1967.1 4.2 0.7
22.0 {8} 704.0 40.5 27.9 0% 0.9 10.7 1473.0 8.6 12.3 3% 0.8 4.2 26% 0 2177.0 5.3 0.9
#ts device rd_s rd_avkb rd_mb_s rd_mrg rd_cnc rd_rt wr_s wr_avkb wr_mb_s wr_mrg wr_cnc wr_rt busy in_prg io_s qtime stime
23.0 {8} 651.2 42.4 27.0 0% 0.7 8.4 720.9 12.9 9.1 9% 0.4 3.9 17% 0 1372.1 5.0 1.0
24.0 {8} 228.6 42.0 9.4 0% 1.4 47.7 566.5 7.0 3.9 0% 2.3 31.9 29% 105 795.2 62.9 2.9
25.0 {8} 342.0 39.9 13.3 0% 2.2 52.5 733.1 22.0 15.7 3% 6.5 68.3 35% 34 1075.1 32.8 2.5
@@ -55,7 +55,6 @@ Enter a disk/device pattern: #ts device rd_s rd_avkb rd_mb_s rd_mrg rd_cnc
13.0 xvdb1 94.3 41.4 3.8 0% 5.4 57.7 377.4 32.0 11.8 28% 12.4 23.5 97% 106 471.7 24.8 1.6
14.0 xvdb1 272.7 40.4 10.8 1% 4.1 14.9 658.6 26.8 17.3 19% 15.6 19.3 88% 2 931.3 15.5 0.8
15.0 xvdb1 173.2 39.9 6.8 0% 2.0 11.4 215.8 13.3 2.8 9% 1.3 5.5 76% 7 389.0 10.3 1.9
#ts device rd_s rd_avkb rd_mb_s rd_mrg rd_cnc rd_rt wr_s wr_avkb wr_mb_s wr_mrg wr_cnc wr_rt busy in_prg io_s qtime stime
16.0 xvdb1 230.5 41.8 9.4 0% 5.9 25.7 277.0 19.9 5.4 0% 4.3 15.5 88% 1 507.5 14.7 1.7
17.0 xvdb1 214.0 42.1 8.8 0% 1.0 4.8 481.1 7.1 3.3 3% 1.4 2.8 54% 7 695.1 2.6 0.8
18.0 xvdb1 103.1 42.4 4.3 0% 4.6 44.8 122.2 9.0 1.1 0% 2.4 19.5 85% 1 225.3 27.1 3.8
@@ -69,4 +68,5 @@ Enter a disk/device pattern: #ts device rd_s rd_avkb rd_mb_s rd_mrg rd_cnc
26.0 xvdb1 225.5 42.3 9.3 0% 2.1 9.3 329.8 8.5 2.7 6% 1.3 3.6 73% 8 555.3 6.5 1.3
27.0 xvdb1 227.8 42.7 9.5 0% 3.8 16.6 161.9 14.5 2.3 3% 1.1 6.5 53% 0 389.7 7.6 1.3
28.0 xvdb1 157.6 42.5 6.5 0% 2.2 13.9 125.7 12.7 1.6 1% 1.0 8.2 61% 7 283.3 10.7 2.1
#ts device rd_s rd_avkb rd_mb_s rd_mrg rd_cnc rd_rt wr_s wr_avkb wr_mb_s wr_mrg wr_cnc wr_rt busy in_prg io_s qtime stime
29.0 xvdb1 229.3 42.4 9.5 0% 4.2 18.3 284.4 15.9 4.4 14% 4.6 13.9 91% 0 513.7 13.1 1.6

4
t/pt-diskstats/expected/sample_int_bug-1035311.txt
View File

@@ -7,7 +7,6 @@
6.0 {8} 620.7 39.9 24.2 0% 1.3 16.2 1751.2 21.8 37.2 10% 3.0 12.4 34% 93 2371.9 12.5 1.1
7.0 {8} 661.6 38.2 24.6 0% 1.6 18.8 763.8 25.2 18.8 8% 2.2 21.0 42% 66 1425.4 16.1 2.3
8.0 {8} 276.9 38.1 10.3 1% 2.0 56.7 1081.7 31.2 33.0 12% 4.4 28.4 36% 111 1358.7 30.1 1.9
#ts device rd_s rd_avkb rd_mb_s rd_mrg rd_cnc rd_rt wr_s wr_avkb wr_mb_s wr_mrg wr_cnc wr_rt busy in_prg io_s qtime stime
9.0 {8} 554.8 37.6 20.4 0% 2.1 31.0 1952.4 26.4 50.3 14% 8.6 30.1 37% 55 2507.3 27.6 1.0
10.0 {8} 843.1 37.0 30.5 0% 1.2 11.7 1351.4 26.5 34.9 8% 1.6 8.8 35% 199 2194.5 8.2 1.2
11.0 {8} 342.8 36.7 12.3 0% 2.2 50.7 678.3 24.3 16.1 8% 1.9 21.1 35% 21 1021.1 25.4 2.6
@@ -31,7 +30,6 @@
29.0 {8} 682.9 42.4 28.3 0% 1.6 18.5 938.3 14.6 13.4 11% 2.0 14.9 34% 0 1621.2 13.7 1.6
Enter a disk/device pattern: #ts device rd_s rd_avkb rd_mb_s rd_mrg rd_cnc rd_rt wr_s wr_avkb wr_mb_s wr_mrg wr_cnc wr_rt busy in_prg io_s qtime stime
1.0 xvdb1 258.9 42.4 10.7 0% 2.3 9.1 152.8 36.6 5.5 27% 2.7 12.9 50% 37 411.6 9.6 1.1
#ts device rd_s rd_avkb rd_mb_s rd_mrg rd_cnc rd_rt wr_s wr_avkb wr_mb_s wr_mrg wr_cnc wr_rt busy in_prg io_s qtime stime
2.0 xvdb1 177.3 40.3 7.0 0% 2.1 12.0 409.2 21.5 8.6 12% 3.6 7.7 69% 44 586.4 13.5 1.1
3.0 xvdb1 135.0 39.9 5.3 0% 5.8 42.9 515.9 33.7 17.0 25% 18.9 27.6 97% 29 650.8 22.9 1.2
4.0 xvdb1 272.5 42.0 11.2 0% 3.1 11.5 520.3 27.5 14.0 18% 7.4 11.7 78% 30 792.8 10.4 0.9
@@ -42,6 +40,7 @@ Enter a disk/device pattern: #ts device rd_s rd_avkb rd_mb_s rd_mrg rd_cnc
9.0 xvdb1 186.9 37.6 6.9 0% 5.7 30.6 599.8 29.1 17.0 21% 20.2 26.5 99% 14 786.8 24.7 1.0
10.0 xvdb1 273.4 37.4 10.0 0% 3.3 11.9 416.3 28.0 11.4 13% 4.1 8.6 92% 55 689.6 8.3 1.2
11.0 xvdb1 114.3 36.7 4.1 0% 5.8 50.7 229.6 25.9 5.8 11% 4.7 18.2 92% 7 343.8 23.6 2.5
#ts device rd_s rd_avkb rd_mb_s rd_mrg rd_cnc rd_rt wr_s wr_avkb wr_mb_s wr_mrg wr_cnc wr_rt busy in_prg io_s qtime stime
12.0 xvdb1 72.1 39.0 2.7 0% 5.6 77.8 101.7 34.6 3.4 0% 3.1 30.8 100% 31 173.8 40.2 5.7
13.0 xvdb1 94.3 41.4 3.8 0% 5.4 57.7 377.4 32.0 11.8 28% 12.4 23.5 97% 106 471.7 24.8 1.6
14.0 xvdb1 272.7 40.4 10.8 1% 4.1 14.9 658.6 26.8 17.3 19% 15.6 19.3 88% 2 931.3 15.5 0.8
@@ -55,7 +54,6 @@ Enter a disk/device pattern: #ts device rd_s rd_avkb rd_mb_s rd_mrg rd_cnc
22.0 xvdb1 234.7 40.5 9.3 0% 2.5 10.7 455.4 9.2 4.1 4% 2.1 4.3 69% 0 690.1 5.5 1.0
23.0 xvdb1 217.1 42.4 9.0 0% 1.8 8.4 218.1 14.0 3.0 11% 1.0 4.0 46% 0 435.1 5.1 1.0
24.0 xvdb1 74.2 41.9 3.0 0% 3.6 49.1 164.4 5.7 0.9 0% 6.0 36.6 77% 35 238.6 68.9 3.2
#ts device rd_s rd_avkb rd_mb_s rd_mrg rd_cnc rd_rt wr_s wr_avkb wr_mb_s wr_mrg wr_cnc wr_rt busy in_prg io_s qtime stime
25.0 xvdb1 114.0 39.9 4.4 0% 6.0 52.5 243.0 23.7 5.6 5% 17.2 67.4 93% 11 357.0 32.4 2.5
26.0 xvdb1 225.5 42.3 9.3 0% 2.1 9.3 329.8 8.5 2.7 6% 1.3 3.6 73% 8 555.3 6.5 1.3
27.0 xvdb1 227.8 42.7 9.5 0% 3.8 16.6 161.9 14.5 2.3 3% 1.1 6.5 53% 0 389.7 7.6 1.3

87
t/pt-diskstats/pt-diskstats.t
View File

@@ -10,8 +10,7 @@ use strict;
use warnings FATAL => 'all';
use English qw(-no_match_vars);
use Test::More;
use File::Temp ();
use File::Temp qw();
use PerconaTest;
require "$trunk/bin/pt-diskstats";
@@ -28,46 +27,45 @@ open STDIN, "<", "/dev/null";
# of this file about *DATA. Please don't close it.
my $called_seek_on_handle = 0;
{
$TestInteractive::first = 1;
sub TestInteractive::TIEHANDLE {
my ($class, @cmds) = @_;
push @cmds, "q";
return bless \@cmds, $class;
}
sub TestInteractive::FILENO {
return fileno(*DATA);
}
sub TestInteractive::READLINE {
my ($self) = @_;
my $cmd = shift @$self;
return unless $cmd;
print $cmd if $cmd =~ /\n/ && !-t STDOUT;
if ($cmd =~ /^TS/) {
if ( $TestInteractive::first ) {
$TestInteractive::first = 0;
}
else {
splice @$self, 1, 0, (undef) x 50;
}
$TestInteractive::first = 1;
sub TestInteractive::TIEHANDLE {
my ($class, @cmds) = @_;
push @cmds, "q";
return bless \@cmds, $class;
}
return $cmd;
}
sub TestInteractive::EOF {
my ($self) = @_;
return @$self ? undef : 1;
}
sub TestInteractive::FILENO {
return fileno(*DATA);
}
sub TestInteractive::CLOSE { 1 }
sub TestInteractive::READLINE {
my ($self) = @_;
my $cmd = shift @$self;
return unless $cmd;
print $cmd if $cmd =~ /\n/ && !-t STDOUT;
if ($cmd =~ /^TS/) {
if ( $TestInteractive::first ) {
$TestInteractive::first = 0;
}
else {
splice @$self, 1, 0, (undef) x 50;
}
}
return $cmd;
}
sub TestInteractive::TELL {}
sub TestInteractive::EOF {
my ($self) = @_;
return @$self ? undef : 1;
}
sub TestInteractive::SEEK {
$called_seek_on_handle++;
}
sub TestInteractive::CLOSE { 1 }
sub TestInteractive::TELL {}
sub TestInteractive::SEEK {
$called_seek_on_handle++;
}
}
sub test_diskstats_file {
@@ -88,6 +86,7 @@ sub test_diskstats_file {
);
die "$file does not exist" unless -f $file;
foreach my $groupby ( qw(all disk sample) ) {
my $expect_file = "${groupby}_int_$args{file}";
ok(
no_diff(
sub {
@@ -99,11 +98,10 @@ sub test_diskstats_file {
'--group-by', $groupby,
$file);
},
"t/pt-diskstats/expected/${groupby}_int_$args{file}",
keep_output=>1,
"t/pt-diskstats/expected/$expect_file",
),
"$args{file} --group-by $groupby, commands: [$print_cmds]"
);
) or diag($expect_file, $test_diff);
}
}
@@ -140,7 +138,10 @@ test_diskstats_file(
# --save-samples and --iterations
# ###########################################################################
my ($fh, $tempfile) = File::Temp::tempfile( "pt-diskstats.test.$PID.XXXXXX", OPEN => 0);
my (undef, $tempfile) = File::Temp::tempfile(
"/tmp/pt-diskstats.test.XXXXXX",
OPEN => 0,
);
my $iterations = 2;
my $out = output( sub {
@@ -155,19 +156,17 @@ my $out = output( sub {
open my $samples_fh, "<", $tempfile
or die "Cannot open $tempfile: $OS_ERROR";
my $count;
while (my $line = <$samples_fh>) {
$count++ if $line =~ /^TS/;
}
close $samples_fh or diag($EVAL_ERROR);
unlink $tempfile or diag($EVAL_ERROR);
ok(
($count == $iterations) || ($count == $iterations+1),
"--save-samples and --iterations work"
);
1 while unlink $tempfile;
# ###########################################################################
# Done.
# ###########################################################################