luxolus
/
open-consul
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

agent/consul: change provider wait from goto to a loop

This commit is contained in:
Mitchell Hashimoto 2018-05-08 21:32:47 -07:00
parent 749f81373f
commit 54a1662da8
No known key found for this signature in database
GPG Key ID: 744E147AA52F5B0A
1 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
agent/consul/leader.go
View File

@ -489,19 +489,22 @@ func (s *Server) createCAProvider(conf *structs.CAConfiguration) (connect.CAProv
func (s *Server) getCAProvider() connect.CAProvider { func (s *Server) getCAProvider() connect.CAProvider {
retries := 0 retries := 0
var result connect.CAProvider
for result == nil {
s.caProviderLock.RLock()
result = s.caProvider
s.caProviderLock.RUnlock()
RETRY_PROVIDER: // In cases where an agent is started with managed proxies, we may ask
s.caProviderLock.RLock() // for the provider before establishLeadership completes. If we're the
result := s.caProvider // leader, then wait and get the provider again
s.caProviderLock.RUnlock() if result == nil && s.IsLeader() && retries < 10 {
retries++
time.Sleep(50 * time.Millisecond)
continue
}
// In cases where an agent is started with managed proxies, we may ask break
// for the provider before establishLeadership completes. If we're the
// leader, then wait and get the provider again
if result == nil && s.IsLeader() && retries < 10 {
retries++
time.Sleep(50 * time.Millisecond)
goto RETRY_PROVIDER
} }
return result return result