lsm/seaweedfs
1
0
Fork 0
mirror of https://github.com/seaweedfs/seaweedfs.git synced 2025-09-20 00:18:00 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

avoid possible concurrent access inside ensureCorrectWritables()

Browse Source
This commit is contained in:
Chris Lu
2020-11-22 17:15:59 -08:00
parent 92f906b6fc
commit c7ebadc25d
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
weed/topology/topology.go
View File

@@ -177,7 +177,9 @@ func (t *Topology) DeleteCollection(collectionName string) {
} }
func (t *Topology) RegisterVolumeLayout(v storage.VolumeInfo, dn *DataNode) { func (t *Topology) RegisterVolumeLayout(v storage.VolumeInfo, dn *DataNode) {
t.GetVolumeLayout(v.Collection, v.ReplicaPlacement, v.Ttl).RegisterVolume(&v, dn) vl := t.GetVolumeLayout(v.Collection, v.ReplicaPlacement, v.Ttl)
vl.RegisterVolume(&v, dn)
vl.EnsureCorrectWritables(&v)
} }
func (t *Topology) UnRegisterVolumeLayout(v storage.VolumeInfo, dn *DataNode) { func (t *Topology) UnRegisterVolumeLayout(v storage.VolumeInfo, dn *DataNode) {
glog.Infof("removing volume info:%+v", v) glog.Infof("removing volume info:%+v", v)

1
weed/topology/volume_layout.go
View File

@@ -141,7 +141,6 @@ func (vl *VolumeLayout) RegisterVolume(v *storage.VolumeInfo, dn *DataNode) {
vl.accessLock.Lock() vl.accessLock.Lock()
defer vl.accessLock.Unlock() defer vl.accessLock.Unlock()
defer vl.ensureCorrectWritables(v.Id)
defer vl.rememberOversizedVolume(v, dn) defer vl.rememberOversizedVolume(v, dn)
if _, ok := vl.vid2location[v.Id]; !ok { if _, ok := vl.vid2location[v.Id]; !ok {