diff options
| author | LIBA-S <zjuestc2017@gmail.com> | 2020-09-23 20:56:51 +0800 |
|---|---|---|
| committer | LIBA-S <zjuestc2017@gmail.com> | 2020-09-23 20:56:51 +0800 |
| commit | eecd6b5d35f01823b546adc0a44b28dd60184e30 (patch) | |
| tree | 32163d5ecf4a8ac56e8e0d49b4a67f7f5246c4fa | |
| parent | d7bf2390e2bf4ac55132878faa68119b3558e8e4 (diff) | |
| download | seaweedfs-eecd6b5d35f01823b546adc0a44b28dd60184e30.tar.xz seaweedfs-eecd6b5d35f01823b546adc0a44b28dd60184e30.zip | |
Fix a race condition when handle VolumeLocationList
| -rw-r--r-- | weed/topology/topology_vacuum.go | 2 | ||||
| -rw-r--r-- | weed/topology/volume_location_list.go | 8 |
2 files changed, 9 insertions, 1 deletions
diff --git a/weed/topology/topology_vacuum.go b/weed/topology/topology_vacuum.go index 789a01330..1079816fc 100644 --- a/weed/topology/topology_vacuum.go +++ b/weed/topology/topology_vacuum.go @@ -165,7 +165,7 @@ func vacuumOneVolumeLayout(grpcDialOption grpc.DialOption, volumeLayout *VolumeL volumeLayout.accessLock.RLock() tmpMap := make(map[needle.VolumeId]*VolumeLocationList) for vid, locationList := range volumeLayout.vid2location { - tmpMap[vid] = locationList + tmpMap[vid] = locationList.Copy() } volumeLayout.accessLock.RUnlock() diff --git a/weed/topology/volume_location_list.go b/weed/topology/volume_location_list.go index 8905c54b5..6acd70f2f 100644 --- a/weed/topology/volume_location_list.go +++ b/weed/topology/volume_location_list.go @@ -18,6 +18,14 @@ func (dnll *VolumeLocationList) String() string { return fmt.Sprintf("%v", dnll.list) } +func (dnll *VolumeLocationList) Copy() *VolumeLocationList { + list := make([]*DataNode, len(dnll.list)) + copy(list, dnll.list) + return &VolumeLocationList{ + list: list, + } +} + func (dnll *VolumeLocationList) Head() *DataNode { //mark first node as master volume return dnll.list[0] |