Browse Source

rename variable

pull/3551/merge
chrislu 2 years ago
parent
commit
ae6292f9f0
  1. 10
      weed/wdclient/masterclient.go

10
weed/wdclient/masterclient.go

@ -23,6 +23,7 @@ type MasterClient struct {
clientHost pb.ServerAddress clientHost pb.ServerAddress
rack string rack string
currentMaster pb.ServerAddress currentMaster pb.ServerAddress
currentMasterLock sync.RWMutex
masters map[string]pb.ServerAddress masters map[string]pb.ServerAddress
grpcDialOption grpc.DialOption grpcDialOption grpc.DialOption
@ -30,7 +31,6 @@ type MasterClient struct {
vidMapCacheSize int vidMapCacheSize int
OnPeerUpdate func(update *master_pb.ClusterNodeUpdate, startFrom time.Time) OnPeerUpdate func(update *master_pb.ClusterNodeUpdate, startFrom time.Time)
OnPeerUpdateLock sync.RWMutex OnPeerUpdateLock sync.RWMutex
accessLock sync.RWMutex
} }
func NewMasterClient(grpcDialOption grpc.DialOption, filerGroup string, clientType string, clientHost pb.ServerAddress, clientDataCenter string, rack string, masters map[string]pb.ServerAddress) *MasterClient { func NewMasterClient(grpcDialOption grpc.DialOption, filerGroup string, clientType string, clientHost pb.ServerAddress, clientDataCenter string, rack string, masters map[string]pb.ServerAddress) *MasterClient {
@ -92,15 +92,15 @@ func (mc *MasterClient) LookupFileIdWithFallback(fileId string) (fullUrls []stri
} }
func (mc *MasterClient) getCurrentMaster() pb.ServerAddress { func (mc *MasterClient) getCurrentMaster() pb.ServerAddress {
mc.accessLock.RLock()
defer mc.accessLock.RUnlock()
mc.currentMasterLock.RLock()
defer mc.currentMasterLock.RUnlock()
return mc.currentMaster return mc.currentMaster
} }
func (mc *MasterClient) setCurrentMaster(master pb.ServerAddress) { func (mc *MasterClient) setCurrentMaster(master pb.ServerAddress) {
mc.accessLock.Lock()
mc.currentMasterLock.Lock()
mc.currentMaster = master mc.currentMaster = master
mc.accessLock.Unlock()
mc.currentMasterLock.Unlock()
} }
func (mc *MasterClient) GetMaster() pb.ServerAddress { func (mc *MasterClient) GetMaster() pb.ServerAddress {

Loading…
Cancel
Save