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

terraform: shadow graph runs in sequence after the real graph

This commit is contained in:
Mitchell Hashimoto 2016-10-06 10:49:52 -07:00
parent a355d4ad55
commit 61c789aace
No known key found for this signature in database
GPG Key ID: 744E147AA52F5B0A
1 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
terraform/context.go
View File

@ -613,27 +613,12 @@ func (c *Context) walk(
// If we have a shadow graph, walk that as well // If we have a shadow graph, walk that as well
var shadowCtx *Context var shadowCtx *Context
var shadowCh chan error
var shadowCloser Shadow var shadowCloser Shadow
if shadow != nil { if shadow != nil {
// Build the shadow context. In the process, override the real context // Build the shadow context. In the process, override the real context
// with the one that is wrapped so that the shadow context can verify // with the one that is wrapped so that the shadow context can verify
// the results of the real. // the results of the real.
realCtx, shadowCtx, shadowCloser = newShadowContext(c) realCtx, shadowCtx, shadowCloser = newShadowContext(c)
// Build the graph walker for the shadow.
shadowWalker := &ContextGraphWalker{
Context: shadowCtx,
Operation: operation,
}
// Kick off the shadow walk. This will block on any operations
// on the real walk so it is fine to start first.
shadowCh = make(chan error)
go func() {
log.Printf("[INFO] Starting shadow graph walk: %s", operation.String())
shadowCh <- shadow.Walk(shadowWalker)
}()
} }
// Build the real graph walker // Build the real graph walker
@ -645,6 +630,20 @@ func (c *Context) walk(
// If we have a shadow graph, wait for that to complete // If we have a shadow graph, wait for that to complete
if shadowCloser != nil { if shadowCloser != nil {
// Build the graph walker for the shadow.
shadowWalker := &ContextGraphWalker{
Context: shadowCtx,
Operation: operation,
}
// Kick off the shadow walk. This will block on any operations
// on the real walk so it is fine to start first.
shadowCh := make(chan error)
go func() {
log.Printf("[INFO] Starting shadow graph walk: %s", operation.String())
shadowCh <- shadow.Walk(shadowWalker)
}()
// Notify the shadow that we're done // Notify the shadow that we're done
if err := shadowCloser.CloseShadow(); err != nil { if err := shadowCloser.CloseShadow(); err != nil {
c.shadowErr = multierror.Append(c.shadowErr, err) c.shadowErr = multierror.Append(c.shadowErr, err)