mirrors/seaweedfs
1
0
Fork 0
mirror of https://github.com/seaweedfs/seaweedfs.git synced 2026-05-19 00:01:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

reduce lock scope

Browse Source
This commit is contained in:
chrislu
2025-10-30 20:28:04 -07:00
parent 7275613cc3
commit fe972eab44
1 changed files with 24 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
weed/wdclient/masterclient.go
View File

@@ -75,7 +75,7 @@ func (mc *MasterClient) LookupFileIdWithFallback(ctx context.Context, fileId str
mc.vidMapLock.RLock()
vm := mc.vidMap
mc.vidMapLock.RUnlock()
fullUrls, err = vm.LookupFileId(ctx, fileId)
if err == nil && len(fullUrls) > 0 {
return
@@ -462,24 +462,22 @@ func (mc *MasterClient) updateVidMap(resp *master_pb.KeepConnectedResponse) {
DataCenter: resp.VolumeLocation.DataCenter,
GrpcPort: int(resp.VolumeLocation.GrpcPort),
}
mc.vidMapLock.RLock()
for _, newVid := range resp.VolumeLocation.NewVids {
glog.V(2).Infof("%s.%s: %s masterClient adds volume %d", mc.FilerGroup, mc.clientType, loc.Url, newVid)
mc.vidMap.addLocation(newVid, loc)
mc.addLocation(newVid, loc)
}
for _, deletedVid := range resp.VolumeLocation.DeletedVids {
glog.V(2).Infof("%s.%s: %s masterClient removes volume %d", mc.FilerGroup, mc.clientType, loc.Url, deletedVid)
mc.vidMap.deleteLocation(deletedVid, loc)
mc.deleteLocation(deletedVid, loc)
}
for _, newEcVid := range resp.VolumeLocation.NewEcVids {
glog.V(2).Infof("%s.%s: %s masterClient adds ec volume %d", mc.FilerGroup, mc.clientType, loc.Url, newEcVid)
mc.vidMap.addEcLocation(newEcVid, loc)
mc.addEcLocation(newEcVid, loc)
}
for _, deletedEcVid := range resp.VolumeLocation.DeletedEcVids {
glog.V(2).Infof("%s.%s: %s masterClient removes ec volume %d", mc.FilerGroup, mc.clientType, loc.Url, deletedEcVid)
mc.vidMap.deleteEcLocation(deletedEcVid, loc)
mc.deleteEcLocation(deletedEcVid, loc)
}
mc.vidMapLock.RUnlock()
glog.V(1).Infof("updateVidMap(%s) %s.%s: %s volume add: %d, del: %d, add ec: %d del ec: %d",
resp.VolumeLocation.DataCenter, mc.FilerGroup, mc.clientType, loc.Url,
len(resp.VolumeLocation.NewVids), len(resp.VolumeLocation.DeletedVids),
@@ -546,20 +544,34 @@ func (mc *MasterClient) GetDataCenter() string {
return mc.vidMap.DataCenter
}
// Internal helpers for vidMap operations (used by tests)
// Thread-safe helpers for vidMap operations
// These methods acquire exclusive locks to protect both the vidMap pointer
// and the underlying map mutations from concurrent access
func (mc *MasterClient) addLocation(vid uint32, location Location) {
mc.vidMapLock.RLock()
defer mc.vidMapLock.RUnlock()
mc.vidMapLock.Lock()
defer mc.vidMapLock.Unlock()
mc.vidMap.addLocation(vid, location)
}
func (mc *MasterClient) deleteLocation(vid uint32, location Location) {
mc.vidMapLock.RLock()
defer mc.vidMapLock.RUnlock()
mc.vidMapLock.Lock()
defer mc.vidMapLock.Unlock()
mc.vidMap.deleteLocation(vid, location)
}
func (mc *MasterClient) addEcLocation(vid uint32, location Location) {
mc.vidMapLock.Lock()
defer mc.vidMapLock.Unlock()
mc.vidMap.addEcLocation(vid, location)
}
func (mc *MasterClient) deleteEcLocation(vid uint32, location Location) {
mc.vidMapLock.Lock()
defer mc.vidMapLock.Unlock()
mc.vidMap.deleteEcLocation(vid, location)
}
func (mc *MasterClient) resetVidMap() {
mc.vidMapLock.Lock()
defer mc.vidMapLock.Unlock()