diff options
| author | Chris Lu <chris.lu@gmail.com> | 2021-11-03 01:36:39 -0700 |
|---|---|---|
| committer | Chris Lu <chris.lu@gmail.com> | 2021-11-03 01:36:39 -0700 |
| commit | 3c245c69d369d468c6e1b4243c9bc0cd12fe12d8 (patch) | |
| tree | f6f0261d3aba9f7e3bdb251115599f03655937c1 /weed/server/master_server_cluster.go | |
| parent | 6fb6480a3beef4cc23ec01a6e8f0b77a004513de (diff) | |
| download | seaweedfs-3c245c69d369d468c6e1b4243c9bc0cd12fe12d8.tar.xz seaweedfs-3c245c69d369d468c6e1b4243c9bc0cd12fe12d8.zip | |
handle possible race condition
Diffstat (limited to 'weed/server/master_server_cluster.go')
| -rw-r--r-- | weed/server/master_server_cluster.go | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/weed/server/master_server_cluster.go b/weed/server/master_server_cluster.go index 19ecaff0a..fa5280ccd 100644 --- a/weed/server/master_server_cluster.go +++ b/weed/server/master_server_cluster.go @@ -14,6 +14,7 @@ const ( type ClusterNode struct { address pb.ServerAddress version string + counter int } type Cluster struct { @@ -32,12 +33,14 @@ func (cluster *Cluster) AddClusterNode(nodeType string, address pb.ServerAddress case "filer": cluster.filersLock.Lock() defer cluster.filersLock.Unlock() - if _, found := cluster.filers[address]; found { + if existingNode, found := cluster.filers[address]; found { + existingNode.counter++ return } cluster.filers[address] = &ClusterNode{ address: address, version: version, + counter: 1, } case "master": } @@ -48,10 +51,14 @@ func (cluster *Cluster) RemoveClusterNode(nodeType string, address pb.ServerAddr case "filer": cluster.filersLock.Lock() defer cluster.filersLock.Unlock() - if _, found := cluster.filers[address]; !found { + if existingNode, found := cluster.filers[address]; !found { return + } else { + existingNode.counter-- + if existingNode.counter <= 0 { + delete(cluster.filers, address) + } } - delete(cluster.filers, address) case "master": } } |