resilien
/
terraform
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

terraform: acquire stopCh outside goroutine to ensure in lock

This commit is contained in:
Mitchell Hashimoto 2017-01-30 08:49:07 -08:00
parent 00232f0994
commit 3e771a674c
No known key found for this signature in database
GPG Key ID: 744E147AA52F5B0A
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
terraform/context.go
View File

@ -811,7 +811,8 @@ func (c *Context) walk(
// Watch for a stop so we can call the provider Stop() API.
doneCh := make(chan struct{})
go c.watchStop(walker, doneCh)
stopCh := c.runContext.Done()
go c.watchStop(walker, doneCh, stopCh)
// Walk the real graph, this will block until it completes
realErr := graph.Walk(walker)
@ -906,12 +907,7 @@ func (c *Context) walk(
return walker, realErr
}
func (c *Context) watchStop(walker *ContextGraphWalker, doneCh <-chan struct{}) {
// Get the stop channel. runContext will never be nil since this should
// only be called within the context of an operation started with
// acquireRun
stopCh := c.runContext.Done()
func (c *Context) watchStop(walker *ContextGraphWalker, doneCh, stopCh <-chan struct{}) {
// Wait for a stop or completion
select {
case <-stopCh: