Merge pull request #47314 from thaJeztah/24.0_backport_libc8d_fix_startup_data_race

[24.0 backport] libcontainerd/supervisor: fix data race
2024-02-03 14:38:17 +01:00 · 2024-02-03 14:38:17 +01:00 · a9f4dd168e
commit a9f4dd168e
parent fca702de7f d22068f8e3
1 changed files with 3 additions and 2 deletions
--- a/libcontainerd/supervisor/remote_daemon.go
+++ b/libcontainerd/supervisor/remote_daemon.go
@ -185,12 +185,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")