Merge pull request #784 from jaffee/782-gossip-race

re-arrange GossipNodeSet.Open to hopefully avoid race
This commit is contained in:
Matthew Jaffee 2017-08-22 11:09:56 -05:00 committed by GitHub
commit 659df6d428

View file

@ -69,6 +69,12 @@ func (g *GossipNodeSet) Open() error {
return err
}
g.memberlist = ml
g.broadcasts = &memberlist.TransmitLimitedQueue{
NumNodes: func() int {
return ml.NumMembers()
},
RetransmitMult: 3,
}
// attach to gossip seed node
nodes := []*pilosa.Node{&pilosa.Node{Host: g.config.gossipSeed}} //TODO: support a list of seeds
@ -76,12 +82,6 @@ func (g *GossipNodeSet) Open() error {
if err != nil {
return err
}
g.broadcasts = &memberlist.TransmitLimitedQueue{
NumNodes: func() int {
return ml.NumMembers()
},
RetransmitMult: 3,
}
return nil
}