scriptoriumadmin/featurebase
1
0
Fork 0
mirror of https://github.com/featurebasedb/featurebase.git synced 2026-10-07 11:27:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

move gossip code to separate package

Browse source
This commit is contained in:
Matt Jaffee 2017-04-18 08:41:23 -05:00 • committed by Travis
parent 059403e673
commit c4d3bde501
2 changed files with 14 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
gossip.go → gossip/gossip.go
View file

@ -1,4 +1,4 @@
package pilosa
package gossip
import (
"fmt"
@ -10,6 +10,7 @@ import (
"github.com/gogo/protobuf/proto"
"github.com/hashicorp/memberlist"
"github.com/pilosa/pilosa"
"github.com/pilosa/pilosa/internal"
)
@ -26,7 +27,7 @@ type StateHandler interface {
// GossipNodeSet also represents an implementation of memberlist.Delegate
type GossipNodeSet struct {
memberlist *memberlist.Memberlist
handler BroadcastHandler
handler pilosa.BroadcastHandler
broadcasts *memberlist.TransmitLimitedQueue
@ -37,15 +38,15 @@ type GossipNodeSet struct {
LogOutput io.Writer
}
func (g *GossipNodeSet) Nodes() []*Node {
a := make([]*Node, 0, g.memberlist.NumMembers())
func (g *GossipNodeSet) Nodes() []*pilosa.Node {
a := make([]*pilosa.Node, 0, g.memberlist.NumMembers())
for _, n := range g.memberlist.Members() {
a = append(a, &Node{Host: n.Name})
a = append(a, &pilosa.Node{Host: n.Name})
}
return a
}
func (g *GossipNodeSet) Start(h BroadcastHandler) error {
func (g *GossipNodeSet) Start(h pilosa.BroadcastHandler) error {
g.handler = h
return nil
}
@ -61,8 +62,8 @@ func (g *GossipNodeSet) Open() error {
g.memberlist = ml
// attach to gossip seed node
nodes := []*Node{&Node{Host: g.config.gossipSeed}} //TODO: support a list of seeds
_, err = g.memberlist.Join(Nodes(nodes).Hosts())
nodes := []*pilosa.Node{&pilosa.Node{Host: g.config.gossipSeed}} //TODO: support a list of seeds
_, err = g.memberlist.Join(pilosa.Nodes(nodes).Hosts())
if err != nil {
return err
}
@ -112,7 +113,7 @@ func NewGossipNodeSet(name string, gossipHost string, gossipPort int, gossipSeed
// SendSync implementation of the Broadcaster interface
func (g *GossipNodeSet) SendSync(pb proto.Message) error {
msg, err := MarshalMessage(pb)
msg, err := pilosa.MarshalMessage(pb)
if err != nil {
return err
}
@ -140,7 +141,7 @@ func (g *GossipNodeSet) SendSync(pb proto.Message) error {
// SendAsync implementation of the Broadcaster interface
func (g *GossipNodeSet) SendAsync(pb proto.Message) error {
msg, err := MarshalMessage(pb)
msg, err := pilosa.MarshalMessage(pb)
if err != nil {
return err
}
@ -166,7 +167,7 @@ func (g *GossipNodeSet) NodeMeta(limit int) []byte {
}
func (g *GossipNodeSet) NotifyMsg(b []byte) {
m, err := UnmarshalMessage(b)
m, err := pilosa.UnmarshalMessage(b)
if err != nil {
g.logger().Printf("unmarshal message error: %s", err)
return

3
server/server.go
View file

@ -17,6 +17,7 @@ import (
"time"
"github.com/pilosa/pilosa"
"github.com/pilosa/pilosa/gossip"
)
func init() {
@ -143,7 +144,7 @@ func (m *Command) SetupServer() error {
if err != nil {
gossipHost = m.Config.Host
}
gossipNodeSet := pilosa.NewGossipNodeSet(m.Config.Host, gossipHost, gossipPort, gossipSeed, m.Server)
gossipNodeSet := gossip.NewGossipNodeSet(m.Config.Host, gossipHost, gossipPort, gossipSeed, m.Server)
m.Server.Cluster.NodeSet = gossipNodeSet
m.Server.Broadcaster = gossipNodeSet
m.Server.BroadcastReceiver = gossipNodeSet