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

Use nodes from topology to calculate partitionNodes

Browse source
This commit is contained in:
Alan Bernstein 2020-07-21 16:52:37 -05:00 • committed by Travis
parent 7544e7b20b
commit ae279e27ae
No known key found for this signature in database
GPG key ID: 37080CC2042BA34E
2 changed files with 21 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
cluster.go
View file

@ -1026,20 +1026,34 @@ func (c *cluster) ownsShard(nodeID string, index string, shard uint64) bool {
func (c *cluster) partitionNodes(partitionID int) []*Node {
// Default replica count to between one and the number of nodes.
// The replica count can be zero if there are no nodes.
// Assume that c.nodes may be missing a node that is part of the cluster but not currently present.
// The partition calculation must use the full cluster size in BOTH cases:
// - use len(c.Topology.nodeIDs) instead of len(c.nodes),
// - collect nodes from c.Topology.nodeIDs rather than from c.nodes,
// - when the node is missing, it should be considered, found absent from c.nodes, then omitted from the return slice.
replicaN := c.ReplicaN
if replicaN > len(c.nodes) {
replicaN = len(c.nodes)
nodeN := len(c.Topology.nodeIDs)
if replicaN > nodeN {
replicaN = nodeN
} else if replicaN == 0 {
replicaN = 1
}
// Determine primary owner node.
nodeIndex := c.Hasher.Hash(uint64(partitionID), len(c.nodes))
nodeIndex := c.Hasher.Hash(uint64(partitionID), nodeN)
// Collect nodes around the ring.
nodes := make([]*Node, replicaN)
nodes := make([]*Node, 0, replicaN)
for i := 0; i < replicaN; i++ {
nodes[i] = c.nodes[(nodeIndex+i)%len(c.nodes)]
maybeNodeID := c.Topology.nodeIDs[(nodeIndex+i)%nodeN]
for _, node := range c.nodes {
if node.ID == maybeNodeID {
nodes = append(nodes, node)
break
}
}
}
return nodes
@ -2178,7 +2192,7 @@ func (c *cluster) nodeStatus() *NodeStatus {
func (c *cluster) mergeClusterStatus(cs *ClusterStatus) error {
c.mu.Lock()
defer c.mu.Unlock()
c.logger.Printf("merge cluster status: node=%s cluster=%v", c.Node.ID, cs)
c.logger.Printf("merge cluster status: node=%s cluster=%v, topologySize=%v", c.Node.ID, cs, len(c.Topology.nodeIDs))
// Ignore status updates from self (coordinator).
if c.unprotectedIsCoordinator() {
return nil

3
translator_test.go
View file

@ -297,6 +297,7 @@ func TestTranslation_Reset(t *testing.T) {
})
}
// Test index key translation replication under node failure.
func TestTranslation_Replication(t *testing.T) {
t.Run("Replication", func(t *testing.T) {
c := test.MustRunCluster(t, 3,
@ -325,7 +326,6 @@ func TestTranslation_Replication(t *testing.T) {
node0 := c[0]
node1 := c[1]
//node2 := c[2]
ctx := context.Background()
idx := "i"
@ -352,7 +352,6 @@ func TestTranslation_Replication(t *testing.T) {
t.Fatal(err)
}
//exp := `{"results":[{"attrs":{},"columns":[],"keys":["x8","x9","x1","x2","x3","x4","x5","x6","x7"]}]}`
exp := `{"results":[{"attrs":{},"columns":[],"keys":["x1","x2"]}]}`
if !checkClusterState(node0, pilosa.ClusterStateNormal, 1000) {