gsh-digital-services/seaweedFS
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avoid dead lock

Browse Source
This commit is contained in:
Chris Lu
2021-02-16 10:48:16 -08:00
parent 38efc6f572
commit 53ca7e66ef
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
weed/topology/data_node.go
View File

@@ -46,7 +46,7 @@ func (dn *DataNode) getOrCreateDisk(diskType string) *Disk {
c, found := dn.children[NodeId(diskType)] c, found := dn.children[NodeId(diskType)]
if !found { if !found {
c = NewDisk(diskType) c = NewDisk(diskType)
dn.LinkChildNode(c) dn.doLinkChildNode(c)
} }
disk := c.(*Disk) disk := c.(*Disk)
return disk return disk

4
weed/topology/node.go
View File

@@ -210,6 +210,10 @@ func (n *NodeImpl) GetMaxVolumeId() needle.VolumeId {
func (n *NodeImpl) LinkChildNode(node Node) { func (n *NodeImpl) LinkChildNode(node Node) {
n.Lock() n.Lock()
defer n.Unlock() defer n.Unlock()
n.doLinkChildNode(node)
}
func (n *NodeImpl) doLinkChildNode(node Node) {
if n.children[node.Id()] == nil { if n.children[node.Id()] == nil {
n.children[node.Id()] = node n.children[node.Id()] = node
n.UpAdjustDiskUsageDelta(node.GetDiskUsages()) n.UpAdjustDiskUsageDelta(node.GetDiskUsages())