gitlab-com-seaweedfs/seaweedfs
1
0
Fork 0
mirror of https://github.com/seaweedfs/seaweedfs.git synced 2024-01-19 02:48:24 +00:00
Code Issues 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
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
weed/server/master_server.go
View file

@ -276,11 +276,9 @@ func (ms *MasterServer) startAdminScripts() {
go commandEnv.MasterClient.KeepConnectedToMaster() go commandEnv.MasterClient.KeepConnectedToMaster()
go func() { go func() {
commandEnv.MasterClient.WaitUntilConnected()
for { for {
time.Sleep(time.Duration(sleepMinutes) * time.Minute) time.Sleep(time.Duration(sleepMinutes) * time.Minute)
if ms.Topo.IsLeader() { if ms.Topo.IsLeader() && ms.MasterClient.GetMaster() != "" {
shellOptions.FilerAddress = ms.GetOneFiler(cluster.FilerGroupName(*shellOptions.FilerGroup)) shellOptions.FilerAddress = ms.GetOneFiler(cluster.FilerGroupName(*shellOptions.FilerGroup))
if shellOptions.FilerAddress == "" { if shellOptions.FilerAddress == "" {
continue continue

8
weed/wdclient/masterclient.go
View file

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