Merge pull request #22047 from gmarek/master

Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot 2016-02-26 03:13:30 -08:00
commit bc37f34ce9

View File

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