github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #21262 from gmarek/backoff 

Fix log gatherer
pull/6/head
Marek Grabowski 2016-02-15 17:06:26 +01:00
parent 05666fe614 f0bc1b6cd0
commit b1db8d3e9b
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
test/e2e/log_size_monitoring.go
View File

@ -218,6 +218,15 @@ func (g *LogSizeGatherer) Run() {
} }
} }
func (g *LogSizeGatherer) pushWorkItem(workItem WorkItem) {
select {
case <-time.After(time.Duration(workItem.backoffMultiplier) * pollingPeriod):
g.workChannel <- workItem
case <-g.stopChannel:
return
}
}
// Work does a single unit of work: tries to take out a WorkItem from the queue, ssh-es into a given machine, // Work does a single unit of work: tries to take out a WorkItem from the queue, ssh-es into a given machine,
// gathers data, writes it to the shared <data> map, and creates a gorouting which reinserts work item into // gathers data, writes it to the shared <data> map, and creates a gorouting which reinserts work item into
// the queue with a <pollingPeriod> delay. Returns false if worker should exit. // the queue with a <pollingPeriod> delay. Returns false if worker should exit.
@ -239,7 +248,7 @@ func (g *LogSizeGatherer) Work() bool {
if workItem.backoffMultiplier < 128 { if workItem.backoffMultiplier < 128 {
workItem.backoffMultiplier *= 2 workItem.backoffMultiplier *= 2
} }
g.workChannel <- workItem go g.pushWorkItem(workItem)
return true return true
} }
workItem.backoffMultiplier = 1 workItem.backoffMultiplier = 1
@ -255,13 +264,6 @@ func (g *LogSizeGatherer) Work() bool {
} }
g.data.AddNewData(workItem.ip, path, now, size) g.data.AddNewData(workItem.ip, path, now, size)
} }
go func() { go g.pushWorkItem(workItem)
select {
case <-time.After(time.Duration(workItem.backoffMultiplier) * pollingPeriod):
g.workChannel <- workItem
case <-g.stopChannel:
return
}
}()
return true return true
} }