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

Merge pull request #22047 from gmarek/master

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot 2016-02-26 03:13:30 -08:00
commit bc37f34ce9
1 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
test/e2e/resource_usage_gatherer.go
View File

@ -155,19 +155,11 @@ func (w *resourceGatherWorker) gather(initialSleep time.Duration) {
defer Logf("Closing worker for %v", w.nodeName) 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
} }