gitlab-com-seaweedfs/seaweedfs
1
0
Fork 0
mirror of https://github.com/seaweedfs/seaweedfs.git synced 2024-01-19 02:48:24 +00:00
Code Issues Projects Releases Wiki Activity

lock node.children

Browse source
This commit is contained in:
Chris Lu 2016-05-19 23:57:31 -07:00
parent 57c85adc53
commit 4734efa9a1
1 changed files with 20 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
go/topology/node.go
View file

@ -4,6 +4,7 @@ import (
"errors" "errors"
"math/rand" "math/rand"
"strings" "strings"
"sync"
"github.com/chrislusf/seaweedfs/go/glog" "github.com/chrislusf/seaweedfs/go/glog"
"github.com/chrislusf/seaweedfs/go/storage" "github.com/chrislusf/seaweedfs/go/storage"
@ -32,7 +33,7 @@ type Node interface {
IsDataNode() bool IsDataNode() bool
IsRack() bool IsRack() bool
IsDataCenter() bool IsDataCenter() bool
Children() map[NodeId]Node Children() []Node
Parent() Node Parent() Node
GetValue() interface{} //get reference to the topology,dc,rack,datanode GetValue() interface{} //get reference to the topology,dc,rack,datanode
@ -43,6 +44,7 @@ type NodeImpl struct {
activeVolumeCount int activeVolumeCount int
maxVolumeCount int maxVolumeCount int
parent Node parent Node
sync.RWMutex // lock children
children map[NodeId]Node children map[NodeId]Node
maxVolumeId storage.VolumeId maxVolumeId storage.VolumeId
@ -55,6 +57,7 @@ type NodeImpl struct {
func (n *NodeImpl) RandomlyPickNodes(numberOfNodes int, filterFirstNodeFn func(dn Node) error) (firstNode Node, restNodes []Node, err error) { func (n *NodeImpl) RandomlyPickNodes(numberOfNodes int, filterFirstNodeFn func(dn Node) error) (firstNode Node, restNodes []Node, err error) {
candidates := make([]Node, 0, len(n.children)) candidates := make([]Node, 0, len(n.children))
var errs []string var errs []string
n.RLock()
for _, node := range n.children { for _, node := range n.children {
if err := filterFirstNodeFn(node); err == nil { if err := filterFirstNodeFn(node); err == nil {
candidates = append(candidates, node) candidates = append(candidates, node)
@ -62,6 +65,7 @@ func (n *NodeImpl) RandomlyPickNodes(numberOfNodes int, filterFirstNodeFn func(d
errs = append(errs, string(node.Id())+":"+err.Error()) errs = append(errs, string(node.Id())+":"+err.Error())
} }
} }
n.RUnlock()
if len(candidates) == 0 { if len(candidates) == 0 {
return nil, nil, errors.New("No matching data node found! \n" + strings.Join(errs, "\n")) return nil, nil, errors.New("No matching data node found! \n" + strings.Join(errs, "\n"))
} }
@ -70,6 +74,7 @@ func (n *NodeImpl) RandomlyPickNodes(numberOfNodes int, filterFirstNodeFn func(d
restNodes = make([]Node, numberOfNodes-1) restNodes = make([]Node, numberOfNodes-1)
candidates = candidates[:0] candidates = candidates[:0]
n.RLock()
for _, node := range n.children { for _, node := range n.children {
if node.Id() == firstNode.Id() { if node.Id() == firstNode.Id() {
continue continue
@ -80,6 +85,7 @@ func (n *NodeImpl) RandomlyPickNodes(numberOfNodes int, filterFirstNodeFn func(d
glog.V(2).Infoln("select rest node candidate:", node.Id()) glog.V(2).Infoln("select rest node candidate:", node.Id())
candidates = append(candidates, node) candidates = append(candidates, node)
} }
n.RUnlock()
glog.V(2).Infoln(n.Id(), "picking", numberOfNodes-1, "from rest", len(candidates), "node candidates") glog.V(2).Infoln(n.Id(), "picking", numberOfNodes-1, "from rest", len(candidates), "node candidates")
ret := len(restNodes) == 0 ret := len(restNodes) == 0
for k, node := range candidates { for k, node := range candidates {
@ -126,8 +132,13 @@ func (n *NodeImpl) FreeSpace() int {
func (n *NodeImpl) SetParent(node Node) { func (n *NodeImpl) SetParent(node Node) {
n.parent = node n.parent = node
} }
func (n *NodeImpl) Children() map[NodeId]Node { func (n *NodeImpl) Children() (ret []Node) {
return n.children n.RLock()
defer n.RUnlock()
for _, c := range n.children {
ret = append(ret, c)
}
return ret
} }
func (n *NodeImpl) Parent() Node { func (n *NodeImpl) Parent() Node {
return n.parent return n.parent
@ -136,6 +147,8 @@ func (n *NodeImpl) GetValue() interface{} {
return n.value return n.value
} }
func (n *NodeImpl) ReserveOneVolume(r int) (assignedNode *DataNode, err error) { func (n *NodeImpl) ReserveOneVolume(r int) (assignedNode *DataNode, err error) {
n.RLock()
defer n.RUnlock()
for _, node := range n.children { for _, node := range n.children {
freeSpace := node.FreeSpace() freeSpace := node.FreeSpace()
// fmt.Println("r =", r, ", node =", node, ", freeSpace =", freeSpace) // fmt.Println("r =", r, ", node =", node, ", freeSpace =", freeSpace)
@ -198,6 +211,8 @@ func (n *NodeImpl) GetMaxVolumeCount() int {
} }
func (n *NodeImpl) LinkChildNode(node Node) { func (n *NodeImpl) LinkChildNode(node Node) {
n.Lock()
defer n.Unlock()
if n.children[node.Id()] == nil { if n.children[node.Id()] == nil {
n.children[node.Id()] = node n.children[node.Id()] = node
n.UpAdjustMaxVolumeCountDelta(node.GetMaxVolumeCount()) n.UpAdjustMaxVolumeCountDelta(node.GetMaxVolumeCount())
@ -210,6 +225,8 @@ func (n *NodeImpl) LinkChildNode(node Node) {
} }
func (n *NodeImpl) UnlinkChildNode(nodeId NodeId) { func (n *NodeImpl) UnlinkChildNode(nodeId NodeId) {
n.Lock()
defer n.Unlock()
node := n.children[nodeId] node := n.children[nodeId]
if node != nil { if node != nil {
node.SetParent(nil) node.SetParent(nil)