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

Merge pull request #76375 from wojtek-t/simplify_cacher

Browse Source 
Minor cleanup in cacher
This commit is contained in:
Kubernetes Prow Robot 2019-04-11 04:06:11 -07:00 committed by GitHub
commit ae1e4769d9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
staging/src/k8s.io/apiserver/pkg/storage/cacher/cacher.go
View File

@ -234,6 +234,8 @@ type Cacher struct {
// its internal cache and updating its cache in the background based on the // its internal cache and updating its cache in the background based on the
// given configuration. // given configuration.
func NewCacherFromConfig(config Config) *Cacher { func NewCacherFromConfig(config Config) *Cacher {
stopCh := make(chan struct{})
watchCache := newWatchCache(config.CacheCapacity, config.KeyFunc, config.GetAttrsFunc, config.Versioner) watchCache := newWatchCache(config.CacheCapacity, config.KeyFunc, config.GetAttrsFunc, config.Versioner)
listerWatcher := NewCacherListerWatcher(config.Storage, config.ResourcePrefix, config.NewListFunc) listerWatcher := NewCacherListerWatcher(config.Storage, config.ResourcePrefix, config.NewListFunc)
reflectorName := "storage/cacher.go:" + config.ResourcePrefix reflectorName := "storage/cacher.go:" + config.ResourcePrefix
@ -245,7 +247,6 @@ func NewCacherFromConfig(config Config) *Cacher {
panic("storage codec doesn't seem to match given type: " + err.Error()) panic("storage codec doesn't seem to match given type: " + err.Error())
} }
stopCh := make(chan struct{})
reflector := cache.NewNamedReflector(reflectorName, listerWatcher, obj, watchCache, 0) reflector := cache.NewNamedReflector(reflectorName, listerWatcher, obj, watchCache, 0)
// Configure reflector's pager to for an appropriate pagination chunk size for fetching data from // Configure reflector's pager to for an appropriate pagination chunk size for fetching data from
// storage. The pager falls back to full list if paginated list calls fail due to an "Expired" error. // storage. The pager falls back to full list if paginated list calls fail due to an "Expired" error.
@ -774,12 +775,9 @@ func (c *Cacher) isStopped() bool {
// Stop implements the graceful termination. // Stop implements the graceful termination.
func (c *Cacher) Stop() { func (c *Cacher) Stop() {
// avoid stopping twice (note: cachers are shared with subresources)
if c.isStopped() {
return
}
c.stopLock.Lock() c.stopLock.Lock()
if c.stopped { if c.stopped {
// avoid stopping twice (note: cachers are shared with subresources)
c.stopLock.Unlock() c.stopLock.Unlock()
return return
} }