From 6f7dd9428e2134239467815c51aaab85756adb11 Mon Sep 17 00:00:00 2001 From: Tonis Tiigi Date: Tue, 3 Jul 2018 14:46:43 -0700 Subject: [PATCH] builder: do not send duplicate status for completed jobs Signed-off-by: Tonis Tiigi --- builder/builder-next/adapters/containerimage/pull.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/builder/builder-next/adapters/containerimage/pull.go b/builder/builder-next/adapters/containerimage/pull.go index f76ac5a1aa..2b6c214b8b 100644 --- a/builder/builder-next/adapters/containerimage/pull.go +++ b/builder/builder-next/adapters/containerimage/pull.go @@ -644,7 +644,7 @@ func showProgress(ctx context.Context, ongoing *jobs, cs content.Store, pw progr // featured. type jobs struct { name string - added map[digest.Digest]job + added map[digest.Digest]*job mu sync.Mutex resolved bool } @@ -658,7 +658,7 @@ type job struct { func newJobs(name string) *jobs { return &jobs{ name: name, - added: make(map[digest.Digest]job), + added: make(map[digest.Digest]*job), } } @@ -669,17 +669,17 @@ func (j *jobs) add(desc ocispec.Descriptor) { if _, ok := j.added[desc.Digest]; ok { return } - j.added[desc.Digest] = job{ + j.added[desc.Digest] = &job{ Descriptor: desc, started: time.Now(), } } -func (j *jobs) jobs() []job { +func (j *jobs) jobs() []*job { j.mu.Lock() defer j.mu.Unlock() - descs := make([]job, 0, len(j.added)) + descs := make([]*job, 0, len(j.added)) for _, j := range j.added { descs = append(descs, j) }