github
/
consul
mirror of https://github.com/hashicorp/consul
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

agent/consul: retry reading provider a few times

pull/4275/head
Mitchell Hashimoto 2018-05-08 21:27:23 -07:00
parent e54e69d11f
commit 9b3495dddb
No known key found for this signature in database
GPG Key ID: 744E147AA52F5B0A
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
agent/consul/leader.go
View File

@ -488,9 +488,23 @@ func (s *Server) createCAProvider(conf *structs.CAConfiguration) (connect.CAProv
} }
func (s *Server) getCAProvider() connect.CAProvider { func (s *Server) getCAProvider() connect.CAProvider {
retries := 0
RETRY_PROVIDER:
s.caProviderLock.RLock() s.caProviderLock.RLock()
defer s.caProviderLock.RUnlock() result := s.caProvider
return s.caProvider s.caProviderLock.RUnlock()
// In cases where an agent is started with managed proxies, we may ask
// 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
} }
func (s *Server) setCAProvider(newProvider connect.CAProvider) { func (s *Server) setCAProvider(newProvider connect.CAProvider) {