From: Sebastien GODARD Date: Fri, 24 Jul 2020 14:12:40 +0000 (+0200) Subject: Add new non regression tests on big minor numbers X-Git-Tag: v12.4.0~20 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=071314d055121e1f4fc6ff1639dda52ab2274085;p=sysstat Add new non regression tests on big minor numbers Add new xvd* devices in sysstat environment tests. One of them (xvdq) has a minor number value of 4096. Signed-off-by: Sebastien GODARD --- diff --git a/tests/expected.data-ini b/tests/expected.data-ini index 630fd59..ee424be 100644 --- a/tests/expected.data-ini +++ b/tests/expected.data-ini @@ -3968,8 +3968,8 @@ Average: 0.00 0.00 Average: 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 13:54:15 tps rtps wtps bread/s bwrtn/s -13:54:35 32404.56 320.82 32082.13 0.00 0.00 -Average: 32404.56 320.82 32082.13 0.00 0.00 +13:54:35 32405.20 321.46 32082.13 64.16 0.00 +Average: 32405.20 321.46 32082.13 64.16 0.00 13:54:15 kbmemfree kbavail kbmemused %memused kbbuffers kbcached kbcommit %commit kbactive kbinact kbdirty kbanonpg kbslab kbkstack kbpgtbl kbvmused 13:54:35 1437740 4389516 3179712 39.04 260172 2821596 12097852 48.54 4042384 1772396 396 2733164 445740 15328 73760 0 @@ -4011,6 +4011,8 @@ Average: 1 0.00 0.00 0.00 0.00 0.00 0.0 13:54:35 dev104-0 32402.95 0.00 0.00 0.00 0.00 0.10 0.00 0.00 13:54:35 dev104-1 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 13:54:35 dev104-2 32402.95 0.00 0.00 0.00 0.00 0.10 0.00 0.00 +13:54:35 dev202-240 0.32 16.04 0.00 50.00 0.00 1.00 1.00 0.03 +13:54:35 dev202-4096 0.32 16.04 0.00 50.00 0.00 1.00 1.00 0.03 Average: dev8-0 1.60 0.00 0.00 0.00 0.00 0.00 0.00 0.00 Average: dev8-1 1.60 0.00 0.00 0.00 0.00 0.00 0.00 0.00 Average: dev8-2 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 @@ -4024,6 +4026,8 @@ Average: dev8-9 0.00 0.00 0.00 0.00 0.00 0.0 Average: dev104-0 32402.95 0.00 0.00 0.00 0.00 0.10 0.00 0.00 Average: dev104-1 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 Average: dev104-2 32402.95 0.00 0.00 0.00 0.00 0.10 0.00 0.00 +Average: dev202-240 0.32 16.04 0.00 50.00 0.00 1.00 1.00 0.03 +Average: dev202-4096 0.32 16.04 0.00 50.00 0.00 1.00 1.00 0.03 13:54:15 IFACE rxpck/s txpck/s rxkB/s txkB/s rxcmp/s txcmp/s rxmcst/s %ifutil 13:54:35 lo 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 diff --git a/tests/expected.iostat-sigint b/tests/expected.iostat-sigint index 37601fb..04eebca 100644 --- a/tests/expected.iostat-sigint +++ b/tests/expected.iostat-sigint @@ -49,6 +49,8 @@ avg-cpu: %user %nice %system %iowait %steal %idle Device tps kB_read/s kB_wrtn/s kB_dscd/s kB_read kB_wrtn kB_dscd cciss/c0d0 0.00 0.00 0.00 0.00 0 0 0 sda 0.00 0.00 0.00 0.00 0 0 50 +xvdp 0.00 0.00 0.00 0.00 1548 0 0 +xvdiw 0.00 0.00 0.00 0.00 1048 0 0 avg-cpu: %user %nice %system %iowait %steal %idle @@ -57,5 +59,7 @@ avg-cpu: %user %nice %system %iowait %steal %idle Device tps kB_read/s kB_wrtn/s kB_dscd/s kB_read kB_wrtn kB_dscd cciss/c0d0 32402.95 0.00 0.00 0.00 0 0 0 sda 1.60 0.00 0.00 0.80 0 0 25 +xvdp 0.32 16.04 0.00 0.00 500 0 0 +xvdiw 0.32 16.04 0.00 0.00 500 0 0 diff --git a/tests/expected.iostat-x-ALL-p-ALL b/tests/expected.iostat-x-ALL-p-ALL index 462ec32..0de0962 100644 --- a/tests/expected.iostat-x-ALL-p-ALL +++ b/tests/expected.iostat-x-ALL-p-ALL @@ -127,6 +127,8 @@ sdd 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0. cciss/c0d0 0.00 0.00 0.00 29.81 4.56 0.00 0.00 0.00 0.00 76.30 3.72 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 cciss/c0d0p1 0.00 0.00 0.00 47.25 10.91 0.00 0.00 0.00 0.00 99.12 158.54 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 cciss/c0d0p2 0.00 0.00 0.00 25.00 3.33 0.00 0.00 0.00 0.00 66.67 2.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 +xvdp 0.00 0.00 0.00 0.00 1.00 18.88 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 +xvdiw 0.00 0.00 0.00 0.00 0.60 20.15 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 Device r/s rkB/s rrqm/s %rrqm r_await rareq-sz w/s wkB/s wrqm/s %wrqm w_await wareq-sz d/s dkB/s drqm/s %drqm d_await dareq-sz f/s f_await aqu-sz %util @@ -148,5 +150,7 @@ sdd 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0. cciss/c0d0 320.82 0.00 320.82 50.00 10.00 0.00 32082.13 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 cciss/c0d0p1 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 cciss/c0d0p2 320.82 0.00 320.82 50.00 10.00 0.00 32082.13 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 +xvdp 0.32 16.04 0.00 0.00 1.00 50.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.03 +xvdiw 0.32 16.04 0.00 0.00 1.00 50.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.03 diff --git a/tests/expected.sadf-d b/tests/expected.sadf-d index a3f6a42..0c6247f 100644 --- a/tests/expected.sadf-d +++ b/tests/expected.sadf-d @@ -2858,7 +2858,7 @@ SYSSTAT.TEST;31;2019-04-18 13:54:35 UTC;0.00;0.00 # hostname;interval;timestamp;pgpgin/s;pgpgout/s;fault/s;majflt/s;pgfree/s;pgscank/s;pgscand/s;pgsteal/s;%vmeff SYSSTAT.TEST;31;2019-04-18 13:54:35 UTC;0.00;0.00;0.00;0.00;0.00;0.00;0.00;0.00;0.00 # hostname;interval;timestamp;tps;rtps;wtps;dtps;bread/s;bwrtn/s;bdscd/s -SYSSTAT.TEST;31;2019-04-18 13:54:35 UTC;32404.56;320.82;32082.13;1.60;0.00;0.00;1.60 +SYSSTAT.TEST;31;2019-04-18 13:54:35 UTC;32405.20;321.46;32082.13;1.60;64.16;0.00;1.60 # hostname;interval;timestamp;kbmemfree;kbavail;kbmemused;%memused;kbbuffers;kbcached;kbcommit;%commit;kbactive;kbinact;kbdirty;kbanonpg;kbslab;kbkstack;kbpgtbl;kbvmused SYSSTAT.TEST;31;2019-04-18 13:54:35 UTC;1437740;4389516;3179712;39.04;260172;2821596;12097852;48.54;4042384;1772396;396;2733164;445740;15328;73760;0 # hostname;interval;timestamp;kbswpfree;kbswpused;%swpused;kbswpcad;%swpcad @@ -2886,6 +2886,8 @@ SYSSTAT.TEST;31;2019-04-18 13:54:35 UTC;dev8-9;0.00;0.00;0.00;0.00;0.00;0.00;0.0 SYSSTAT.TEST;31;2019-04-18 13:54:35 UTC;dev104-0;32402.95;0.00;0.00;0.00;0.00;0.00;0.10;0.00 SYSSTAT.TEST;31;2019-04-18 13:54:35 UTC;dev104-1;0.00;0.00;0.00;0.00;0.00;0.00;0.00;0.00 SYSSTAT.TEST;31;2019-04-18 13:54:35 UTC;dev104-2;32402.95;0.00;0.00;0.00;0.00;0.00;0.10;0.00 +SYSSTAT.TEST;31;2019-04-18 13:54:35 UTC;dev202-240;0.32;16.04;0.00;0.00;50.00;0.00;1.00;0.03 +SYSSTAT.TEST;31;2019-04-18 13:54:35 UTC;dev202-4096;0.32;16.04;0.00;0.00;50.00;0.00;1.00;0.03 # hostname;interval;timestamp;IFACE;rxpck/s;txpck/s;rxkB/s;txkB/s;rxcmp/s;txcmp/s;rxmcst/s;%ifutil SYSSTAT.TEST;31;2019-04-18 13:54:35 UTC;lo;0.00;0.00;0.00;0.00;0.00;0.00;0.00;0.00 SYSSTAT.TEST;31;2019-04-18 13:54:35 UTC;virbr0-nic;0.00;0.00;0.00;0.00;0.00;0.00;0.00;0.00 diff --git a/tests/expected.sadf-g b/tests/expected.sadf-g index f1a4db3..e2ca5c1 100644 --- a/tests/expected.sadf-g +++ b/tests/expected.sadf-g @@ -1,6 +1,6 @@ - + Linux 1.2.3-TEST (SYSSTAT.TEST) 04/18/19 _x86_64_ (8 CPU) @@ -1004,8 +1004,8 @@ (Min, Max values) -tps (0.00, 32404.56) -rtps (0.00, 320.82) +tps (0.00, 32405.20) +rtps (0.00, 321.46) wtps (0.00, 32082.13) dtps (0.00, 1.60) @@ -1039,8 +1039,8 @@ 13:54:29 UTC - - + + @@ -1083,7 +1083,7 @@ 13:54:29 UTC - + @@ -5684,7 +5684,429 @@ UTC - + + +Block devices statistics (1) [dev202-240] +(Min, Max values) + + +tps (0.32, 0.32) + +0.00. + +0.11. + +0.21. + +0.32. + +13:20:09 + +13:23:35 + +13:27:01 + +13:30:27 + +13:33:53 + +13:37:19 + +13:40:45 + +13:44:11 + +13:47:37 + +13:51:03 + +13:54:29 +UTC + + + +Block devices statistics (2) [dev202-240] +(Min, Max values) + + +rkB/s (16.04, 16.04) +wkB/s (0.00, 0.00) +dkB/s (0.00, 0.00) + +0. + +5. + +10. + +15. + +13:20:09 + +13:23:35 + +13:27:01 + +13:30:27 + +13:33:53 + +13:37:19 + +13:40:45 + +13:44:11 + +13:47:37 + +13:51:03 + +13:54:29 +UTC + + + + + +Block devices statistics (3) [dev202-240] +(Min, Max values) + + +areq-sz (50.00, 50.00) +aqu-sz (0.00, 0.00) + +0. + +10. + +20. + +30. + +40. + +50. + +13:20:09 + +13:23:35 + +13:27:01 + +13:30:27 + +13:33:53 + +13:37:19 + +13:40:45 + +13:44:11 + +13:47:37 + +13:51:03 + +13:54:29 +UTC + + + + +Block devices statistics (4) [dev202-240] +(Min, Max values) + + +await (1.00, 1.00) + +0.00. + +0.33. + +0.67. + +1.00. + +13:20:09 + +13:23:35 + +13:27:01 + +13:30:27 + +13:33:53 + +13:37:19 + +13:40:45 + +13:44:11 + +13:47:37 + +13:51:03 + +13:54:29 +UTC + + + +Block devices statistics (5) [dev202-240] +(Min, Max values) + + +%util (0.03, 0.03) + +0. + +25. + +50. + +75. + +100. + +13:20:09 + +13:23:35 + +13:27:01 + +13:30:27 + +13:33:53 + +13:37:19 + +13:40:45 + +13:44:11 + +13:47:37 + +13:51:03 + +13:54:29 +UTC + + + + + + + +Block devices statistics (1) [dev202-4096] +(Min, Max values) + + +tps (0.32, 0.32) + +0.00. + +0.11. + +0.21. + +0.32. + +13:20:09 + +13:23:35 + +13:27:01 + +13:30:27 + +13:33:53 + +13:37:19 + +13:40:45 + +13:44:11 + +13:47:37 + +13:51:03 + +13:54:29 +UTC + + + +Block devices statistics (2) [dev202-4096] +(Min, Max values) + + +rkB/s (16.04, 16.04) +wkB/s (0.00, 0.00) +dkB/s (0.00, 0.00) + +0. + +5. + +10. + +15. + +13:20:09 + +13:23:35 + +13:27:01 + +13:30:27 + +13:33:53 + +13:37:19 + +13:40:45 + +13:44:11 + +13:47:37 + +13:51:03 + +13:54:29 +UTC + + + + + +Block devices statistics (3) [dev202-4096] +(Min, Max values) + + +areq-sz (50.00, 50.00) +aqu-sz (0.00, 0.00) + +0. + +10. + +20. + +30. + +40. + +50. + +13:20:09 + +13:23:35 + +13:27:01 + +13:30:27 + +13:33:53 + +13:37:19 + +13:40:45 + +13:44:11 + +13:47:37 + +13:51:03 + +13:54:29 +UTC + + + + +Block devices statistics (4) [dev202-4096] +(Min, Max values) + + +await (1.00, 1.00) + +0.00. + +0.33. + +0.67. + +1.00. + +13:20:09 + +13:23:35 + +13:27:01 + +13:30:27 + +13:33:53 + +13:37:19 + +13:40:45 + +13:44:11 + +13:47:37 + +13:51:03 + +13:54:29 +UTC + + + +Block devices statistics (5) [dev202-4096] +(Min, Max values) + + +%util (0.03, 0.03) + +0. + +25. + +50. + +75. + +100. + +13:20:09 + +13:23:35 + +13:27:01 + +13:30:27 + +13:33:53 + +13:37:19 + +13:40:45 + +13:44:11 + +13:47:37 + +13:51:03 + +13:54:29 +UTC + + + + + + Network interfaces statistics (1) [lo] (Min, Max values) @@ -5851,7 +6273,7 @@ UTC - + Network interfaces statistics (1) [virbr0-nic] (Min, Max values) @@ -6018,7 +6440,7 @@ UTC - + Network interfaces statistics (1) [enp6s0] (Min, Max values) @@ -6190,7 +6612,7 @@ - + Network interfaces statistics (1) [virbr0] (Min, Max values) @@ -6357,7 +6779,7 @@ UTC - + Network interfaces statistics (1) [wlp5s0] (Min, Max values) @@ -6524,7 +6946,7 @@ UTC - + Network interfaces statistics (1) [enp6s1] (Min, Max values) @@ -6700,7 +7122,7 @@ - + Network interfaces statistics (1) [wlp5s1] (Min, Max values) @@ -6867,7 +7289,7 @@ UTC - + Network interfaces statistics (1) [enp6s2] (Min, Max values) @@ -7036,7 +7458,7 @@ UTC - + Network interfaces statistics (1) [wlp5s2] (Min, Max values) @@ -7203,7 +7625,7 @@ UTC - + Network interfaces errors statistics (1) [lo] (Min, Max values) @@ -7371,7 +7793,7 @@ - + Network interfaces errors statistics (1) [virbr0-nic] (Min, Max values) @@ -7539,7 +7961,7 @@ - + Network interfaces errors statistics (1) [enp6s0] (Min, Max values) @@ -7707,7 +8129,7 @@ - + Network interfaces errors statistics (1) [virbr0] (Min, Max values) @@ -7875,7 +8297,7 @@ - + Network interfaces errors statistics (1) [wlp5s0] (Min, Max values) @@ -8043,7 +8465,7 @@ - + Network interfaces errors statistics (1) [enp6s1] (Min, Max values) @@ -8211,7 +8633,7 @@ - + Network interfaces errors statistics (1) [wlp5s1] (Min, Max values) @@ -8379,7 +8801,7 @@ - + Network interfaces errors statistics (1) [enp6s2] (Min, Max values) @@ -8547,7 +8969,7 @@ - + Network interfaces errors statistics (1) [wlp5s2] (Min, Max values) @@ -8715,7 +9137,7 @@ - + NFS client statistics (1) (Min, Max values) @@ -8840,7 +9262,7 @@ - + NFS server statistics (1) (Min, Max values) @@ -9049,7 +9471,7 @@ - + IPv4 sockets statistics (1) (Min, Max values) @@ -9137,7 +9559,7 @@ - + IPv4 traffic statistics (1) (Min, Max values) @@ -9266,7 +9688,7 @@ - + IPv4 traffic errors statistics (1) (Min, Max values) @@ -9395,7 +9817,7 @@ - + ICMPv4 traffic statistics (1) (Min, Max values) @@ -9573,7 +9995,7 @@ - + ICMPv4 traffic errors statistics (1) (Min, Max values) @@ -9821,7 +10243,7 @@ - + TCPv4 traffic statistics (1) (Min, Max values) @@ -9905,7 +10327,7 @@ - + TCPv4 traffic errors statistics (1) (Min, Max values) @@ -9991,7 +10413,7 @@ - + UDPv4 traffic statistics (1) (Min, Max values) @@ -10075,7 +10497,7 @@ - + IPv6 sockets statistics (Min, Max values) @@ -10122,7 +10544,7 @@ - + IPv6 traffic statistics (1) (Min, Max values) @@ -10292,7 +10714,7 @@ - + IPv6 traffic errors statistics (1) (Min, Max values) @@ -10464,7 +10886,7 @@ - + ICMPv6 traffic statistics (1) (Min, Max values) @@ -10685,7 +11107,7 @@ - + ICMPv6 traffic errors statistics (1) (Min, Max values) @@ -10931,7 +11353,7 @@ - + UDPv6 traffic statistics (1) (Min, Max values) @@ -11015,7 +11437,7 @@ - + Fibre Channel HBA statistics (1) [host0] (Min, Max values) @@ -11099,7 +11521,7 @@ - + Fibre Channel HBA statistics (1) [host1] (Min, Max values) @@ -11183,7 +11605,7 @@ - + Software-based network processing statistics (1) [all] (Min, Max values) @@ -11269,7 +11691,7 @@ - + Software-based network processing statistics (1) [0] (Min, Max values) @@ -11355,7 +11777,7 @@ - + Software-based network processing statistics (1) [1] (Min, Max values) @@ -11441,7 +11863,7 @@ - + Software-based network processing statistics (1) [2] (Min, Max values) @@ -11527,7 +11949,7 @@ - + Software-based network processing statistics (1) [3] (Min, Max values) @@ -11613,7 +12035,7 @@ - + Software-based network processing statistics (1) [4] (Min, Max values) @@ -11699,7 +12121,7 @@ - + Software-based network processing statistics (1) [5] (Min, Max values) @@ -11785,7 +12207,7 @@ - + Software-based network processing statistics (1) [6] (Min, Max values) @@ -11871,7 +12293,7 @@ - + Software-based network processing statistics (1) [7] (Min, Max values) @@ -11957,7 +12379,7 @@ - + Software-based network processing statistics (1) [8] (Min, Max values) @@ -12043,7 +12465,7 @@ - + Software-based network processing statistics (1) [9] (Min, Max values) @@ -12129,7 +12551,7 @@ - + CPU clock frequency [all] (Min, Max values) @@ -12170,7 +12592,7 @@ - + CPU clock frequency [0] (Min, Max values) @@ -12211,7 +12633,7 @@ - + CPU clock frequency [1] (Min, Max values) @@ -12252,7 +12674,7 @@ - + CPU clock frequency [2] (Min, Max values) @@ -12293,7 +12715,7 @@ - + CPU clock frequency [3] (Min, Max values) @@ -12334,7 +12756,7 @@ - + CPU clock frequency [4] (Min, Max values) @@ -12375,7 +12797,7 @@ - + CPU clock frequency [5] (Min, Max values) @@ -12416,7 +12838,7 @@ - + CPU clock frequency [6] (Min, Max values) @@ -12457,7 +12879,7 @@ - + CPU clock frequency [7] (Min, Max values) @@ -12498,7 +12920,7 @@ - + CPU clock frequency [8] (Min, Max values) @@ -12539,7 +12961,7 @@ - + CPU clock frequency [9] (Min, Max values) @@ -12580,7 +13002,7 @@ - + Filesystems statistics (1) [/dev/sda9] (Min, Max values) @@ -12754,7 +13176,7 @@ - + Filesystems statistics (1) [/dev/sda7] (Min, Max values) @@ -12928,7 +13350,7 @@ - + Filesystems statistics (1) [/dev/sda12] (Min, Max values) @@ -13102,7 +13524,7 @@ - + Filesystems statistics (1) [/dev/sda6] (Min, Max values) @@ -13276,7 +13698,7 @@ - + Filesystems statistics (1) [/dev/sdf] (Min, Max values) @@ -13450,7 +13872,7 @@ - + Filesystems statistics (1) [/dev/sdg] (Min, Max values) @@ -13626,7 +14048,7 @@ - + CPU pressure trends (some tasks) (Min, Max values) @@ -13714,7 +14136,7 @@ - + I/O pressure trends (some tasks) (Min, Max values) @@ -13888,7 +14310,7 @@ - + Memory pressure trends (some tasks) (Min, Max values) @@ -14062,5 +14484,5 @@ - + diff --git a/tests/expected.sadf-j b/tests/expected.sadf-j index 1e2e1dc..904655e 100644 --- a/tests/expected.sadf-j +++ b/tests/expected.sadf-j @@ -2941,7 +2941,7 @@ ], "swap-pages": {"pswpin": 0.00, "pswpout": 0.00}, "paging": {"pgpgin": 0.00, "pgpgout": 0.00, "fault": 0.00, "majflt": 0.00, "pgfree": 0.00, "pgscank": 0.00, "pgscand": 0.00, "pgsteal": 0.00, "vmeff-percent": 0.00}, - "io": {"tps": 32404.56, "io-reads": {"rtps": 320.82, "bread": 0.00}, "io-writes": {"wtps": 32082.13, "bwrtn": 0.00}, "io-discard": {"dtps": 1.60, "bdscd": 1.60}}, + "io": {"tps": 32405.20, "io-reads": {"rtps": 321.46, "bread": 64.16}, "io-writes": {"wtps": 32082.13, "bwrtn": 0.00}, "io-discard": {"dtps": 1.60, "bdscd": 1.60}}, "memory": {"memfree": 1437740, "avail": 4389516, "memused": 3179712, "memused-percent": 39.04, "buffers": 260172, "cached": 2821596, "commit": 12097852, "commit-percent": 48.54, "active": 4042384, "inactive": 1772396, "dirty": 396, "anonpg": 2733164, "slab": 445740, "kstack": 15328, "pgtbl": 73760, "vmused": 0, "swpfree": 16777212, "swpused": 0, "swpused-percent": 0.00, "swpcad": 0, "swpcad-percent": 0.00}, "hugepages": {"hugfree": 0, "hugused": 0, "hugused-percent": 0.00, "hugrsvd": 0, "hugsurp": 0}, "kernel": {"dentunusd": 156063, "file-nr": 16704, "inode-nr": 157735, "pty-nr": 4}, @@ -2963,7 +2963,9 @@ {"disk-device": "dev8-9", "tps": 0.00, "rd_sec": 0.00, "wr_sec": 0.00, "dc_sec": 0.00, "rkB": 0.00, "wkB": 0.00, "dkB": 0.00, "avgrq-sz": 0.00, "areq-sz": 0.00, "avgqu-sz": 0.00, "aqu-sz": 0.00, "await": 0.00, "util-percent": 0.00}, {"disk-device": "dev104-0", "tps": 32402.95, "rd_sec": 0.00, "wr_sec": 0.00, "dc_sec": 0.00, "rkB": 0.00, "wkB": 0.00, "dkB": 0.00, "avgrq-sz": 0.00, "areq-sz": 0.00, "avgqu-sz": 0.00, "aqu-sz": 0.00, "await": 0.10, "util-percent": 0.00}, {"disk-device": "dev104-1", "tps": 0.00, "rd_sec": 0.00, "wr_sec": 0.00, "dc_sec": 0.00, "rkB": 0.00, "wkB": 0.00, "dkB": 0.00, "avgrq-sz": 0.00, "areq-sz": 0.00, "avgqu-sz": 0.00, "aqu-sz": 0.00, "await": 0.00, "util-percent": 0.00}, - {"disk-device": "dev104-2", "tps": 32402.95, "rd_sec": 0.00, "wr_sec": 0.00, "dc_sec": 0.00, "rkB": 0.00, "wkB": 0.00, "dkB": 0.00, "avgrq-sz": 0.00, "areq-sz": 0.00, "avgqu-sz": 0.00, "aqu-sz": 0.00, "await": 0.10, "util-percent": 0.00} + {"disk-device": "dev104-2", "tps": 32402.95, "rd_sec": 0.00, "wr_sec": 0.00, "dc_sec": 0.00, "rkB": 0.00, "wkB": 0.00, "dkB": 0.00, "avgrq-sz": 0.00, "areq-sz": 0.00, "avgqu-sz": 0.00, "aqu-sz": 0.00, "await": 0.10, "util-percent": 0.00}, + {"disk-device": "dev202-240", "tps": 0.32, "rd_sec": 32.08, "wr_sec": 0.00, "dc_sec": 0.00, "rkB": 16.04, "wkB": 0.00, "dkB": 0.00, "avgrq-sz": 100.00, "areq-sz": 50.00, "avgqu-sz": 0.00, "aqu-sz": 0.00, "await": 1.00, "util-percent": 0.03}, + {"disk-device": "dev202-4096", "tps": 0.32, "rd_sec": 32.08, "wr_sec": 0.00, "dc_sec": 0.00, "rkB": 16.04, "wkB": 0.00, "dkB": 0.00, "avgrq-sz": 100.00, "areq-sz": 50.00, "avgqu-sz": 0.00, "aqu-sz": 0.00, "await": 1.00, "util-percent": 0.03} ], "network": { "net-dev": [ diff --git a/tests/expected.sadf-p b/tests/expected.sadf-p index 18918ad..ffc1b4d 100644 --- a/tests/expected.sadf-p +++ b/tests/expected.sadf-p @@ -5026,11 +5026,11 @@ SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC - pgscank/s 0.00 SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC - pgscand/s 0.00 SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC - pgsteal/s 0.00 SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC - %vmeff 0.00 -SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC - tps 32404.56 -SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC - rtps 320.82 +SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC - tps 32405.20 +SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC - rtps 321.46 SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC - wtps 32082.13 SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC - dtps 1.60 -SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC - bread/s 0.00 +SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC - bread/s 64.16 SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC - bwrtn/s 0.00 SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC - bdscd/s 1.60 SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC - kbmemfree 1437740 @@ -5185,6 +5185,22 @@ SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC dev104-2 areq-sz 0.00 SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC dev104-2 aqu-sz 0.00 SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC dev104-2 await 0.10 SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC dev104-2 %util 0.00 +SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC dev202-240 tps 0.32 +SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC dev202-240 rkB/s 16.04 +SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC dev202-240 wkB/s 0.00 +SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC dev202-240 dkB/s 0.00 +SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC dev202-240 areq-sz 50.00 +SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC dev202-240 aqu-sz 0.00 +SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC dev202-240 await 1.00 +SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC dev202-240 %util 0.03 +SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC dev202-4096 tps 0.32 +SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC dev202-4096 rkB/s 16.04 +SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC dev202-4096 wkB/s 0.00 +SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC dev202-4096 dkB/s 0.00 +SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC dev202-4096 areq-sz 50.00 +SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC dev202-4096 aqu-sz 0.00 +SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC dev202-4096 await 1.00 +SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC dev202-4096 %util 0.03 SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC lo rxpck/s 0.00 SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC lo txpck/s 0.00 SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC lo rxkB/s 0.00 diff --git a/tests/expected.sadf-r b/tests/expected.sadf-r index f5ac0af..aeb3bc6 100644 --- a/tests/expected.sadf-r +++ b/tests/expected.sadf-r @@ -3172,7 +3172,7 @@ 13:54:35 UTC; pgpgin/s; 2685938; 2685938; pgpgout/s; 1863420; 1863420; fault/s; 60863302; 60863302; majflt/s; 10715; 10715; pgfree/s; 63486798; 63486798; pgscank/s; 0; 0; pgscand/s; 0; 0; pgsteal/s; 0; 0; # uptime_cs; 722372; ust_time; 1555595675; extra_next; 0; record_type; 1; HH:MM:SS; 13:54:35 # name; A_IO; nr_curr; 1; nr_alloc; 1; nr_ini; 1 -13:54:35 UTC; tps; 5153409; 6163459; rtps; 85418; 95418; wtps; 5067891; 6067891; dtps; 100; 150; bread/s; 3195498; 3195498; bwrtn/s; 821088; 821088; bdscd/s; 100; 150; +13:54:35 UTC; tps; 5153543; 6163613; rtps; 85552; 95572; wtps; 5067891; 6067891; dtps; 100; 150; bread/s; 3200690; 3202690; bwrtn/s; 821088; 821088; bdscd/s; 100; 150; # uptime_cs; 722372; ust_time; 1555595675; extra_next; 0; record_type; 1; HH:MM:SS; 13:54:35 # name; A_MEMORY; nr_curr; 1; nr_alloc; 1; nr_ini; 1 13:54:35 UTC; kbmemfree; 1437740; kbavail; 4389516; kbttlmem; 8144960; kbbuffers; 260172; kbcached; 2821596; kbcommit; 12097852; kbactive; 4042384; kbinact; 1772396; kbdirty; 396; kbanonpg; 2733164; kbslab; 445740; kbkstack; 15328; kbpgtbl; 73760; kbvmused; 0; @@ -3193,7 +3193,7 @@ 13:54:35 UTC; TTY; 0; rcvin/s; 32543; 32543; txmtin/s; 14323; 14323; framerr/s; 123; 123; prtyerr/s; 123; 123; brk/s; 42; 42; ovrun/s; 13; 13; 13:54:35 UTC; TTY; 1; rcvin/s; 0; 0; txmtin/s; 0; 0; framerr/s; 0; 0; prtyerr/s; 0; 0; brk/s; 0; 0; ovrun/s; 0; 0; # uptime_cs; 722372; ust_time; 1555595675; extra_next; 0; record_type; 1; HH:MM:SS; 13:54:35 -# name; A_DISK; nr_curr; 13; nr_alloc; 19; nr_ini; 19 +# name; A_DISK; nr_curr; 15; nr_alloc; 19; nr_ini; 19 13:54:35 UTC; major; 8; minor; 0; DEV; dev8-0; tps; 61881; 61931; rkB/s; 3195498; 3195498; wkB/s; 821088; 821088; dkB/s; 100; 150; rd_ticks; 623970; 623970; wr_ticks; 117109; 117109; dc_ticks; 100; 150; tot_ticks; 32862; 32862; aqu-sz; 714408; 714408; 13:54:35 UTC; major; 8; minor; 1; DEV; dev8-1; tps; 151; 201; rkB/s; 4216; 4216; wkB/s; 0; 0; dkB/s; 100; 150; rd_ticks; 3107; 3107; wr_ticks; 0; 0; dc_ticks; 100; 150; tot_ticks; 41; 41; aqu-sz; 3086; 3086; 13:54:35 UTC; major; 8; minor; 2; DEV; dev8-2; tps; 47; 47; rkB/s; 4184; 4184; wkB/s; 0; 0; dkB/s; 0; 0; rd_ticks; 2938; 2938; wr_ticks; 0; 0; dc_ticks; 0; 0; tot_ticks; 33; 33; aqu-sz; 2917; 2917; @@ -3207,6 +3207,8 @@ 13:54:35 UTC; major; 104; minor; 0; DEV; dev104-0; tps; 5091528; 6101528; rkB/s; 0; 0; wkB/s; 0; 0; dkB/s; 0; 0; rd_ticks; 163484; 263484; wr_ticks; 18832400; 18832400; dc_ticks; 0; 0; tot_ticks; 7365500; 7365500; aqu-sz; 19000180; 19000180; 13:54:35 UTC; major; 104; minor; 1; DEV; dev104-1; tps; 61528; 61528; rkB/s; 0; 0; wkB/s; 0; 0; dkB/s; 0; 0; rd_ticks; 63484; 63484; wr_ticks; 8832400; 8832400; dc_ticks; 0; 0; tot_ticks; 365500; 365500; aqu-sz; 9000180; 9000180; 13:54:35 UTC; major; 104; minor; 2; DEV; dev104-2; tps; 5030000; 6040000; rkB/s; 0; 0; wkB/s; 0; 0; dkB/s; 0; 0; rd_ticks; 100000; 200000; wr_ticks; 10000000; 10000000; dc_ticks; 0; 0; tot_ticks; 7000000; 7000000; aqu-sz; 10000000; 10000000; +13:54:35 UTC; major; 202; minor; 240; DEV; dev202-240; tps; 82; 92; rkB/s; 3096; 4096; wkB/s; 0; 0; dkB/s; 0; 0; rd_ticks; 82; 92; wr_ticks; 0; 0; dc_ticks; 0; 0; tot_ticks; 52; 62; aqu-sz; 44; 54; +13:54:35 UTC; major; 202; minor; 4096; DEV; dev202-4096; tps; 52; 62; rkB/s; 2096; 3096; wkB/s; 0; 0; dkB/s; 0; 0; rd_ticks; 31; 41; wr_ticks; 0; 0; dc_ticks; 0; 0; tot_ticks; 20; 30; aqu-sz; 40; 50; # uptime_cs; 722372; ust_time; 1555595675; extra_next; 0; record_type; 1; HH:MM:SS; 13:54:35 # name; A_NET_DEV; nr_curr; 9; nr_alloc; 10; nr_ini; 5 13:54:35 UTC; IFACE; lo; rxpck/s; 95831; 95831; txpck/s; 95831; 95831; rxkB/s; 81228574; 81228574; txkB/s; 81228574; 81228574; rxcmp/s; 0; 0; txcmp/s; 0; 0; rxmcst/s; 0; 0; speed; 0; duplex; 0; diff --git a/tests/expected.sadf-x b/tests/expected.sadf-x index a510c68..1296741 100644 --- a/tests/expected.sadf-x +++ b/tests/expected.sadf-x @@ -3052,8 +3052,8 @@ xsi:schemaLocation="http://pagesperso-orange.fr/sebastien.godard sysstat.xsd"> - 32404.56 - + 32405.20 + @@ -3107,6 +3107,8 @@ xsi:schemaLocation="http://pagesperso-orange.fr/sebastien.godard sysstat.xsd"> + + diff --git a/tests/expected.sar-dec b/tests/expected.sar-dec index 4f32504..11c4e87 100644 --- a/tests/expected.sar-dec +++ b/tests/expected.sar-dec @@ -3990,8 +3990,8 @@ Average: 0 0 Average: 0 0 0 0 0 0 0 0 0 13:54:15 tps rtps wtps dtps bread/s bwrtn/s bdscd/s -13:54:35 32405 321 32082 2 0 0 2 -Average: 32405 321 32082 2 0 0 2 +13:54:35 32405 321 32082 2 64 0 2 +Average: 32405 321 32082 2 64 0 2 13:54:15 kbmemfree kbavail kbmemused %memused kbbuffers kbcached kbcommit %commit kbactive kbinact kbdirty kbanonpg kbslab kbkstack kbpgtbl kbvmused 13:54:35 1437740 4389516 3179712 39 260172 2821596 12097852 49 4042384 1772396 396 2733164 445740 15328 73760 0 @@ -4033,6 +4033,8 @@ Average: 1 0 0 0 0 0 13:54:35 dev104-0 32403 0 0 0 0 0 0 0 13:54:35 dev104-1 0 0 0 0 0 0 0 0 13:54:35 dev104-2 32403 0 0 0 0 0 0 0 +13:54:35 dev202-240 0 16 0 0 50 0 1 0 +13:54:35 dev202-4096 0 16 0 0 50 0 1 0 Average: dev8-0 2 0 0 1 0 0 1 0 Average: dev8-1 2 0 0 1 0 0 1 0 Average: dev8-2 0 0 0 0 0 0 0 0 @@ -4046,6 +4048,8 @@ Average: dev8-9 0 0 0 0 0 Average: dev104-0 32403 0 0 0 0 0 0 0 Average: dev104-1 0 0 0 0 0 0 0 0 Average: dev104-2 32403 0 0 0 0 0 0 0 +Average: dev202-240 0 16 0 0 50 0 1 0 +Average: dev202-4096 0 16 0 0 50 0 1 0 13:54:15 IFACE rxpck/s txpck/s rxkB/s txkB/s rxcmp/s txcmp/s rxmcst/s %ifutil 13:54:35 lo 0 0 0 0 0 0 0 0 diff --git a/tests/expected.sar-human b/tests/expected.sar-human index bf2e744..59f8229 100644 --- a/tests/expected.sar-human +++ b/tests/expected.sar-human @@ -3990,8 +3990,8 @@ Average: 0.00 0.00 Average: 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.0% 13:54:15 tps rtps wtps dtps bread/s bwrtn/s bdscd/s -13:54:35 32404.56 320.82 32082.13 1.60 0.00 0.00 1.60 -Average: 32404.56 320.82 32082.13 1.60 0.00 0.00 1.60 +13:54:35 32405.20 321.46 32082.13 1.60 64.16 0.00 1.60 +Average: 32405.20 321.46 32082.13 1.60 64.16 0.00 1.60 13:54:15 kbmemfree kbavail kbmemused %memused kbbuffers kbcached kbcommit %commit kbactive kbinact kbdirty kbanonpg kbslab kbkstack kbpgtbl kbvmused 13:54:35 1.4G 4.2G 3.0G 39.0% 254.1M 2.7G 11.5G 48.5% 3.9G 1.7G 396.0k 2.6G 435.3M 15.0M 72.0M 0.0k @@ -4033,6 +4033,8 @@ Average: 1 0.00 0.00 0.00 0.00 0.00 0.0 13:54:35 dev104-0 32402.95 0.0k 0.0k 0.0k 0.0k 0.00 0.10 0.0% 13:54:35 dev104-1 0.00 0.0k 0.0k 0.0k 0.0k 0.00 0.00 0.0% 13:54:35 dev104-2 32402.95 0.0k 0.0k 0.0k 0.0k 0.00 0.10 0.0% +13:54:35 dev202-240 0.32 16.0k 0.0k 0.0k 50.0k 0.00 1.00 0.0% +13:54:35 dev202-4096 0.32 16.0k 0.0k 0.0k 50.0k 0.00 1.00 0.0% Average: dev8-0 1.60 0.0k 0.0k 0.8k 0.5k 0.00 1.00 0.0% Average: dev8-1 1.60 0.0k 0.0k 0.8k 0.5k 0.00 1.00 0.0% Average: dev8-2 0.00 0.0k 0.0k 0.0k 0.0k 0.00 0.00 0.0% @@ -4046,6 +4048,8 @@ Average: dev8-9 0.00 0.0k 0.0k 0.0k 0.0k 0.0 Average: dev104-0 32402.95 0.0k 0.0k 0.0k 0.0k 0.00 0.10 0.0% Average: dev104-1 0.00 0.0k 0.0k 0.0k 0.0k 0.00 0.00 0.0% Average: dev104-2 32402.95 0.0k 0.0k 0.0k 0.0k 0.00 0.10 0.0% +Average: dev202-240 0.32 16.0k 0.0k 0.0k 50.0k 0.00 1.00 0.0% +Average: dev202-4096 0.32 16.0k 0.0k 0.0k 50.0k 0.00 1.00 0.0% 13:54:15 IFACE rxpck/s txpck/s rxkB/s txkB/s rxcmp/s txcmp/s rxmcst/s %ifutil 13:54:35 lo 0.00 0.00 0.0B 0.0B 0.00 0.00 0.00 0.0% diff --git a/tests/expected.sar-jID b/tests/expected.sar-jID index beb4b04..40f2c2e 100644 --- a/tests/expected.sar-jID +++ b/tests/expected.sar-jID @@ -93,6 +93,8 @@ Average: 1.08 39.9k 0.1k 0.0k 37.2k 0.03 21.8 13:54:35 32402.95 0.0k 0.0k 0.0k 0.0k 0.00 0.10 0.0% cciss/c0d0 13:54:35 0.00 0.0k 0.0k 0.0k 0.0k 0.00 0.00 0.0% cciss/c0d0p1 13:54:35 32402.95 0.0k 0.0k 0.0k 0.0k 0.00 0.10 0.0% cciss/c0d0p2 +13:54:35 0.32 16.0k 0.0k 0.0k 50.0k 0.00 1.00 0.0% xvdp +13:54:35 0.32 16.0k 0.0k 0.0k 50.0k 0.00 1.00 0.0% xvdiw Average: 1.60 0.0k 0.0k 0.8k 0.5k 0.00 1.00 0.0% ata-Hitachi_HDS723020BLA642_MN1240F33J1XND Average: 1.60 0.0k 0.0k 0.8k 0.5k 0.00 1.00 0.0% ata-Hitachi_HDS723020BLA642_MN1240F33J1XND-part1 Average: 0.00 0.0k 0.0k 0.0k 0.0k 0.00 0.00 0.0% ata-Hitachi_HDS723020BLA642_MN1240F33J1XND-part2 @@ -106,3 +108,5 @@ Average: 0.00 0.0k 0.0k 0.0k 0.0k 0.00 0.0 Average: 32402.95 0.0k 0.0k 0.0k 0.0k 0.00 0.10 0.0% cciss/c0d0 Average: 0.00 0.0k 0.0k 0.0k 0.0k 0.00 0.00 0.0% cciss/c0d0p1 Average: 32402.95 0.0k 0.0k 0.0k 0.0k 0.00 0.10 0.0% cciss/c0d0p2 +Average: 0.32 16.0k 0.0k 0.0k 50.0k 0.00 1.00 0.0% xvdp +Average: 0.32 16.0k 0.0k 0.0k 50.0k 0.00 1.00 0.0% xvdiw diff --git a/tests/expected.sar-jSID b/tests/expected.sar-jSID index 4bfe4b3..44d86c0 100644 --- a/tests/expected.sar-jSID +++ b/tests/expected.sar-jSID @@ -93,6 +93,8 @@ Average: 1.08 39.9k 0.1k 0.0k 37.2k 0.03 21.8 13:54:35 32402.95 0.0k 0.0k 0.0k 0.0k 0.00 0.10 0.0% cciss/c0d0 13:54:35 0.00 0.0k 0.0k 0.0k 0.0k 0.00 0.00 0.0% cciss/c0d0p1 13:54:35 32402.95 0.0k 0.0k 0.0k 0.0k 0.00 0.10 0.0% cciss/c0d0p2 +13:54:35 0.32 16.0k 0.0k 0.0k 50.0k 0.00 1.00 0.0% xvdp +13:54:35 0.32 16.0k 0.0k 0.0k 50.0k 0.00 1.00 0.0% xvdiw Average: 1.60 0.0k 0.0k 0.8k 0.5k 0.00 1.00 0.0% 0x5000cca369f193ac Average: 1.60 0.0k 0.0k 0.8k 0.5k 0.00 1.00 0.0% 0x5000cca369f193ac-1 Average: 0.00 0.0k 0.0k 0.0k 0.0k 0.00 0.00 0.0% 0x5000cca369f193ac-2 @@ -106,3 +108,5 @@ Average: 0.00 0.0k 0.0k 0.0k 0.0k 0.00 0.0 Average: 32402.95 0.0k 0.0k 0.0k 0.0k 0.00 0.10 0.0% cciss/c0d0 Average: 0.00 0.0k 0.0k 0.0k 0.0k 0.00 0.00 0.0% cciss/c0d0p1 Average: 32402.95 0.0k 0.0k 0.0k 0.0k 0.00 0.10 0.0% cciss/c0d0p2 +Average: 0.32 16.0k 0.0k 0.0k 50.0k 0.00 1.00 0.0% xvdp +Average: 0.32 16.0k 0.0k 0.0k 50.0k 0.00 1.00 0.0% xvdiw diff --git a/tests/expected.sar-jUUID b/tests/expected.sar-jUUID index 4b165af..48c9e1a 100644 --- a/tests/expected.sar-jUUID +++ b/tests/expected.sar-jUUID @@ -93,6 +93,8 @@ Average: 1.08 39.9k 0.1k 0.0k 37.2k 0.03 21.8 13:54:35 32402.95 0.0k 0.0k 0.0k 0.0k 0.00 0.10 0.0% cciss/c0d0 13:54:35 0.00 0.0k 0.0k 0.0k 0.0k 0.00 0.00 0.0% cciss/c0d0p1 13:54:35 32402.95 0.0k 0.0k 0.0k 0.0k 0.00 0.10 0.0% cciss/c0d0p2 +13:54:35 0.32 16.0k 0.0k 0.0k 50.0k 0.00 1.00 0.0% xvdp +13:54:35 0.32 16.0k 0.0k 0.0k 50.0k 0.00 1.00 0.0% xvdiw Average: 1.60 0.0k 0.0k 0.8k 0.5k 0.00 1.00 0.0% sda Average: 1.60 0.0k 0.0k 0.8k 0.5k 0.00 1.00 0.0% E27E37357E370239 Average: 0.00 0.0k 0.0k 0.0k 0.0k 0.00 0.00 0.0% A6B4E393B4E36471 @@ -106,3 +108,5 @@ Average: 0.00 0.0k 0.0k 0.0k 0.0k 0.00 0.0 Average: 32402.95 0.0k 0.0k 0.0k 0.0k 0.00 0.10 0.0% cciss/c0d0 Average: 0.00 0.0k 0.0k 0.0k 0.0k 0.00 0.00 0.0% cciss/c0d0p1 Average: 32402.95 0.0k 0.0k 0.0k 0.0k 0.00 0.10 0.0% cciss/c0d0p2 +Average: 0.32 16.0k 0.0k 0.0k 50.0k 0.00 1.00 0.0% xvdp +Average: 0.32 16.0k 0.0k 0.0k 50.0k 0.00 1.00 0.0% xvdiw diff --git a/tests/expected2.sadf-g b/tests/expected2.sadf-g index c6458cc..017d11f 100644 --- a/tests/expected2.sadf-g +++ b/tests/expected2.sadf-g @@ -1,6 +1,6 @@ - + Linux 1.2.3-TEST (SYSSTAT.TEST) 04/18/19 _x86_64_ (8 CPU) @@ -1024,8 +1024,8 @@ (Min, Max values) -tps (0.00, 32404.56) -rtps x100 (0.00, 32082.13) +tps (0.00, 32405.20) +rtps x100 (0.00, 32146.29) wtps (0.00, 32082.13) dtps x10000 (0.00, 16041.07) SYSSTAT.TEST @@ -1065,10 +1065,10 @@ 22:00 0:00 - - + + - + I/O and transfer rate statistics (2) @@ -1115,7 +1115,7 @@ 22:00 0:00 - + @@ -3099,7 +3099,489 @@ - + + +Block devices statistics (1) [dev202-240] +(Min, Max values) + + +tps (0.32, 0.32) +SYSSTAT.TEST +04/18/19 + + +0.00. + +0.11. + +0.21. + +0.32. + + 0:00 + + 2:00 + + 4:00 + + 6:00 + + 8:00 + +10:00 + +12:00 + +14:00 + +16:00 + +18:00 + +20:00 + +22:00 + + 0:00 + + + +Block devices statistics (2) [dev202-240] +(Min, Max values) + + +rkB/s (16.04, 16.04) +wkB/s (0.00, 0.00) +dkB/s (0.00, 0.00) +SYSSTAT.TEST +04/18/19 + + +0. + +5. + +10. + +15. + + 0:00 + + 2:00 + + 4:00 + + 6:00 + + 8:00 + +10:00 + +12:00 + +14:00 + +16:00 + +18:00 + +20:00 + +22:00 + + 0:00 + + + + + +Block devices statistics (3) [dev202-240] +(Min, Max values) + + +areq-sz (50.00, 50.00) +aqu-sz x100000 (32.08, 32.08) +SYSSTAT.TEST +04/18/19 + + +0. + +10. + +20. + +30. + +40. + +50. + + 0:00 + + 2:00 + + 4:00 + + 6:00 + + 8:00 + +10:00 + +12:00 + +14:00 + +16:00 + +18:00 + +20:00 + +22:00 + + 0:00 + + + + +Block devices statistics (4) [dev202-240] +(Min, Max values) + + +await (1.00, 1.00) +SYSSTAT.TEST +04/18/19 + + +0.00. + +0.33. + +0.67. + +1.00. + + 0:00 + + 2:00 + + 4:00 + + 6:00 + + 8:00 + +10:00 + +12:00 + +14:00 + +16:00 + +18:00 + +20:00 + +22:00 + + 0:00 + + + +Block devices statistics (5) [dev202-240] +(Min, Max values) + + +%util (0.03, 0.03) +SYSSTAT.TEST +04/18/19 + + +0. + +25. + +50. + +75. + +100. + + 0:00 + + 2:00 + + 4:00 + + 6:00 + + 8:00 + +10:00 + +12:00 + +14:00 + +16:00 + +18:00 + +20:00 + +22:00 + + 0:00 + + + + + + + +Block devices statistics (1) [dev202-4096] +(Min, Max values) + + +tps (0.32, 0.32) +SYSSTAT.TEST +04/18/19 + + +0.00. + +0.11. + +0.21. + +0.32. + + 0:00 + + 2:00 + + 4:00 + + 6:00 + + 8:00 + +10:00 + +12:00 + +14:00 + +16:00 + +18:00 + +20:00 + +22:00 + + 0:00 + + + +Block devices statistics (2) [dev202-4096] +(Min, Max values) + + +rkB/s (16.04, 16.04) +wkB/s (0.00, 0.00) +dkB/s (0.00, 0.00) +SYSSTAT.TEST +04/18/19 + + +0. + +5. + +10. + +15. + + 0:00 + + 2:00 + + 4:00 + + 6:00 + + 8:00 + +10:00 + +12:00 + +14:00 + +16:00 + +18:00 + +20:00 + +22:00 + + 0:00 + + + + + +Block devices statistics (3) [dev202-4096] +(Min, Max values) + + +areq-sz (50.00, 50.00) +aqu-sz x100000 (32.08, 32.08) +SYSSTAT.TEST +04/18/19 + + +0. + +10. + +20. + +30. + +40. + +50. + + 0:00 + + 2:00 + + 4:00 + + 6:00 + + 8:00 + +10:00 + +12:00 + +14:00 + +16:00 + +18:00 + +20:00 + +22:00 + + 0:00 + + + + +Block devices statistics (4) [dev202-4096] +(Min, Max values) + + +await (1.00, 1.00) +SYSSTAT.TEST +04/18/19 + + +0.00. + +0.33. + +0.67. + +1.00. + + 0:00 + + 2:00 + + 4:00 + + 6:00 + + 8:00 + +10:00 + +12:00 + +14:00 + +16:00 + +18:00 + +20:00 + +22:00 + + 0:00 + + + +Block devices statistics (5) [dev202-4096] +(Min, Max values) + + +%util (0.03, 0.03) +SYSSTAT.TEST +04/18/19 + + +0. + +25. + +50. + +75. + +100. + + 0:00 + + 2:00 + + 4:00 + + 6:00 + + 8:00 + +10:00 + +12:00 + +14:00 + +16:00 + +18:00 + +20:00 + +22:00 + + 0:00 + + + + + + Network interfaces statistics (1) [enp6s0] (Min, Max values) @@ -3295,7 +3777,7 @@ - + Network interfaces statistics (1) [enp6s1] (Min, Max values) @@ -3446,7 +3928,7 @@ - + Network interfaces statistics (1) [wlp5s1] (Min, Max values) @@ -3542,7 +4024,7 @@ - + Network interfaces statistics (1) [enp6s2] (Min, Max values) @@ -3689,7 +4171,7 @@ - + Network interfaces statistics (1) [wlp5s2] (Min, Max values) @@ -3785,7 +4267,7 @@ - + Network interfaces errors statistics (4) [wlp5s1] (Min, Max values) @@ -3836,7 +4318,7 @@ - + IPv4 sockets statistics (1) (Min, Max values) @@ -3936,7 +4418,7 @@ - + IPv6 sockets statistics (Min, Max values) @@ -3989,7 +4471,7 @@ - + Fibre Channel HBA statistics (1) [host1] (Min, Max values) @@ -4085,7 +4567,7 @@ - + CPU clock frequency [all] (Min, Max values) @@ -4132,7 +4614,7 @@ - + CPU clock frequency [0] (Min, Max values) @@ -4179,7 +4661,7 @@ - + CPU clock frequency [1] (Min, Max values) @@ -4226,7 +4708,7 @@ - + CPU clock frequency [2] (Min, Max values) @@ -4273,7 +4755,7 @@ - + CPU clock frequency [3] (Min, Max values) @@ -4320,7 +4802,7 @@ - + CPU clock frequency [4] (Min, Max values) @@ -4367,7 +4849,7 @@ - + CPU clock frequency [5] (Min, Max values) @@ -4414,7 +4896,7 @@ - + CPU clock frequency [6] (Min, Max values) @@ -4461,7 +4943,7 @@ - + CPU clock frequency [7] (Min, Max values) @@ -4508,7 +4990,7 @@ - + CPU clock frequency [8] (Min, Max values) @@ -4555,7 +5037,7 @@ - + CPU clock frequency [9] (Min, Max values) @@ -4602,7 +5084,7 @@ - + Filesystems statistics (1) [/dev/sda9] (Min, Max values) @@ -4800,7 +5282,7 @@ - + Filesystems statistics (1) [/dev/sda7] (Min, Max values) @@ -4998,7 +5480,7 @@ - + Filesystems statistics (1) [/dev/sda12] (Min, Max values) @@ -5196,7 +5678,7 @@ - + Filesystems statistics (1) [/dev/sda6] (Min, Max values) @@ -5394,7 +5876,7 @@ - + Filesystems statistics (1) [/dev/sdf] (Min, Max values) @@ -5543,7 +6025,7 @@ - + Filesystems statistics (1) [/dev/sdg] (Min, Max values) @@ -5743,7 +6225,7 @@ - + CPU stall time (some tasks) (Min, Max values) @@ -5794,7 +6276,7 @@ - + I/O pressure trends (some tasks) (Min, Max values) @@ -5992,7 +6474,7 @@ - + Memory pressure trends (some tasks) (Min, Max values) @@ -6141,5 +6623,5 @@ - + diff --git a/tests/expected2.sar-all b/tests/expected2.sar-all index 51ac114..ceaf118 100644 --- a/tests/expected2.sar-all +++ b/tests/expected2.sar-all @@ -3990,8 +3990,8 @@ Average: 0.00 0.00 Average: 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 13:54:15 tps rtps wtps dtps bread/s bwrtn/s bdscd/s -13:54:35 32404.56 320.82 32082.13 1.60 0.00 0.00 1.60 -Average: 32404.56 320.82 32082.13 1.60 0.00 0.00 1.60 +13:54:35 32405.20 321.46 32082.13 1.60 64.16 0.00 1.60 +Average: 32405.20 321.46 32082.13 1.60 64.16 0.00 1.60 13:54:15 kbmemfree kbavail kbmemused %memused kbbuffers kbcached kbcommit %commit kbactive kbinact kbdirty kbanonpg kbslab kbkstack kbpgtbl kbvmused 13:54:35 1437740 4389516 3179712 39.04 260172 2821596 12097852 48.54 4042384 1772396 396 2733164 445740 15328 73760 0 @@ -4033,6 +4033,8 @@ Average: 1 0.00 0.00 0.00 0.00 0.00 0.0 13:54:35 dev104-0 32402.95 0.00 0.00 0.00 0.00 0.00 0.10 0.00 13:54:35 dev104-1 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 13:54:35 dev104-2 32402.95 0.00 0.00 0.00 0.00 0.00 0.10 0.00 +13:54:35 dev202-240 0.32 16.04 0.00 0.00 50.00 0.00 1.00 0.03 +13:54:35 dev202-4096 0.32 16.04 0.00 0.00 50.00 0.00 1.00 0.03 Average: dev8-0 1.60 0.00 0.00 0.80 0.50 0.00 1.00 0.00 Average: dev8-1 1.60 0.00 0.00 0.80 0.50 0.00 1.00 0.00 Average: dev8-2 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 @@ -4046,6 +4048,8 @@ Average: dev8-9 0.00 0.00 0.00 0.00 0.00 0.0 Average: dev104-0 32402.95 0.00 0.00 0.00 0.00 0.00 0.10 0.00 Average: dev104-1 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 Average: dev104-2 32402.95 0.00 0.00 0.00 0.00 0.00 0.10 0.00 +Average: dev202-240 0.32 16.04 0.00 0.00 50.00 0.00 1.00 0.03 +Average: dev202-4096 0.32 16.04 0.00 0.00 50.00 0.00 1.00 0.03 13:54:15 IFACE rxpck/s txpck/s rxkB/s txkB/s rxcmp/s txcmp/s rxmcst/s %ifutil 13:54:35 lo 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 diff --git a/tests/root.README b/tests/root.README index b3917d9..59ed70f 100644 --- a/tests/root.README +++ b/tests/root.README @@ -99,6 +99,7 @@ Old kernel format, with no steal/guest/guest_nice fields. /proc/diskstats sda10, sda11, sda12: unregistered cciss/c0d0* registered +xvd* registered (xvdq with a big minor number) /proc/net/dev enp6s0-2,wlp5s0-2: available diff --git a/tests/root6/dev/xvdp b/tests/root6/dev/xvdp new file mode 100644 index 0000000..efdd678 --- /dev/null +++ b/tests/root6/dev/xvdp @@ -0,0 +1 @@ +202 240 diff --git a/tests/root6/dev/xvdq b/tests/root6/dev/xvdq new file mode 100644 index 0000000..99d3136 --- /dev/null +++ b/tests/root6/dev/xvdq @@ -0,0 +1 @@ +202 4096 diff --git a/tests/root6/proc/devices b/tests/root6/proc/devices index 86b81a4..9b3f4b3 100644 --- a/tests/root6/proc/devices +++ b/tests/root6/proc/devices @@ -61,6 +61,7 @@ Block devices: 133 sd 134 sd 135 sd +202 xvd 253 device-mapper 254 mdp 259 blkext diff --git a/tests/root6/proc/diskstats b/tests/root6/proc/diskstats index 0cc5f16..31974b8 100644 --- a/tests/root6/proc/diskstats +++ b/tests/root6/proc/diskstats @@ -16,3 +16,5 @@ 104 0 cciss/c0d0 35817 15211 0 163484 5055711 16279213 0 18832400 0 7365500 19000180 104 1 cciss/c0d0p1 5817 5211 0 63484 055711 6279213 0 8832400 0 365500 9000180 104 2 cciss/c0d0p2 30000 10000 0 100000 5000000 10000000 0 10000000 0 7000000 10000000 + 202 240 xvdp 82 0 3096 82 0 0 0 0 0 52 44 0 0 0 0 + 202 4096 xvdq 52 0 2096 31 0 0 0 0 0 20 40 0 0 0 0 diff --git a/tests/root6/sys/block/_list b/tests/root6/sys/block/_list index d0c2d6b..cf17b42 100644 --- a/tests/root6/sys/block/_list +++ b/tests/root6/sys/block/_list @@ -7,3 +7,5 @@ sdc sdd sde sr0 +xvdp +xvdq diff --git a/tests/root6/sys/block/xvdp/_list b/tests/root6/sys/block/xvdp/_list new file mode 100644 index 0000000..1ccc5e2 --- /dev/null +++ b/tests/root6/sys/block/xvdp/_list @@ -0,0 +1,3 @@ +. +.. +device diff --git a/tests/root6/sys/block/xvdp/device/_void b/tests/root6/sys/block/xvdp/device/_void new file mode 100644 index 0000000..e69de29 diff --git a/tests/root6/sys/block/xvdp/stat b/tests/root6/sys/block/xvdp/stat new file mode 100644 index 0000000..bb8c94b --- /dev/null +++ b/tests/root6/sys/block/xvdp/stat @@ -0,0 +1 @@ +82 0 3096 82 0 0 0 0 0 52 44 0 0 0 0 diff --git a/tests/root6/sys/block/xvdq/_list b/tests/root6/sys/block/xvdq/_list new file mode 100644 index 0000000..1ccc5e2 --- /dev/null +++ b/tests/root6/sys/block/xvdq/_list @@ -0,0 +1,3 @@ +. +.. +device diff --git a/tests/root6/sys/block/xvdq/device/_void b/tests/root6/sys/block/xvdq/device/_void new file mode 100644 index 0000000..e69de29 diff --git a/tests/root6/sys/block/xvdq/stat b/tests/root6/sys/block/xvdq/stat new file mode 100644 index 0000000..9f0c81b --- /dev/null +++ b/tests/root6/sys/block/xvdq/stat @@ -0,0 +1 @@ +52 0 2096 31 0 0 0 0 0 20 40 0 0 0 0 diff --git a/tests/root6/sys/dev/block/202:240 b/tests/root6/sys/dev/block/202:240 new file mode 120000 index 0000000..bbd6dcd --- /dev/null +++ b/tests/root6/sys/dev/block/202:240 @@ -0,0 +1 @@ +../../block/xvdp \ No newline at end of file diff --git a/tests/root6/sys/dev/block/202:4096 b/tests/root6/sys/dev/block/202:4096 new file mode 120000 index 0000000..3a45c53 --- /dev/null +++ b/tests/root6/sys/dev/block/202:4096 @@ -0,0 +1 @@ +../../block/xvdq \ No newline at end of file diff --git a/tests/root7/dev/xvdp b/tests/root7/dev/xvdp new file mode 100644 index 0000000..efdd678 --- /dev/null +++ b/tests/root7/dev/xvdp @@ -0,0 +1 @@ +202 240 diff --git a/tests/root7/dev/xvdq b/tests/root7/dev/xvdq new file mode 100644 index 0000000..99d3136 --- /dev/null +++ b/tests/root7/dev/xvdq @@ -0,0 +1 @@ +202 4096 diff --git a/tests/root7/proc/devices b/tests/root7/proc/devices index 86b81a4..9b3f4b3 100644 --- a/tests/root7/proc/devices +++ b/tests/root7/proc/devices @@ -61,6 +61,7 @@ Block devices: 133 sd 134 sd 135 sd +202 xvd 253 device-mapper 254 mdp 259 blkext diff --git a/tests/root7/proc/diskstats b/tests/root7/proc/diskstats index ab39edb..809092b 100644 --- a/tests/root7/proc/diskstats +++ b/tests/root7/proc/diskstats @@ -16,3 +16,5 @@ 104 0 cciss/c0d0 45817 25211 0 263484 6055711 16279213 0 18832400 0 7365500 19000180 104 1 cciss/c0d0p1 5817 5211 0 63484 055711 6279213 0 8832400 0 365500 9000180 104 2 cciss/c0d0p2 40000 20000 0 200000 6000000 10000000 0 10000000 0 7000000 10000000 + 202 240 xvdp 92 0 4096 92 0 0 0 0 0 62 54 0 0 0 0 + 202 4096 xvdq 62 0 3096 41 0 0 0 0 0 30 50 0 0 0 0 diff --git a/tests/root7/sys/block/_list b/tests/root7/sys/block/_list index d0c2d6b..cf17b42 100644 --- a/tests/root7/sys/block/_list +++ b/tests/root7/sys/block/_list @@ -7,3 +7,5 @@ sdc sdd sde sr0 +xvdp +xvdq diff --git a/tests/root7/sys/block/xvdp/_list b/tests/root7/sys/block/xvdp/_list new file mode 100644 index 0000000..1ccc5e2 --- /dev/null +++ b/tests/root7/sys/block/xvdp/_list @@ -0,0 +1,3 @@ +. +.. +device diff --git a/tests/root7/sys/block/xvdp/device/_void b/tests/root7/sys/block/xvdp/device/_void new file mode 100644 index 0000000..e69de29 diff --git a/tests/root7/sys/block/xvdp/stat b/tests/root7/sys/block/xvdp/stat new file mode 100644 index 0000000..a3bb026 --- /dev/null +++ b/tests/root7/sys/block/xvdp/stat @@ -0,0 +1 @@ +92 0 4096 92 0 0 0 0 0 62 54 0 0 0 0 diff --git a/tests/root7/sys/block/xvdq/_list b/tests/root7/sys/block/xvdq/_list new file mode 100644 index 0000000..1ccc5e2 --- /dev/null +++ b/tests/root7/sys/block/xvdq/_list @@ -0,0 +1,3 @@ +. +.. +device diff --git a/tests/root7/sys/block/xvdq/device/_void b/tests/root7/sys/block/xvdq/device/_void new file mode 100644 index 0000000..e69de29 diff --git a/tests/root7/sys/block/xvdq/stat b/tests/root7/sys/block/xvdq/stat new file mode 100644 index 0000000..63d6479 --- /dev/null +++ b/tests/root7/sys/block/xvdq/stat @@ -0,0 +1 @@ +62 0 3096 41 0 0 0 0 0 30 50 0 0 0 0 diff --git a/tests/root7/sys/dev/block/202:240 b/tests/root7/sys/dev/block/202:240 new file mode 120000 index 0000000..bbd6dcd --- /dev/null +++ b/tests/root7/sys/dev/block/202:240 @@ -0,0 +1 @@ +../../block/xvdp \ No newline at end of file diff --git a/tests/root7/sys/dev/block/202:4096 b/tests/root7/sys/dev/block/202:4096 new file mode 120000 index 0000000..3a45c53 --- /dev/null +++ b/tests/root7/sys/dev/block/202:4096 @@ -0,0 +1 @@ +../../block/xvdq \ No newline at end of file