Skip to content
Snippets Groups Projects
Commit 4f3a0b53 authored by Sergey Joseph Ivanov's avatar Sergey Joseph Ivanov
Browse files

one more fix 

0B is not numerical, drop 'B'
parent 8ffeef58
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 4 additions and 4 deletions
lib/Site/ZpoolScrub.pm
+ 4
− 4
View file @ 4f3a0b53
...@@ -105,7 +105,7 @@ sub handler { ...@@ -105,7 +105,7 @@ sub handler {
=pod =pod
scan: scrub repaired 0B in 0 days 09:55:51 with 0 errors on Thu Mar 7 01:46:05 2019 scan: scrub repaired 0B in 0 days 09:55:51 with 0 errors on Thu Mar 7 01:46:05 2019
=cut =cut
elsif (/^\s*scan:\s+scrub\s+repaired\s+(\d*B*)\D*\s+in\s+(\d*)\s+days\s+(\d*):(\d*):(\d*)\s+with\s+(\d*)\s+errors\s+on\s+(.+)$/){ elsif (/^\s*scan:\s+scrub\s+repaired\s+(\d*)B*\D*\s+in\s+(\d*)\s+days\s+(\d*):(\d*):(\d*)\s+with\s+(\d*)\s+errors\s+on\s+(.+)$/){
($repaired,$days,$h,$m,$s,$errors,$when) = ($1,$2,$3,$4,$5,$6,$7); ($repaired,$days,$h,$m,$s,$errors,$when) = ($1,$2,$3,$4,$5,$6,$7);
$when = `$DATE '+%s'` - `$DATE '+%s' -d "$when"`; $when = `$DATE '+%s'` - `$DATE '+%s' -d "$when"`;
$howlong = $m+60*($h+24*$days); $howlong = $m+60*($h+24*$days);
...@@ -117,7 +117,7 @@ sub handler { ...@@ -117,7 +117,7 @@ sub handler {
- or - - or -
scan: scrub repaired 0B in 14:02:48 with 0 errors on Fri Oct 1 16:02:50 2021 scan: scrub repaired 0B in 14:02:48 with 0 errors on Fri Oct 1 16:02:50 2021
=cut =cut
elsif (/^\s*scan:\s+scrub\s+repaired\s+(\d*B*)\s+in\s+(\d*)[h\:](\d*)[m\:](\d*)\s+with\s+(\d*)\s+errors\s+on\s+(.+)$/){ elsif (/^\s*scan:\s+scrub\s+repaired\s+(\d*)B*\s+in\s+(\d*)[h\:](\d*)[m\:](\d*)\s+with\s+(\d*)\s+errors\s+on\s+(.+)$/){
($repaired,$h,$m,$s,$errors,$when) = ($1,$2,$3,$4,$5,$6); ($repaired,$h,$m,$s,$errors,$when) = ($1,$2,$3,$4,$5,$6);
$when = `$DATE '+%s'` - `$DATE '+%s' -d "$when"`; $when = `$DATE '+%s'` - `$DATE '+%s' -d "$when"`;
$howlong = 60*$h+$m; $howlong = 60*$h+$m;
...@@ -168,8 +168,8 @@ sub handler { ...@@ -168,8 +168,8 @@ sub handler {
451G scanned at 2.17G/s, 2.13M issued at 10.5K/s, 19.6T total 451G scanned at 2.17G/s, 2.13M issued at 10.5K/s, 19.6T total
0B resilvered, 0.00% done, no estimated completion time 0B resilvered, 0.00% done, no estimated completion time
=cut =cut
elsif ( (/^\s*(\d+B*)\s+repaired,/) or elsif ( (/^\s*(\d+)B*\s+repaired,/) or
(/^\s*(\d+B*)\s+resilvered,/) (/^\s*(\d+)B*\s+resilvered,/)
){ ){
$repaired = $1; $repaired = $1;
} }
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment