kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

builder: do not send duplicate status for completed jobs

Browse source 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
This commit is contained in:
Tonis Tiigi 2018-07-03 14:46:43 -07:00
parent 6273dffbda
commit 6f7dd9428e
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
builder/builder-next/adapters/containerimage/pull.go
View file

@ -644,7 +644,7 @@ func showProgress(ctx context.Context, ongoing *jobs, cs content.Store, pw progr
// featured. // featured.
type jobs struct { type jobs struct {
name string name string
added map[digest.Digest]job added map[digest.Digest]*job
mu sync.Mutex mu sync.Mutex
resolved bool resolved bool
} }
@ -658,7 +658,7 @@ type job struct {
func newJobs(name string) *jobs { func newJobs(name string) *jobs {
return &jobs{ return &jobs{
name: name, 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 { if _, ok := j.added[desc.Digest]; ok {
return return
} }
j.added[desc.Digest] = job{ j.added[desc.Digest] = &job{
Descriptor: desc, Descriptor: desc,
started: time.Now(), started: time.Now(),
} }
} }
func (j *jobs) jobs() []job { func (j *jobs) jobs() []*job {
j.mu.Lock() j.mu.Lock()
defer j.mu.Unlock() defer j.mu.Unlock()
descs := make([]job, 0, len(j.added)) descs := make([]*job, 0, len(j.added))
for _, j := range j.added { for _, j := range j.added {
descs = append(descs, j) descs = append(descs, j)
} }