percona/percona-toolkit
1
0
Fork 0
mirror of https://github.com/percona/percona-toolkit.git synced 2025-09-12 22:19:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

PT-2313 - pt-diskstat fails with new kernels again

Browse Source 
- Ported fix for PT-1887
- Added test case
This commit is contained in:
Sveta Smirnova
2024-03-15 19:15:51 +03:00
parent d813b4fbcf
commit 2df691d913
6 changed files with 136 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/Diskstats.pm
View File

@@ -571,9 +571,13 @@ sub design_print_formats {
sub parse_diskstats_line {
my ( $self, $line, $block_size ) = @_;
# Since we assume that device names can't have spaces.
# linux kernel source => Documentation/iostats.txt
# 2.6+ => 14 fields
# 4.18+ => 18 fields
# 5.x+ => 20 fields (PT-1887)
my @num_fields = (14, 18, 20);
my @dev_stats = split ' ', $line;
return unless @dev_stats == 14;
return unless grep {$_ == scalar(@dev_stats)} @num_fields;
my $read_bytes = $dev_stats[READ_SECTORS] * $block_size;
my $written_bytes = $dev_stats[WRITTEN_SECTORS] * $block_size;