Merge pull request #18412 from aaronlehmann/runcommand-race

Fix race in RunCommandWithOutputForDuration

integration/utils.go

@@ -104,19 +104,25 @@ func RunCommandWithOutputForDuration(cmd *exec.Cmd, duration time.Duration) (out
 	}
 	cmd.Stderr = &outputBuffer
 
-	done := make(chan error)
-
 	// Start the command in the main thread..
 	err = cmd.Start()
 	if err != nil {
 		err = fmt.Errorf("Fail to start command %v : %v", cmd, err)
 	}
 
+	type exitInfo struct {
+		exitErr  error
+		exitCode int
+	}
+
+	done := make(chan exitInfo, 1)
+
 	go func() {
 		// And wait for it to exit in the goroutine :)
-		exitErr := cmd.Wait()
+		info := exitInfo{}
-		exitCode = ProcessExitCode(exitErr)
+		info.exitErr = cmd.Wait()
-		done <- exitErr
+		info.exitCode = ProcessExitCode(info.exitErr)
+		done <- info
 	}()
 
 	select {
@@ -126,9 +132,9 @@ func RunCommandWithOutputForDuration(cmd *exec.Cmd, duration time.Duration) (out
 			fmt.Printf("failed to kill (pid=%d): %v\n", cmd.Process.Pid, killErr)
 		}
 		timedOut = true
-		break
+	case info := <-done:
-	case err = <-done:
+		err = info.exitErr
-		break
+		exitCode = info.exitCode
 	}
 	output = outputBuffer.String()
 	return