scriptoriumadmin/featurebase
1
0
Fork 0
mirror of https://github.com/featurebasedb/featurebase.git synced 2026-08-28 10:54:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Change Seeds() to GetBindAddr() to clarify GossipMemberSet testing.

Browse source
This commit is contained in:
Travis Turner 2018-03-23 16:34:19 -05:00
parent 8686a8645c
commit 0ca7cfe498
No known key found for this signature in database
GPG key ID: 7F08008DFD9314C9
2 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
gossip/gossip.go
View file

@ -61,12 +61,11 @@ func (g *GossipMemberSet) Start(h pilosa.BroadcastHandler) error {
return nil
}
// Seeds returns the gossipSeeds determined by the config.
func (g *GossipMemberSet) Seeds() []string {
if len(g.config.gossipSeeds) == 0 {
return []string{fmt.Sprintf("%s:%d", g.config.memberlistConfig.BindAddr, g.config.memberlistConfig.BindPort)}
}
return g.config.gossipSeeds
// GetBindAddr returns the gossip bind address based on config and auto bind port.
// This method is currently only used in a test scenario where a second node needs
// the auto-bind address of the first node to use as its gossip seed.
func (g *GossipMemberSet) GetBindAddr() string {
return fmt.Sprintf("%s:%d", g.config.memberlistConfig.BindAddr, g.config.memberlistConfig.BindPort)
}
// Open implements the MemberSet interface to start network activity.

2
server/cluster_test.go
View file

@ -78,7 +78,7 @@ func TestMain_SendReceiveMessage(t *testing.T) {
// get the host portion of addr to use for binding
m1.Config.Gossip.Port = "0"
m1.Config.Gossip.Seeds = gossipMemberSet0.Seeds()
m1.Config.Gossip.Seeds = []string{gossipMemberSet0.GetBindAddr()}
m1.Server.Cluster.Coordinator = m0.Server.NodeID
m1.Server.Cluster.EventReceiver = gossip.NewGossipEventReceiver(m1.Server.LogOutput)