Merge pull request #4183 from tonistiigi/pull-neg-time

pull: fix possible negative blob pull time
moby · Aug 29, 2023 · 9bfc68c · 9bfc68c
2 parents eddfcd5 + 641c552
commit 9bfc68c
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/util/pull/pullprogress/progress.go b/util/pull/pullprogress/progress.go
@@ -129,6 +129,10 @@ func trackProgress(ctx context.Context, desc ocispecs.Descriptor, manager PullMa
 
 		info, err := manager.Info(ctx, desc.Digest)
 		if err == nil {
+			// info.CreatedAt could be before started if parallel pull just completed
+			if info.CreatedAt.Before(started) {
+				started = info.CreatedAt
+			}
 			pw.Write(desc.Digest.String(), progress.Status{
 				Current:   int(info.Size),
 				Total:     int(info.Size),