From 8ffeef58fdbda48819e62315eab0956e8e94231a Mon Sep 17 00:00:00 2001
From: Sergey Ivanov <seriv@omnia.spectr.org>
Date: Sun, 3 Oct 2021 22:48:19 -0400
Subject: [PATCH] one more fix
---
lib/Site/ZpoolScrub.pm | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/lib/Site/ZpoolScrub.pm b/lib/Site/ZpoolScrub.pm
index 0ffb98f..38531e5 100644
--- a/lib/Site/ZpoolScrub.pm
+++ b/lib/Site/ZpoolScrub.pm
@@ -125,7 +125,7 @@ sub handler {
$when = int(($when+30)/60);
$repaired += $errors if $repaired < $errors;
$togo = 0;
- `$ECHO -n $howlong > $statusfile` unless $howlong == $oldhowlong && (-w $statusfile);
+ `$ECHO -n $howlong > $statusfile` unless $howlong == $oldhowlong && (not ( -w $statusfile) );
}
elsif ( (/^\s*scan:\s+scrub\s+in\s+progress\s+since\s+(.+)$/) or
(/^\s*scan:\s+resilver\s+in\s+progress\s+since\s+(.+)$/)
@@ -174,6 +174,9 @@ sub handler {
$repaired = $1;
}
}
+ if ( ( $togo > 0 ) && ( $howlong == 0 ) ) {
+ $howlong = $when + $togo
+ }
return {
"when" => [$when, "i"],
"howlong" => [$howlong, "i"],
--
GitLab