Merge pull request #47313 from thaJeztah/25.0_backport_libc8d_fix_sta…

…rtup_data_race [25.0 backport] libcontainerd/supervisor: fix data race
moby · Feb 3, 2024 · 341a797 · 341a797
2 parents 10e3bfd + c12bbf5
commit 341a797
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/libcontainerd/supervisor/remote_daemon.go b/libcontainerd/supervisor/remote_daemon.go
@@ -190,12 +190,13 @@ func (r *remote) startContainerd() error {
 		runtime.LockOSThread()
 		defer runtime.UnlockOSThread()
 		err := cmd.Start()
-		startedCh <- err
 		if err != nil {
+			startedCh <- err
 			return
 		}
-
 		r.daemonWaitCh = make(chan struct{})
+		startedCh <- nil
+
 		// Reap our child when needed
 		if err := cmd.Wait(); err != nil {
 			r.logger.WithError(err).Errorf("containerd did not exit successfully")