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

add sort order to URI addition

Browse source
This commit is contained in:
Todd Gruben 2017-12-07 14:11:49 -06:00
parent c14bc29041
commit 9565db43a8
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
cluster.go
View file

@ -805,8 +805,6 @@ func (c *Cluster) haveTopologyAgreement() bool {
if c.Static {
return true
}
c.logger().Printf("haveTopologyAgreement")
c.logger().Printf(" (%v)(%v)", c.Topology.NodeSet, c.NodeSet())
return URISlicesAreEqual(c.Topology.NodeSet, c.NodeSet())
}
@ -814,9 +812,7 @@ func (c *Cluster) allNodesReady() bool {
if c.Static {
return true
}
c.logger().Printf("allNodesReady")
for _, uri := range c.Topology.NodeSet {
c.logger().Printf("allNodesReady: %s,%s", uri.String(), c.Topology.nodeStates[uri])
if c.Topology.nodeStates[uri] != NodeStateReady {
return false
}
@ -1343,6 +1339,12 @@ func (t *Topology) AddURI(uri URI) bool {
return false
}
t.NodeSet = append(t.NodeSet, uri)
sort.Slice(t.NodeSet,
func(i, j int) bool {
return t.NodeSet[i].String() < t.NodeSet[j].String()
})
return true
}
@ -1422,6 +1424,10 @@ func decodeTopology(topology *internal.Topology) (*Topology, error) {
t := NewTopology()
t.NodeSet = decodeURIs(topology.NodeSet)
sort.Slice(t.NodeSet,
func(i, j int) bool {
return t.NodeSet[i].String() < t.NodeSet[j].String()
})
return t, nil
}