lib/fs, lib/model: Be careful about potentially negative durations (fixes #9112) (#9113)

I don't really understand under what circumstances, but sometimes these
calls panic with a "panic: counter cannot decrease in value" because the
value passed to Add() was negative.
This commit is contained in:
Jakob Borg
2023-09-20 09:04:47 +02:00
committed by GitHub
parent 58d1f3a471
commit 051cbdc713
2 changed files with 9 additions and 3 deletions
+6 -2
View File
@@ -158,7 +158,9 @@ func inWritableDir(fn func(string) error, targetFs fs.Filesystem, path string, i
func addTimeUntilCancelled(ctx context.Context, counter prometheus.Counter) {
t0 := time.Now()
defer func() {
counter.Add(time.Since(t0).Seconds())
if dur := time.Since(t0).Seconds(); dur > 0 {
counter.Add(dur)
}
}()
ticker := time.NewTicker(time.Second)
@@ -167,7 +169,9 @@ func addTimeUntilCancelled(ctx context.Context, counter prometheus.Counter) {
for {
select {
case t := <-ticker.C:
counter.Add(t.Sub(t0).Seconds())
if dur := t.Sub(t0).Seconds(); dur > 0 {
counter.Add(dur)
}
t0 = t
case <-ctx.Done():
return