From 4f3a0b53f355eac4c2d444922f366bb3d70268cc Mon Sep 17 00:00:00 2001
From: sergey ivanov <seriv@cs.umd.edu>
Date: Mon, 4 Oct 2021 17:07:16 -0400
Subject: [PATCH] one more fix
0B is not numerical, drop 'B'
---
lib/Site/ZpoolScrub.pm | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/lib/Site/ZpoolScrub.pm b/lib/Site/ZpoolScrub.pm
index 38531e5..86a3b36 100644
--- a/lib/Site/ZpoolScrub.pm
+++ b/lib/Site/ZpoolScrub.pm
@@ -105,7 +105,7 @@ sub handler {
=pod
scan: scrub repaired 0B in 0 days 09:55:51 with 0 errors on Thu Mar 7 01:46:05 2019
=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);
$when = `$DATE '+%s'` - `$DATE '+%s' -d "$when"`;
$howlong = $m+60*($h+24*$days);
@@ -117,7 +117,7 @@ sub handler {
- or -
scan: scrub repaired 0B in 14:02:48 with 0 errors on Fri Oct 1 16:02:50 2021
=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);
$when = `$DATE '+%s'` - `$DATE '+%s' -d "$when"`;
$howlong = 60*$h+$m;
@@ -168,8 +168,8 @@ sub handler {
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
=cut
- elsif ( (/^\s*(\d+B*)\s+repaired,/) or
- (/^\s*(\d+B*)\s+resilvered,/)
+ elsif ( (/^\s*(\d+)B*\s+repaired,/) or
+ (/^\s*(\d+)B*\s+resilvered,/)
){
$repaired = $1;
}
--
GitLab