kemko/nomad
1
0
Fork 0
mirror of https://github.com/kemko/nomad.git synced 2026-01-08 19:35:41 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7542 from jorgemarey/b-fix-lockedUpstreamsUpdate

Browse Source 
Add new setUpstreamsLocked function to avoid blocking on Update
This commit is contained in:
Seth Hoenig
2020-03-30 11:27:32 -06:00
committed by GitHub
parent 7a389fd9bd a3aa03acf0
commit dfb55132d3
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
client/taskenv/env.go
View File

@@ -656,7 +656,7 @@ func (b *Builder) setAlloc(alloc *structs.Allocation) *Builder {
}
}
if len(upstreams) > 0 {
b.SetUpstreams(upstreams)
b.setUpstreamsLocked(upstreams)
}
return b
@@ -752,8 +752,12 @@ func buildPortEnv(envMap map[string]string, p structs.Port, ip string, driverNet
// SetUpstreams defined by connect enabled group services
func (b *Builder) SetUpstreams(upstreams []structs.ConsulUpstream) *Builder {
b.mu.Lock()
defer b.mu.Unlock()
return b.setUpstreamsLocked(upstreams)
}
func (b *Builder) setUpstreamsLocked(upstreams []structs.ConsulUpstream) *Builder {
b.upstreams = upstreams
b.mu.Unlock()
return b
}