aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Lu <chris.lu@gmail.com>2016-09-07 18:13:49 -0700
committerChris Lu <chris.lu@gmail.com>2016-09-07 18:21:05 -0700
commit0559aa96738d727e055190301bbb0624c74ced7f (patch)
tree0b2111d3eb6a24a5058208ff06412e6a5a088186
parentc4b7966dbee50970ebaf70269d74e96592ff72c9 (diff)
downloadseaweedfs-0559aa96738d727e055190301bbb0624c74ced7f.tar.xz
seaweedfs-0559aa96738d727e055190301bbb0624c74ced7f.zip
use Lock instead of RLock
fix https://github.com/chrislusf/seaweedfs/issues/364
-rw-r--r--weed/topology/data_node.go6
1 files changed, 3 insertions, 3 deletions
diff --git a/weed/topology/data_node.go b/weed/topology/data_node.go
index da6ed2895..b7f039559 100644
--- a/weed/topology/data_node.go
+++ b/weed/topology/data_node.go
@@ -53,7 +53,7 @@ func (dn *DataNode) UpdateVolumes(actualVolumes []storage.VolumeInfo) (deletedVo
for _, v := range actualVolumes {
actualVolumeMap[v.Id] = v
}
- dn.RLock()
+ dn.Lock()
for vid, v := range dn.volumes {
if _, ok := actualVolumeMap[vid]; !ok {
glog.V(0).Infoln("Deleting volume id:", vid)
@@ -62,8 +62,8 @@ func (dn *DataNode) UpdateVolumes(actualVolumes []storage.VolumeInfo) (deletedVo
dn.UpAdjustVolumeCountDelta(-1)
dn.UpAdjustActiveVolumeCountDelta(-1)
}
- } //TODO: adjust max volume id, if need to reclaim volume ids
- dn.RUnlock()
+ }
+ dn.Unlock()
for _, v := range actualVolumes {
dn.AddOrUpdateVolume(v)
}