From 641c552f95aade7eef1f9772c0fc2e5d04ad89ff Mon Sep 17 00:00:00 2001 From: Tonis Tiigi Date: Mon, 28 Aug 2023 20:20:28 -0700 Subject: [PATCH] pull: fix possible negative blob pull time Signed-off-by: Tonis Tiigi --- util/pull/pullprogress/progress.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/util/pull/pullprogress/progress.go b/util/pull/pullprogress/progress.go index ee8fcadb20f0..5ae047dbf549 100644 --- 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),