Merge pull request #2963 from hashicorp/b-dag-errs-should-cascade

core: dag errors should cascade to all descendents
This commit is contained in:
Paul Hinze 2015-08-07 12:45:10 -05:00
commit 107e2465c7
2 changed files with 6 additions and 3 deletions

View File

@ -195,7 +195,7 @@ func (g *AcyclicGraph) Walk(cb WalkFunc) error {
// Start the goroutine to wait for our dependencies
readyCh := make(chan bool)
go func(deps []Vertex, chs []<-chan struct{}, readyCh chan<- bool) {
go func(v Vertex, deps []Vertex, chs []<-chan struct{}, readyCh chan<- bool) {
// First wait for all the dependencies
for _, ch := range chs {
<-ch
@ -206,13 +206,14 @@ func (g *AcyclicGraph) Walk(cb WalkFunc) error {
defer errLock.Unlock()
for _, dep := range deps {
if errMap[dep] {
errMap[v] = true
readyCh <- false
return
}
}
readyCh <- true
}(deps, depChs, readyCh)
}(v, deps, depChs, readyCh)
// Start the goroutine that executes
go func(v Vertex, doneCh chan<- struct{}, readyCh <-chan bool) {

View File

@ -226,8 +226,10 @@ func TestAcyclicGraphWalk_error(t *testing.T) {
g.Add(1)
g.Add(2)
g.Add(3)
g.Add(4)
g.Connect(BasicEdge(4, 3))
g.Connect(BasicEdge(3, 2))
g.Connect(BasicEdge(3, 1))
g.Connect(BasicEdge(2, 1))
var visits []Vertex
var lock sync.Mutex