github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #32645 from wojtek-t/fix_cacher_logging

Browse Source 
Automatic merge from submit-queue

Fix logging in cacher

@smarterclayton @liggitt @hongchaodeng
This commit is contained in:
Kubernetes Submit Queue 2016-09-15 05:56:39 -07:00 committed by GitHub
commit 0a62dab566
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/storage/cacher.go
View File

@ -113,7 +113,10 @@ func (i *indexedWatchers) deleteWatcher(number int, value string, supported bool
}
}
func (i *indexedWatchers) terminateAll() {
func (i *indexedWatchers) terminateAll(objectType reflect.Type) {
if len(i.allWatchers) > 0 || len(i.valueWatchers) > 0 {
glog.Warningf("Terminating all watchers from cacher %v", objectType)
}
i.allWatchers.terminateAll()
for index, watchers := range i.valueWatchers {
watchers.terminateAll()
@ -465,10 +468,9 @@ func (c *Cacher) dispatchEvent(event *watchCacheEvent) {
}
func (c *Cacher) terminateAllWatchers() {
glog.Warningf("Terminating all watchers from cacher %v", c.objectType)
c.Lock()
defer c.Unlock()
c.watchers.terminateAll()
c.watchers.terminateAll(c.objectType)
}
func (c *Cacher) isStopped() bool {