Merge pull request #10104 from ndeloof/logs_race_condition

fix race condition on compose logs
docker · Dec 20, 2022 · 7cf6d5e · 7cf6d5e
2 parents 89ef819 + 0ab5079
commit 7cf6d5e
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 11 deletions.
diff --git a/pkg/compose/logs.go b/pkg/compose/logs.go
@@ -65,6 +65,11 @@ func (s *composeService) Logs(
 
 	if options.Follow {
 		printer := newLogPrinter(consumer)
+		eg.Go(func() error {
+			_, err := printer.Run(false, "", nil)
+			return err
+		})
+
 		for _, c := range containers {
 			printer.HandleEvent(api.ContainerEvent{
 				Type:      api.ContainerEventAttach,
@@ -74,18 +79,15 @@ func (s *composeService) Logs(
 		}
 
 		eg.Go(func() error {
-			return s.watchContainers(ctx, projectName, options.Services, nil, printer.HandleEvent, containers, func(c types.Container) error {
+			err := s.watchContainers(ctx, projectName, options.Services, nil, printer.HandleEvent, containers, func(c types.Container) error {
 				printer.HandleEvent(api.ContainerEvent{
 					Type:      api.ContainerEventAttach,
 					Container: getContainerNameWithoutProject(c),
 					Service:   c.Labels[api.ServiceLabel],
 				})
 				return s.logContainers(ctx, consumer, c, options)
 			})
-		})
-
-		eg.Go(func() error {
-			_, err := printer.Run(ctx, false, "", nil)
+			printer.Stop()
 			return err
 		})
 	}

diff --git a/pkg/compose/printer.go b/pkg/compose/printer.go
@@ -17,7 +17,6 @@
 package compose
 
 import (
-	"context"
 	"fmt"
 
 	"github.com/docker/compose/v2/pkg/api"
@@ -26,7 +25,7 @@ import (
 // logPrinter watch application containers an collect their logs
 type logPrinter interface {
 	HandleEvent(event api.ContainerEvent)
-	Run(ctx context.Context, cascadeStop bool, exitCodeFrom string, stopFn func() error) (int, error)
+	Run(cascadeStop bool, exitCodeFrom string, stopFn func() error) (int, error)
 	Cancel()
 	Stop()
 }
@@ -64,7 +63,7 @@ func (p *printer) HandleEvent(event api.ContainerEvent) {
 }
 
 //nolint:gocyclo
-func (p *printer) Run(ctx context.Context, cascadeStop bool, exitCodeFrom string, stopFn func() error) (int, error) {
+func (p *printer) Run(cascadeStop bool, exitCodeFrom string, stopFn func() error) (int, error) {
 	var (
 		aborting bool
 		exitCode int
@@ -74,8 +73,6 @@ func (p *printer) Run(ctx context.Context, cascadeStop bool, exitCodeFrom string
 		select {
 		case <-p.stopCh:
 			return exitCode, nil
-		case <-ctx.Done():
-			return exitCode, ctx.Err()
 		case event := <-p.queue:
 			container := event.Container
 			switch event.Type {

diff --git a/pkg/compose/up.go b/pkg/compose/up.go
@@ -81,7 +81,7 @@ func (s *composeService) Up(ctx context.Context, project *types.Project, options
 	var exitCode int
 	eg, ctx := errgroup.WithContext(ctx)
 	eg.Go(func() error {
-		code, err := printer.Run(context.Background(), options.Start.CascadeStop, options.Start.ExitCodeFrom, stopFunc)
+		code, err := printer.Run(options.Start.CascadeStop, options.Start.ExitCodeFrom, stopFunc)
 		exitCode = code
 		return err
 	})