Run stopProcesses in a goroutine when called from the main goroutine

The errors channel is unbuffered, so stopProcesses cannot deliver errors if it is running from the same goroutine as the receiver. Signed-off-by: Jan Dubois <[email protected]>
cloudfoundry-incubator · May 11, 2021 · 2776822 · 2776822
1 parent 3b5b6bb
commit 2776822
Showing 1 changed file with 2 additions and 10 deletions.
diff --git a/pkg/containerrun/containerrun.go b/pkg/containerrun/containerrun.go
@@ -170,7 +170,8 @@ func RunWithTestChan(
 					// signals.
 
 					active = false
-					stopProcesses(processRegistry, errors)
+					// Run asynchronously so we can receive errors
+					go stopProcesses(processRegistry, errors)
 				}
 			case ProcessStart:
 				if !active {
@@ -277,12 +278,6 @@ func handlePacket(
 }
 
 func stopProcesses(processRegistry *ProcessRegistry, errors chan<- error) {
-	// Run the code in a separate goroutine because the errors channel is
-	// unbuffered, so we can't write to it from the same goroutine that
-	// will be reading from it.
-	var wg sync.WaitGroup
-	wg.Add(1)
-	go func() {
 		log.Debugln("sending SIGTERM")
 		for _, err := range processRegistry.SignalAll(syscall.SIGTERM) {
 			errors <- err
@@ -293,9 +288,6 @@ func stopProcesses(processRegistry *ProcessRegistry, errors chan<- error) {
 			log.Debugln("timeout SIGTERM")
 			processRegistry.KillAll()
 		})
-		wg.Done()
-	}()
-	wg.Wait()
 }
 
 func startProcesses(