diff --git a/weed/wdclient/masterclient.go b/weed/wdclient/masterclient.go index 6e91c31eb..d330e9ec6 100644 --- a/weed/wdclient/masterclient.go +++ b/weed/wdclient/masterclient.go @@ -29,8 +29,8 @@ type MasterClient struct { vidMap vidMapCacheSize int - OnPeerUpdate func(update *master_pb.ClusterNodeUpdate, startFrom time.Time) - OnPeerUpdateAccessLock sync.RWMutex + OnPeerUpdate func(update *master_pb.ClusterNodeUpdate, startFrom time.Time) + OnPeerUpdateLock sync.RWMutex } func NewMasterClient(grpcDialOption grpc.DialOption, filerGroup string, clientType string, clientHost pb.ServerAddress, clientDataCenter string, rack string, masters map[string]pb.ServerAddress) *MasterClient { @@ -47,9 +47,9 @@ func NewMasterClient(grpcDialOption grpc.DialOption, filerGroup string, clientTy } func (mc *MasterClient) SetOnPeerUpdateFn(onPeerUpdate func(update *master_pb.ClusterNodeUpdate, startFrom time.Time)) { - mc.OnPeerUpdateAccessLock.Lock() + mc.OnPeerUpdateLock.Lock() mc.OnPeerUpdate = onPeerUpdate - mc.OnPeerUpdateAccessLock.Unlock() + mc.OnPeerUpdateLock.Unlock() } func (mc *MasterClient) GetLookupFileIdFunction() LookupFileIdFunctionType { @@ -227,7 +227,7 @@ func (mc *MasterClient) tryConnectToMaster(master pb.ServerAddress) (nextHintedL if resp.ClusterNodeUpdate != nil { update := resp.ClusterNodeUpdate - mc.OnPeerUpdateAccessLock.RLock() + mc.OnPeerUpdateLock.RLock() if mc.OnPeerUpdate != nil { if update.FilerGroup == mc.FilerGroup { if update.IsAdd { @@ -239,7 +239,7 @@ func (mc *MasterClient) tryConnectToMaster(master pb.ServerAddress) (nextHintedL mc.OnPeerUpdate(update, time.Now()) } } - mc.OnPeerUpdateAccessLock.RUnlock() + mc.OnPeerUpdateLock.RUnlock() } } })