diff options
| author | chrislu <chris.lu@gmail.com> | 2022-06-27 12:40:50 -0700 |
|---|---|---|
| committer | chrislu <chris.lu@gmail.com> | 2022-06-27 12:40:50 -0700 |
| commit | 4b1f48a399ac8e18154929b942d47e10c60a54d9 (patch) | |
| tree | a93a65a5a00ee3ec6ec4fcb8e88fdcfc42148331 /weed/wdclient/masterclient.go | |
| parent | 4a65159250c0ca7cf0fc203dd300bf402c1016f9 (diff) | |
| parent | dc6b1a52e8a2b34c1e775fe21013e366c6a37ca6 (diff) | |
| download | seaweedfs-4b1f48a399ac8e18154929b942d47e10c60a54d9.tar.xz seaweedfs-4b1f48a399ac8e18154929b942d47e10c60a54d9.zip | |
Merge branch 'master' of https://github.com/chrislusf/seaweedfs
Diffstat (limited to 'weed/wdclient/masterclient.go')
| -rw-r--r-- | weed/wdclient/masterclient.go | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/weed/wdclient/masterclient.go b/weed/wdclient/masterclient.go index fb681b523..35f1c4cf8 100644 --- a/weed/wdclient/masterclient.go +++ b/weed/wdclient/masterclient.go @@ -168,8 +168,8 @@ func (mc *MasterClient) tryConnectToMaster(master pb.ServerAddress) (nextHintedL } // check if it is the leader to determine whether to reset the vidMap - if resp.VolumeLocation != nil && resp.VolumeLocation.Leader != "" { - glog.V(0).Infof("redirected to leader %v", resp.VolumeLocation.Leader) + if resp.VolumeLocation != nil && resp.VolumeLocation.Leader != "" && string(master) != resp.VolumeLocation.Leader { + glog.V(0).Infof("master %v redirected to leader %v", master, resp.VolumeLocation.Leader) nextHintedLeader = pb.ServerAddress(resp.VolumeLocation.Leader) stats.MasterClientConnectCounter.WithLabelValues(stats.RedirectedToleader).Inc() return nil @@ -188,8 +188,8 @@ func (mc *MasterClient) tryConnectToMaster(master pb.ServerAddress) (nextHintedL if resp.VolumeLocation != nil { // maybe the leader is changed - if resp.VolumeLocation.Leader != "" { - glog.V(0).Infof("redirected to leader %v", resp.VolumeLocation.Leader) + if resp.VolumeLocation.Leader != "" && string(mc.currentMaster) != resp.VolumeLocation.Leader { + glog.V(0).Infof("currentMaster %v redirected to leader %v", mc.currentMaster, resp.VolumeLocation.Leader) nextHintedLeader = pb.ServerAddress(resp.VolumeLocation.Leader) stats.MasterClientConnectCounter.WithLabelValues(stats.RedirectedToleader).Inc() return nil |