IntenseWebs/opentofu
3
0
Fork 0
mirror of https://github.com/opentofu/opentofu.git synced 2025-02-20 11:48:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix race with multiple calls to cmd.Wait()

Browse Source 
There was still a race around the local-exec Command, where we were
calling Wait in 2 places which you can't do.
This commit is contained in:
James Bardin 2017-01-31 18:07:26 -05:00
parent a4687c5b36
commit e0325d9b8f
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
builtin/provisioners/local-exec/resource_provisioner.go
View File

@ -59,6 +59,8 @@ func applyFn(ctx context.Context) error {
// Setup the command // Setup the command
cmd := exec.Command(shell, flag, command) cmd := exec.Command(shell, flag, command)
// TODO: use exec.CommandContext when cancelation is fixed in Go
output, _ := circbuf.NewBuffer(maxBufSize) output, _ := circbuf.NewBuffer(maxBufSize)
cmd.Stderr = io.MultiWriter(output, pw) cmd.Stderr = io.MultiWriter(output, pw)
cmd.Stdout = io.MultiWriter(output, pw) cmd.Stdout = io.MultiWriter(output, pw)
@ -82,7 +84,7 @@ func applyFn(ctx context.Context) error {
case err = <-doneCh: case err = <-doneCh:
case <-ctx.Done(): case <-ctx.Done():
cmd.Process.Kill() cmd.Process.Kill()
err = cmd.Wait() err = <-doneCh
} }
} }