unistack-org/micro
4
0
Fork 2
Code Issues 18 Pull Requests Actions 1 Packages Projects Releases 331 Wiki Activity

fix data race

Browse Source
This commit is contained in:
Asim Aslam
2019-02-01 09:05:03 +00:00
parent 7888d3e13d
commit 652b1067f5
1 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
registry/gossip/util.go
View File

@@ -70,21 +70,30 @@ func addNodes(old, neu []*registry.Node) []*registry.Node {
} }
func addServices(old, neu []*registry.Service) []*registry.Service { func addServices(old, neu []*registry.Service) []*registry.Service {
var srv []*registry.Service
for _, s := range neu { for _, s := range neu {
var seen bool var seen bool
for i, o := range old { for _, o := range old {
if o.Version == s.Version { if o.Version == s.Version {
s.Nodes = addNodes(o.Nodes, s.Nodes) var sp *registry.Service
// make copy
*sp = *o
// set nodes
sp.Nodes = addNodes(o.Nodes, s.Nodes)
// mark as seen
seen = true seen = true
old[i] = s srv = append(srv, sp)
break break
} }
} }
if !seen { if !seen {
old = append(old, s) srv = append(srv, cp([]*registry.Service{s})...)
} }
} }
return old
return srv
} }
func delNodes(old, del []*registry.Node) []*registry.Node { func delNodes(old, del []*registry.Node) []*registry.Node {