scriptoriumadmin/featurebase
1
0
Fork 0
mirror of https://github.com/featurebasedb/featurebase.git synced 2026-09-12 15:51:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Unexport Topology.ClusterID

Browse source
This commit is contained in:
Cody Soyland 2018-07-05 21:54:49 -05:00
parent 9c160ee65e
commit 1af66417e1
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
cluster.go
View file

@ -364,7 +364,7 @@ func (c *cluster) setID(id string) {
c.id = id
// Make sure the Topology is updated.
c.Topology.ClusterID = c.id
c.Topology.clusterID = c.id
}
func (c *cluster) State() string {
@ -818,7 +818,7 @@ func (c *cluster) setup() error {
return errors.Wrap(err, "loading topology")
}
c.id = c.Topology.ClusterID
c.id = c.Topology.clusterID
// Only the coordinator needs to consider the .topology file.
if c.isCoordinator() {
@ -1396,7 +1396,7 @@ type Topology struct {
mu sync.RWMutex
nodeIDs []string
ClusterID string
clusterID string
// nodeStates holds the state of each node according to
// the coordinator. Used during startup and data load.
@ -1511,7 +1511,7 @@ func (c *cluster) considerTopology() error {
if c.id == "" {
u := uuid.NewV4()
c.id = u.String()
c.Topology.ClusterID = c.id
c.Topology.clusterID = c.id
}
if c.Static {
@ -1774,7 +1774,7 @@ func encodeTopology(topology *Topology) *internal.Topology {
return nil
}
return &internal.Topology{
ClusterID: topology.ClusterID,
ClusterID: topology.clusterID,
NodeIDs: topology.nodeIDs,
}
}
@ -1785,7 +1785,7 @@ func decodeTopology(topology *internal.Topology) (*Topology, error) {
}
t := newTopology()
t.ClusterID = topology.ClusterID
t.clusterID = topology.ClusterID
t.nodeIDs = topology.NodeIDs
sort.Slice(t.nodeIDs,
func(i, j int) bool {