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

Combine and change all pt-diskstats test to new format. Use generic .t for bash tools. Number tests in each test file and use as default test name.

Browse Source
This commit is contained in:
Daniel Nichter
2011-08-18 09:02:46 -06:00
parent 918c4c4bb2
commit b21578a86f
18 changed files with 203 additions and 162 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
bin/pt-diskstats
View File

@@ -284,10 +284,10 @@ design_print_formats() {
# last sample. # last sample.
group_by_disk () { group_by_disk () {
[ -z "${awk_print_line}" ] && design_print_formats [ -z "${awk_print_line}" ] && design_print_formats
cat > /tmp/percona-toolkit.awk <<EOF awk "
BEGIN { BEGIN {
devs = 0; devs = 0;
devname = "${OPT_d}"; devname = \"${OPT_d}\";
} }
\$1 !~ /TS/ && \$3 ~ devname { \$1 !~ /TS/ && \$3 ~ devname {
${awk_parse_line} ${awk_parse_line}
@@ -303,7 +303,7 @@ group_by_disk () {
} }
${awk_find_max_device_name_length} ${awk_find_max_device_name_length}
${awk_print_header} ${awk_print_header}
elapsed = curr_ts - first["ts"]; elapsed = curr_ts - first[\"ts\"];
for ( i = 1; i <= devs; i++ ) { for ( i = 1; i <= devs; i++ ) {
dev = devsort[i]; dev = devsort[i];
${awk_get_overall_increments} ${awk_get_overall_increments}
@@ -312,21 +312,19 @@ group_by_disk () {
t_in_progress = (tot_in_progress / (iterations - 1)); t_in_progress = (tot_in_progress / (iterations - 1));
devs_in_group = 1; devs_in_group = 1;
${awk_compute_read_write_stats} ${awk_compute_read_write_stats}
line_ts="{" (iterations - 1) "}"; line_ts=\"{\" (iterations - 1) \"}\";
${awk_print_line} ${awk_print_line}
} }
} } " "$@"
EOF
awk -f /tmp/percona-toolkit.awk "$@"
} }
# Prints out one line for each sample, summing up all disks together. # Prints out one line for each sample, summing up all disks together.
group_by_sample() { group_by_sample() {
[ -z "${awk_print_line}" ] && design_print_formats [ -z "${awk_print_line}" ] && design_print_formats
cat > /tmp/percona-toolkit.awk <<EOF awk "
BEGIN { BEGIN {
devs = 0; devs = 0;
devname = "${OPT_d}"; devname = \"${OPT_d}\";
} }
\$1 !~ /TS/ && \$3 ~ devname { \$1 !~ /TS/ && \$3 ~ devname {
${awk_parse_line} ${awk_parse_line}
@@ -368,7 +366,7 @@ group_by_sample() {
devs_in_group = devs; devs_in_group = devs;
${awk_compute_read_write_stats} ${awk_compute_read_write_stats}
if ( devs > 1 ) { if ( devs > 1 ) {
dev = "{" devs "}"; dev = \"{\" devs \"}\";
} }
else { else {
dev = devsort[1]; dev = devsort[1];
@@ -377,14 +375,12 @@ group_by_sample() {
printed_a_line = 1; printed_a_line = 1;
} }
if ( iterations == 1 || printed_a_line == 1 ) { if ( iterations == 1 || printed_a_line == 1 ) {
# We don't save "curr" as "prev" on every sample we see, because if the # We don't save curr as prev on every sample we see, because if the
# interval of printing is more than one sample, we want "prev" to be # interval of printing is more than one sample, we want prev to be
# the first sample in the interval, not the previous sample seen. # the first sample in the interval, not the previous sample seen.
${awk_save_curr_as_prev} ${awk_save_curr_as_prev}
} }
} } " "$@"
EOF
awk -f /tmp/percona-toolkit.awk "$@"
} }
# Prints out one line for each sample, for each disk that matches the pattern. # Prints out one line for each sample, for each disk that matches the pattern.

14
t/pt-diskstats/group-by-disk-01
View File

@@ -1,14 +0,0 @@
#!/bin/bash
#group_by_disk samples/diskstats-001.txt
cat <<EOF > $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
{4} ram0 0.0 0.0 0.0 0% 0.0 0.0 0.0 0.0 0.0 0% 0.0 0.0 0% 0
{4} cciss/c0d0 0.0 0.0 0.0 0% 0.0 0.0 17.7 56.2 0.5 86% 0.0 0.6 0% 0
{4} cciss/c0d0p1 0.0 0.0 0.0 0% 0.0 0.0 0.0 0.0 0.0 0% 0.0 0.0 0% 0
{4} cciss/c0d0p2 0.0 0.0 0.0 0% 0.0 0.0 17.7 56.2 0.5 86% 0.0 0.6 0% 0
{4} cciss/c0d1 458.1 43.0 9.6 0% 11.5 25.1 985.0 48.4 23.3 0% 0.1 0.1 102% 0
{4} cciss/c1d0 0.0 0.0 0.0 0% 0.0 0.0 0.0 0.0 0.0 0% 0.0 0.0 0% 0
{4} dm-0 0.0 0.0 0.0 0% 0.0 0.0 99.3 8.0 0.4 0% 0.1 0.7 0% 0
{4} md0 0.0 0.0 0.0 0% 0.0 0.0 0.0 0.0 0.0 0% 0.0 0.0 0% 0
EOF

8
t/pt-diskstats/group-by-disk-02
View File

@@ -1,8 +0,0 @@
#!/bin/bash
#group_by_disk samples/diskstats-005.txt
cat <<EOF > $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
{5} sda3 1394.1 32.0 21.8 1% 0.5 0.4 98.8 62.8 3.0 48% 0.0 0.3 41% 0
{5} sda4 1394.1 32.0 21.8 1% 0.5 0.4 98.8 62.8 3.0 48% 0.0 0.3 41% 0
EOF

13
t/pt-diskstats/group-by-disk-03
View File

@@ -1,13 +0,0 @@
#!/bin/bash
#group_by_disk /tmp/aspersa
cat <<EOF > $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
{5} sda3 1394.1 32.0 21.8 1% 0.5 0.4 98.8 62.8 3.0 48% 0.0 0.3 41% 0
{5} sda4 1394.1 32.0 21.8 1% 0.5 0.4 98.8 62.8 3.0 48% 0.0 0.3 41% 0
EOF
cat > $2 <<EOF
TS 1298130002.073935000
EOF
cat >>$2 samples/diskstats-005.txt

11
t/pt-diskstats/group-by-disk-04
View File

@@ -1,11 +0,0 @@
#!/bin/bash
#group_by_disk /tmp/aspersa
cat <<EOF > $1
EOF
cat <<EOF > $2
TS 1297205887.156653000
1 0 ram0 0 0 0 0 0 0 0 0 0 0 0
TS 1297205888.161613000
EOF

14
t/pt-diskstats/group-by-disk-05
View File

@@ -1,14 +0,0 @@
#!/bin/bash
#group_by_disk /tmp/aspersa
cat <<EOF > $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
{1} ram0 1.0 1.0 0.0 50% 0.0 1.0 1.0 1.0 0.0 50% 0.0 1.0 0% 0
EOF
cat <<EOF > $2
1 0 ram0 0 0 0 0 0 0 0 0 0 0 0
TS 1297205887.156653000
1 0 ram0 1 1 1 1 1 1 1 1 1 1 1
TS 1297205888.161613000
EOF

10
t/pt-diskstats/group-by-sample-01
View File

@@ -1,10 +0,0 @@
#!/bin/bash
#group_by_sample samples/diskstats-001.txt
cat <<EOF > $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
2.0 {8} 466.5 44.6 10.2 0% 1.4 23.9 1184.0 42.6 24.6 18% 0.0 0.2 12% 18
4.0 {8} 373.0 47.2 8.6 0% 1.3 27.4 592.0 45.6 13.2 16% 0.0 0.1 11% 17
5.0 {8} 848.0 42.6 17.7 0% 2.7 25.5 1987.0 49.8 48.3 3% 0.0 0.1 22% 9
7.0 {8} 340.0 36.6 6.1 0% 1.0 23.8 1149.5 43.4 24.3 23% 0.0 0.2 11% 5
EOF

34
t/pt-diskstats/group-by-sample-02
View File

@@ -1,34 +0,0 @@
#!/bin/bash
#group_by_sample /tmp/aspersa
cat <<EOF > $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
1.0 sda3 1406.0 32.0 21.9 1% 0.6 0.4 46.3 61.1 1.4 67% 0.0 0.3 41% 0
2.0 sda3 1580.1 31.9 24.6 1% 0.6 0.4 163.7 62.2 5.0 36% 0.1 0.3 46% 1
3.0 sda3 1296.7 32.0 20.2 1% 0.5 0.4 51.3 50.5 1.3 62% 0.0 0.3 42% 1
4.1 sda3 1429.7 32.0 22.3 1% 0.5 0.3 73.9 61.0 2.2 57% 0.0 0.3 40% 0
5.1 sda3 1258.1 32.0 19.6 1% 0.4 0.3 158.7 68.8 5.3 36% 0.1 0.4 37% 0
EOF
cat > $2 <<EOF
8 3 sda3 4257315954 34043324 136169413346 1922644483 492348396 547079617 32764474048 248191881 0 1348454960 2169768832
TS 1298130003.073935000
8 3 sda3 4257317380 34043342 136169458914 1922645044 492348443 547079711 32764476920 248191896 0 1348455373 2169769408
TS 1298130004.088149000
8 3 sda3 4257318982 34043364 136169510082 1922645662 492348609 547079803 32764487248 248191947 1 1348455841 2169770075
TS 1298130005.102035000
8 3 sda3 4257320297 34043384 136169552098 1922646173 492348661 547079889 32764489872 248191964 1 1348456262 2169770603
TS 1298130006.116158000
8 3 sda3 4257321748 34043394 136169598530 1922646672 492348736 547079990 32764494448 248191983 0 1348456671 2169771121
TS 1298130007.131062000
8 3 sda3 4257323024 34043406 136169639330 1922647105 492348897 547080080 32764505520 248192043 0 1348457045 2169771613
TS 1298130008.145277000
EOF
# The below is incremental samples of the data and timestamps:
# TS_diff reads reads_mrg read_sectors ms_reading writes write_mrg wrt_sectors ms_wrting i ms_ding_io ms_weightd
# 1.14214000 1426 18 45568 561 47 94 2872 15 0 413 576
# 1.13886000 1602 22 51168 618 166 92 10328 51 1 468 667
# 1.14123000 1315 20 42016 511 52 86 2624 17 1 421 528
# 1.14904000 1451 10 46432 499 75 101 4576 19 0 409 518
# 1.14215000 1276 12 40800 433 161 90 11072 60 0 374 492

11
t/pt-diskstats/group-by-sample-03
View File

@@ -1,11 +0,0 @@
#!/bin/bash
#group_by_sample samples/diskstats-005.txt
cat <<EOF > $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
1.0 {2} 2812.0 32.0 43.9 1% 0.6 0.4 92.7 61.1 2.8 67% 0.0 0.3 41% 0
2.0 {2} 3160.1 31.9 49.3 1% 0.6 0.4 327.5 62.2 9.9 36% 0.1 0.3 46% 2
3.0 {2} 2593.4 32.0 40.5 1% 0.5 0.4 102.6 50.5 2.5 62% 0.0 0.3 42% 2
4.1 {2} 2859.4 32.0 44.7 1% 0.5 0.3 147.8 61.0 4.4 57% 0.0 0.3 40% 0
5.1 {2} 2516.2 32.0 39.3 1% 0.4 0.3 317.5 68.8 10.7 36% 0.1 0.4 37% 0
EOF

16
t/pt-diskstats/group-by-sample-04
View File

@@ -1,16 +0,0 @@
#!/bin/bash
#group_by_sample /tmp/aspersa
cat <<EOF > $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
1.0 {2} 2812.0 32.0 43.9 1% 0.6 0.4 92.7 61.1 2.8 67% 0.0 0.3 41% 0
2.0 {2} 3160.1 31.9 49.3 1% 0.6 0.4 327.5 62.2 9.9 36% 0.1 0.3 46% 2
3.0 {2} 2593.4 32.0 40.5 1% 0.5 0.4 102.6 50.5 2.5 62% 0.0 0.3 42% 2
4.1 {2} 2859.4 32.0 44.7 1% 0.5 0.3 147.8 61.0 4.4 57% 0.0 0.3 40% 0
5.1 {2} 2516.2 32.0 39.3 1% 0.4 0.3 317.5 68.8 10.7 36% 0.1 0.4 37% 0
EOF
cat > $2 <<EOF
TS 1298130002.073935000
EOF
cat >>$2 samples/diskstats-005.txt

10
t/pt-diskstats/group-by-all-01 → t/pt-diskstats/group_by_all.sh Executable file → Normal file
View File

@@ -1,7 +1,10 @@
#!/bin/bash #!/bin/bash
#group_by_all samples/diskstats-001.txt
cat <<EOF > $1 # This test file must be ran by util/test-bash-functions.
TESTS=1
cat <<EOF > $TMPDIR/expected
#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 #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
2.0 ram0 0.0 0.0 0.0 0% 0.0 0.0 0.0 0.0 0.0 0% 0.0 0.0 0% 0 2.0 ram0 0.0 0.0 0.0 0% 0.0 0.0 0.0 0.0 0.0 0% 0.0 0.0 0% 0
2.0 cciss/c0d0 0.0 0.0 0.0 0% 0.0 0.0 23.0 53.2 0.6 85% 0.0 0.9 0% 0 2.0 cciss/c0d0 0.0 0.0 0.0 0% 0.0 0.0 23.0 53.2 0.6 85% 0.0 0.9 0% 0
@@ -39,3 +42,6 @@ cat <<EOF > $1
7.0 dm-0 0.0 0.0 0.0 0% 0.0 0.0 194.5 8.0 0.8 0% 0.1 0.6 0% 0 7.0 dm-0 0.0 0.0 0.0 0% 0.0 0.0 194.5 8.0 0.8 0% 0.1 0.6 0% 0
7.0 md0 0.0 0.0 0.0 0% 0.0 0.0 0.0 0.0 0.0 0% 0.0 0.0 0% 0 7.0 md0 0.0 0.0 0.0 0% 0.0 0.0 0.0 0.0 0.0 0% 0.0 0.0 0% 0
EOF EOF
group_by_all "samples/diskstats-001.txt" > $TMPDIR/got
no_diff $TMPDIR/got $TMPDIR/expected

74
t/pt-diskstats/group_by_disk.sh Normal file
View File

@@ -0,0 +1,74 @@
#!/bin/bash
# This test file must be ran by util/test-bash-functions.
TESTS=5
TEST_NAME="diskstats-001.txt"
cat <<EOF > $TMPDIR/expected
#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
{4} ram0 0.0 0.0 0.0 0% 0.0 0.0 0.0 0.0 0.0 0% 0.0 0.0 0% 0
{4} cciss/c0d0 0.0 0.0 0.0 0% 0.0 0.0 17.7 56.2 0.5 86% 0.0 0.6 0% 0
{4} cciss/c0d0p1 0.0 0.0 0.0 0% 0.0 0.0 0.0 0.0 0.0 0% 0.0 0.0 0% 0
{4} cciss/c0d0p2 0.0 0.0 0.0 0% 0.0 0.0 17.7 56.2 0.5 86% 0.0 0.6 0% 0
{4} cciss/c0d1 458.1 43.0 9.6 0% 11.5 25.1 985.0 48.4 23.3 0% 0.1 0.1 102% 0
{4} cciss/c1d0 0.0 0.0 0.0 0% 0.0 0.0 0.0 0.0 0.0 0% 0.0 0.0 0% 0
{4} dm-0 0.0 0.0 0.0 0% 0.0 0.0 99.3 8.0 0.4 0% 0.1 0.7 0% 0
{4} md0 0.0 0.0 0.0 0% 0.0 0.0 0.0 0.0 0.0 0% 0.0 0.0 0% 0
EOF
group_by_disk samples/diskstats-001.txt > $TMPDIR/got
no_diff $TMPDIR/got $TMPDIR/expected
TEST_NAME="diskstats-005.txt"
cat <<EOF > $TMPDIR/expected
#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
{5} sda3 1394.1 32.0 21.8 1% 0.5 0.4 98.8 62.8 3.0 48% 0.0 0.3 41% 0
{5} sda4 1394.1 32.0 21.8 1% 0.5 0.4 98.8 62.8 3.0 48% 0.0 0.3 41% 0
EOF
group_by_disk samples/diskstats-005.txt > $TMPDIR/got
no_diff $TMPDIR/got $TMPDIR/expected
TEST_NAME="diskstats-005.txt with TS"
cat <<EOF > $TMPDIR/expected
#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
{5} sda3 1394.1 32.0 21.8 1% 0.5 0.4 98.8 62.8 3.0 48% 0.0 0.3 41% 0
{5} sda4 1394.1 32.0 21.8 1% 0.5 0.4 98.8 62.8 3.0 48% 0.0 0.3 41% 0
EOF
cat > $TMPDIR/in <<EOF
TS 1298130002.073935000
EOF
cat samples/diskstats-005.txt >> $TMPDIR/in
group_by_disk $TMPDIR/in > $TMPDIR/got
no_diff $TMPDIR/got $TMPDIR/expected
TEST_NAME="no output"
cat <<EOF > $TMPDIR/expected
EOF
cat <<EOF > $TMPDIR/in
TS 1297205887.156653000
1 0 ram0 0 0 0 0 0 0 0 0 0 0 0
TS 1297205888.161613000
EOF
group_by_disk $TMPDIR/in > $TMPDIR/got
no_diff $TMPDIR/got $TMPDIR/expected
TEST_NAME="timestamps"
cat <<EOF > $TMPDIR/expected
#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
{1} ram0 1.0 1.0 0.0 50% 0.0 1.0 1.0 1.0 0.0 50% 0.0 1.0 0% 0
EOF
cat <<EOF > $TMPDIR/in
1 0 ram0 0 0 0 0 0 0 0 0 0 0 0
TS 1297205887.156653000
1 0 ram0 1 1 1 1 1 1 1 1 1 1 1
TS 1297205888.161613000
EOF
group_by_disk $TMPDIR/in > $TMPDIR/got
no_diff $TMPDIR/got $TMPDIR/expected

84
t/pt-diskstats/group_by_sample.sh Normal file
View File

@@ -0,0 +1,84 @@
#!/usr/bin/env bash
# This test file must be ran by util/test-bash-functions.
TESTS=4
TEST_NAME="diskstats-001.txt"
cat <<EOF > $TMPDIR/expected
#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
2.0 {8} 466.5 44.6 10.2 0% 1.4 23.9 1184.0 42.6 24.6 18% 0.0 0.2 12% 18
4.0 {8} 373.0 47.2 8.6 0% 1.3 27.4 592.0 45.6 13.2 16% 0.0 0.1 11% 17
5.0 {8} 848.0 42.6 17.7 0% 2.7 25.5 1987.0 49.8 48.3 3% 0.0 0.1 22% 9
7.0 {8} 340.0 36.6 6.1 0% 1.0 23.8 1149.5 43.4 24.3 23% 0.0 0.2 11% 5
EOF
group_by_sample samples/diskstats-001.txt > $TMPDIR/got
no_diff $TMPDIR/got $TMPDIR/expected
TEST_NAME="input 1"
cat <<EOF > $TMPDIR/expected
#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
1.0 sda3 1406.0 32.0 21.9 1% 0.6 0.4 46.3 61.1 1.4 67% 0.0 0.3 41% 0
2.0 sda3 1580.1 31.9 24.6 1% 0.6 0.4 163.7 62.2 5.0 36% 0.1 0.3 46% 1
3.0 sda3 1296.7 32.0 20.2 1% 0.5 0.4 51.3 50.5 1.3 62% 0.0 0.3 42% 1
4.1 sda3 1429.7 32.0 22.3 1% 0.5 0.3 73.9 61.0 2.2 57% 0.0 0.3 40% 0
5.1 sda3 1258.1 32.0 19.6 1% 0.4 0.3 158.7 68.8 5.3 36% 0.1 0.4 37% 0
EOF
cat > $TMPDIR/in <<EOF
8 3 sda3 4257315954 34043324 136169413346 1922644483 492348396 547079617 32764474048 248191881 0 1348454960 2169768832
TS 1298130003.073935000
8 3 sda3 4257317380 34043342 136169458914 1922645044 492348443 547079711 32764476920 248191896 0 1348455373 2169769408
TS 1298130004.088149000
8 3 sda3 4257318982 34043364 136169510082 1922645662 492348609 547079803 32764487248 248191947 1 1348455841 2169770075
TS 1298130005.102035000
8 3 sda3 4257320297 34043384 136169552098 1922646173 492348661 547079889 32764489872 248191964 1 1348456262 2169770603
TS 1298130006.116158000
8 3 sda3 4257321748 34043394 136169598530 1922646672 492348736 547079990 32764494448 248191983 0 1348456671 2169771121
TS 1298130007.131062000
8 3 sda3 4257323024 34043406 136169639330 1922647105 492348897 547080080 32764505520 248192043 0 1348457045 2169771613
TS 1298130008.145277000
EOF
group_by_sample $TMPDIR/in > $TMPDIR/got
no_diff $TMPDIR/got $TMPDIR/expected
# The below is incremental samples of the data and timestamps:
# TS_diff reads reads_mrg read_sectors ms_reading writes write_mrg wrt_sectors ms_wrting i ms_ding_io ms_weightd
# 1.14214000 1426 18 45568 561 47 94 2872 15 0 413 576
# 1.13886000 1602 22 51168 618 166 92 10328 51 1 468 667
# 1.14123000 1315 20 42016 511 52 86 2624 17 1 421 528
# 1.14904000 1451 10 46432 499 75 101 4576 19 0 409 518
# 1.14215000 1276 12 40800 433 161 90 11072 60 0 374 492
TEST_NAME="diskstats-005.txt"
cat <<EOF > $TMPDIR/expected
#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
1.0 {2} 2812.0 32.0 43.9 1% 0.6 0.4 92.7 61.1 2.8 67% 0.0 0.3 41% 0
2.0 {2} 3160.1 31.9 49.3 1% 0.6 0.4 327.5 62.2 9.9 36% 0.1 0.3 46% 2
3.0 {2} 2593.4 32.0 40.5 1% 0.5 0.4 102.6 50.5 2.5 62% 0.0 0.3 42% 2
4.1 {2} 2859.4 32.0 44.7 1% 0.5 0.3 147.8 61.0 4.4 57% 0.0 0.3 40% 0
5.1 {2} 2516.2 32.0 39.3 1% 0.4 0.3 317.5 68.8 10.7 36% 0.1 0.4 37% 0
EOF
group_by_sample samples/diskstats-005.txt > $TMPDIR/got
no_diff $TMPDIR/got $TMPDIR/expected
TEST_NAME="ts line"
cat <<EOF > $TMPDIR/expected
#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
1.0 {2} 2812.0 32.0 43.9 1% 0.6 0.4 92.7 61.1 2.8 67% 0.0 0.3 41% 0
2.0 {2} 3160.1 31.9 49.3 1% 0.6 0.4 327.5 62.2 9.9 36% 0.1 0.3 46% 2
3.0 {2} 2593.4 32.0 40.5 1% 0.5 0.4 102.6 50.5 2.5 62% 0.0 0.3 42% 2
4.1 {2} 2859.4 32.0 44.7 1% 0.5 0.3 147.8 61.0 4.4 57% 0.0 0.3 40% 0
5.1 {2} 2516.2 32.0 39.3 1% 0.4 0.3 317.5 68.8 10.7 36% 0.1 0.4 37% 0
EOF
cat > $TMPDIR/in <<EOF
TS 1298130002.073935000
EOF
cat samples/diskstats-005.txt >> $TMPDIR/in
group_by_sample $TMPDIR/in > $TMPDIR/got
no_diff $TMPDIR/got $TMPDIR/expected

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

@@ -1,4 +1,4 @@
#!/usr/bin/evn perl #!/usr/bin/env perl
BEGIN { BEGIN {
die "The PERCONA_TOOLKIT_BRANCH environment variable is not set.\n" die "The PERCONA_TOOLKIT_BRANCH environment variable is not set.\n"
@@ -12,6 +12,8 @@ use English qw(-no_match_vars);
use PerconaTest; use PerconaTest;
system("$trunk/util/test-bash-tool pt-diskstats @ARGV"); my ($tool) = $PROGRAM_NAME =~ m/([\w-]+)\.t$/;
push @ARGV, "$trunk/t/$tool/*.sh" unless @ARGV;
system("$trunk/util/test-bash-functions $trunk/bin/$tool @ARGV");
exit; exit;

6
t/pt-mysql-summary/pt-mysql-summary.t
View File

@@ -1,4 +1,4 @@
#!/usr/bin/evn perl #!/usr/bin/env perl
BEGIN { BEGIN {
die "The PERCONA_TOOLKIT_BRANCH environment variable is not set.\n" die "The PERCONA_TOOLKIT_BRANCH environment variable is not set.\n"
@@ -12,6 +12,8 @@ use English qw(-no_match_vars);
use PerconaTest; use PerconaTest;
system("$trunk/util/test-bash-tool pt-mysql-summary @ARGV"); my ($tool) = $PROGRAM_NAME =~ m/([\w-]+)\.t$/;
push @ARGV, "$trunk/t/$tool/*.sh" unless @ARGV;
system("$trunk/util/test-bash-functions $trunk/bin/$tool @ARGV");
exit; exit;

6
t/pt-pmp/pt-pmp.t
View File

@@ -1,4 +1,4 @@
#!/usr/bin/evn perl #!/usr/bin/env perl
BEGIN { BEGIN {
die "The PERCONA_TOOLKIT_BRANCH environment variable is not set.\n" die "The PERCONA_TOOLKIT_BRANCH environment variable is not set.\n"
@@ -12,6 +12,8 @@ use English qw(-no_match_vars);
use PerconaTest; use PerconaTest;
system("$trunk/util/test-bash-tool pt-pmp @ARGV"); my ($tool) = $PROGRAM_NAME =~ m/([\w-]+)\.t$/;
push @ARGV, "$trunk/t/$tool/*.sh" unless @ARGV;
system("$trunk/util/test-bash-functions $trunk/bin/$tool @ARGV");
exit; exit;

6
t/pt-summary/pt-summary.t
View File

@@ -1,4 +1,4 @@
#!/usr/bin/evn perl #!/usr/bin/env perl
BEGIN { BEGIN {
die "The PERCONA_TOOLKIT_BRANCH environment variable is not set.\n" die "The PERCONA_TOOLKIT_BRANCH environment variable is not set.\n"
@@ -12,6 +12,8 @@ use English qw(-no_match_vars);
use PerconaTest; use PerconaTest;
system("$trunk/util/test-bash-functions pt-summary @ARGV"); my ($tool) = $PROGRAM_NAME =~ m/([\w-]+)\.t$/;
push @ARGV, "$trunk/t/$tool/*.sh" unless @ARGV;
system("$trunk/util/test-bash-functions $trunk/bin/$tool @ARGV");
exit; exit;

16
util/test-bash-functions
View File

@@ -7,6 +7,7 @@
# ############################################################################ # ############################################################################
# Standard startup, find the branch's root directory # Standard startup, find the branch's root directory
# ############################################################################ # ############################################################################
LANG='en_US.UTF-8'
die() { die() {
echo $1 >&2 echo $1 >&2
@@ -70,6 +71,8 @@ run_test() {
local t=$1 # test file name, e.g. "group-by-all-01" for pt-diskstats local t=$1 # test file name, e.g. "group-by-all-01" for pt-diskstats
rm -rf $TMPDIR/* >/dev/null 2>&1 rm -rf $TMPDIR/* >/dev/null 2>&1
TEST_NUMBER=1 # test number in this test file
# Tests assume that they're being ran from their own dir, so they access # Tests assume that they're being ran from their own dir, so they access
# sample files like "samples/foo.txt". So cd to the dir of the test file # sample files like "samples/foo.txt". So cd to the dir of the test file
# and run it. But the test file may have been given as a relative path, # and run it. But the test file may have been given as a relative path,
@@ -77,9 +80,9 @@ run_test() {
# other test files are in other dirs. # other test files are in other dirs.
cwd="$PWD" cwd="$PWD"
local t_dir=$(dirname $t) local t_dir=$(dirname $t)
local t_file=$(basename $t) TEST_FILE=$(basename $t)
cd $t_dir cd $t_dir
source $t_file source $TEST_FILE
cd $cwd cd $cwd
return $? return $?
@@ -88,16 +91,17 @@ run_test() {
# Print a TAP-style test result. # Print a TAP-style test result.
result() { result() {
local result=$1 local result=$1
local test_name=${TEST_NAME:-"$t"} local test_name=${TEST_NAME:-"$TEST_NUMBER"}
if [ $result -eq 0 ]; then if [ $result -eq 0 ]; then
echo "ok $testno - $test_name" echo "ok $testno - $TEST_FILE $test_name"
else else
echo "not ok $testno - $test_name" echo "not ok $testno - $TEST_FILE $test_name"
failed_tests=$(( failed_tests + 1)) failed_tests=$(( failed_tests + 1))
echo "# Failed '$test_command'" >&2 echo "# Failed '$test_command'" >&2
cat $TMPDIR/failed_result | sed -e 's/^/# /' -e '30q' >&2 cat $TMPDIR/failed_result | sed -e 's/^/# /' -e '30q' >&2
fi fi
testno=$(( testno + 1)) testno=$((testno + 1))
TEST_NUMBER=$((TEST_NUMBER + 1))
return $result return $result
} }