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

handle possible race condition

Browse source
This commit is contained in:
Chris Lu 2021-11-03 01:36:39 -07:00
parent 6fb6480a3b
commit 3c245c69d3
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
weed/server/master_server_cluster.go
View file

@ -14,6 +14,7 @@ const (
type ClusterNode struct { type ClusterNode struct {
address pb.ServerAddress address pb.ServerAddress
version string version string
counter int
} }
type Cluster struct { type Cluster struct {
@ -32,12 +33,14 @@ func (cluster *Cluster) AddClusterNode(nodeType string, address pb.ServerAddress
case "filer": case "filer":
cluster.filersLock.Lock() cluster.filersLock.Lock()
defer cluster.filersLock.Unlock() defer cluster.filersLock.Unlock()
if _, found := cluster.filers[address]; found { if existingNode, found := cluster.filers[address]; found {
existingNode.counter++
return return
} }
cluster.filers[address] = &ClusterNode{ cluster.filers[address] = &ClusterNode{
address: address, address: address,
version: version, version: version,
counter: 1,
} }
case "master": case "master":
} }
@ -48,10 +51,14 @@ func (cluster *Cluster) RemoveClusterNode(nodeType string, address pb.ServerAddr
case "filer": case "filer":
cluster.filersLock.Lock() cluster.filersLock.Lock()
defer cluster.filersLock.Unlock() defer cluster.filersLock.Unlock()
if _, found := cluster.filers[address]; !found { if existingNode, found := cluster.filers[address]; !found {
return return
} } else {
existingNode.counter--
if existingNode.counter <= 0 {
delete(cluster.filers, address) delete(cluster.filers, address)
}
}
case "master": case "master":
} }
} }