lsm/seaweedfs
1
0
Fork 0
mirror of https://github.com/seaweedfs/seaweedfs.git synced 2025-11-24 08:46:54 +08:00
Code Issues Actions 17 Packages Projects Releases Wiki Activity

avoid infinite loop WaitUntilConnected() (#3431)

Browse Source 
https://github.com/seaweedfs/seaweedfs/issues/3421
This commit is contained in:
Konstantin Lebedev
2022-08-12 01:03:26 +03:00
committed by GitHub
parent 53b601616c
commit 4d4cd0948d
2 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
weed/wdclient/masterclient.go
View File

@@ -93,7 +93,10 @@ func (mc *MasterClient) GetMasters() map[string]pb.ServerAddress {
}
func (mc *MasterClient) WaitUntilConnected() {
for mc.currentMaster == "" {
for {
if mc.currentMaster != "" {
return
}
time.Sleep(time.Duration(rand.Int31n(200)) * time.Millisecond)
}
}
@@ -135,7 +138,6 @@ func (mc *MasterClient) FindLeaderFromOtherPeers(myMasterAddress pb.ServerAddres
func (mc *MasterClient) tryAllMasters() {
var nextHintedLeader pb.ServerAddress
for _, master := range mc.masters {
nextHintedLeader = mc.tryConnectToMaster(master)
for nextHintedLeader != "" {
nextHintedLeader = mc.tryConnectToMaster(nextHintedLeader)
@@ -228,9 +230,7 @@ func (mc *MasterClient) tryConnectToMaster(master pb.ServerAddress) (nextHintedL
}
}
}
}
})
if gprcErr != nil {
stats.MasterClientConnectCounter.WithLabelValues(stats.Failed).Inc()