Browse code

builder: do not send duplicate status for completed jobs

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>

Tonis Tiigi authored on 2018/07/04 06:46:43
Showing 1 changed files
... ...
@@ -644,7 +644,7 @@ func showProgress(ctx context.Context, ongoing *jobs, cs content.Store, pw progr
644 644
 // featured.
645 645
 type jobs struct {
646 646
 	name     string
647
-	added    map[digest.Digest]job
647
+	added    map[digest.Digest]*job
648 648
 	mu       sync.Mutex
649 649
 	resolved bool
650 650
 }
... ...
@@ -658,7 +658,7 @@ type job struct {
658 658
 func newJobs(name string) *jobs {
659 659
 	return &jobs{
660 660
 		name:  name,
661
-		added: make(map[digest.Digest]job),
661
+		added: make(map[digest.Digest]*job),
662 662
 	}
663 663
 }
664 664
 
... ...
@@ -669,17 +669,17 @@ func (j *jobs) add(desc ocispec.Descriptor) {
669 669
 	if _, ok := j.added[desc.Digest]; ok {
670 670
 		return
671 671
 	}
672
-	j.added[desc.Digest] = job{
672
+	j.added[desc.Digest] = &job{
673 673
 		Descriptor: desc,
674 674
 		started:    time.Now(),
675 675
 	}
676 676
 }
677 677
 
678
-func (j *jobs) jobs() []job {
678
+func (j *jobs) jobs() []*job {
679 679
 	j.mu.Lock()
680 680
 	defer j.mu.Unlock()
681 681
 
682
-	descs := make([]job, 0, len(j.added))
682
+	descs := make([]*job, 0, len(j.added))
683 683
 	for _, j := range j.added {
684 684
 		descs = append(descs, j)
685 685
 	}