github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-25 04:33:26 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #79112 from tedyu/ready-z-lock

Browse Source 
Obtain readyzLock once in installReadyz to prevent double addition of readyz check
This commit is contained in:
Kubernetes Prow Robot 2019-07-01 16:23:07 -07:00 committed by GitHub
commit ac05583cbc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
staging/src/k8s.io/apiserver/pkg/server/healthz.go
View File

@ -36,7 +36,12 @@ func (s *GenericAPIServer) AddHealthzChecks(checks ...healthz.HealthzChecker) er
func (s *GenericAPIServer) AddReadyzChecks(checks ...healthz.HealthzChecker) error { func (s *GenericAPIServer) AddReadyzChecks(checks ...healthz.HealthzChecker) error {
s.readyzLock.Lock() s.readyzLock.Lock()
defer s.readyzLock.Unlock() defer s.readyzLock.Unlock()
return s.addReadyzChecks(checks...)
}
// addReadyzChecks allows you to add a HealthzCheck to readyz.
// premise: readyzLock has been obtained
func (s *GenericAPIServer) addReadyzChecks(checks ...healthz.HealthzChecker) error {
if s.readyzChecksInstalled { if s.readyzChecksInstalled {
return fmt.Errorf("unable to add because the readyz endpoint has already been created") return fmt.Errorf("unable to add because the readyz endpoint has already been created")
} }
@ -56,9 +61,9 @@ func (s *GenericAPIServer) installHealthz() {
// installReadyz creates the readyz endpoint for this server. // installReadyz creates the readyz endpoint for this server.
func (s *GenericAPIServer) installReadyz(stopCh <-chan struct{}) { func (s *GenericAPIServer) installReadyz(stopCh <-chan struct{}) {
s.AddReadyzChecks(shutdownCheck{stopCh})
s.readyzLock.Lock() s.readyzLock.Lock()
defer s.readyzLock.Unlock() defer s.readyzLock.Unlock()
s.addReadyzChecks(shutdownCheck{stopCh})
s.readyzChecksInstalled = true s.readyzChecksInstalled = true
@ -99,7 +104,9 @@ func (s *GenericAPIServer) AddDelayedHealthzChecks(delay time.Duration, checks .
s.healthzChecks = append(s.healthzChecks, delayedHealthCheck(check, s.healthzClock, s.maxStartupSequenceDuration)) s.healthzChecks = append(s.healthzChecks, delayedHealthCheck(check, s.healthzClock, s.maxStartupSequenceDuration))
} }
return s.AddReadyzChecks(checks...) s.readyzLock.Lock()
defer s.readyzLock.Unlock()
return s.addReadyzChecks(checks...)
} }
// delayedHealthCheck wraps a health check which will not fail until the explicitly defined delay has elapsed. // delayedHealthCheck wraps a health check which will not fail until the explicitly defined delay has elapsed.