Merge pull request #21978 from gmarek/refactor-gatherer

Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot 2016-02-25 06:51:58 -08:00
commit 4e79b55b30

View File

@ -152,13 +152,22 @@ func (w *resourceGatherWorker) singleProbe() {
func (w *resourceGatherWorker) gather(initialSleep time.Duration) { func (w *resourceGatherWorker) gather(initialSleep time.Duration) {
defer utilruntime.HandleCrash() defer utilruntime.HandleCrash()
defer w.wg.Done() defer w.wg.Done()
defer Logf("Closing worker for %v", w.nodeName)
select { select {
case <-time.After(initialSleep): case <-time.After(initialSleep):
// TODO: remove after #21313 is fixed
Logf("Probing %v", w.nodeName)
w.singleProbe() w.singleProbe()
// TODO: remove after #21313 is fixed
Logf("Finished probe for %v", w.nodeName)
for { for {
select { select {
case <-time.After(resourceDataGatheringPeriod): case <-time.After(resourceDataGatheringPeriod):
// TODO: remove after #21313 is fixed
Logf("Probing %v", w.nodeName)
w.singleProbe() w.singleProbe()
// TODO: remove after #21313 is fixed
Logf("Finished probe for %v", w.nodeName)
case <-w.stopCh: case <-w.stopCh:
return return
} }