From c58bc4bf804a3e8f92dd634974ed4f636893c9c1 Mon Sep 17 00:00:00 2001 From: zeripath Date: Fri, 8 May 2020 16:46:05 +0100 Subject: Prevent timer leaks in Workerpool and others (#11333) There is a potential memory leak in `Workerpool` due to the intricacies of `time.Timer` stopping. Whenever a `time.Timer` is `Stop`ped its channel must be cleared using a `select` if the result of the `Stop()` is `false`. Unfortunately in `Workerpool` these were checked the wrong way round. However, there were a few other places that were not being checked. Signed-off-by: Andrew Thornton Co-authored-by: techknowlogick Co-authored-by: Lunny Xiao --- modules/queue/workerpool.go | 22 ++++------------------ 1 file changed, 4 insertions(+), 18 deletions(-) (limited to 'modules/queue/workerpool.go') diff --git a/modules/queue/workerpool.go b/modules/queue/workerpool.go index 952e87681e..45378e3dae 100644 --- a/modules/queue/workerpool.go +++ b/modules/queue/workerpool.go @@ -11,6 +11,7 @@ import ( "time" "code.gitea.io/gitea/modules/log" + "code.gitea.io/gitea/modules/util" ) // WorkerPool represent a dynamically growable worker pool for a @@ -92,12 +93,7 @@ func (p *WorkerPool) pushBoost(data Data) { p.lock.Unlock() select { case p.dataChan <- data: - if timer.Stop() { - select { - case <-timer.C: - default: - } - } + util.StopTimer(timer) case <-timer.C: p.lock.Lock() if p.blockTimeout > ourTimeout || (p.numberOfWorkers > p.maxNumberOfWorkers && p.maxNumberOfWorkers >= 0) { @@ -353,12 +349,7 @@ func (p *WorkerPool) doWork(ctx context.Context) { timer := time.NewTimer(delay) select { case <-ctx.Done(): - if timer.Stop() { - select { - case <-timer.C: - default: - } - } + util.StopTimer(timer) if len(data) > 0 { log.Trace("Handling: %d data, %v", len(data), data) p.handle(data...) @@ -367,12 +358,7 @@ func (p *WorkerPool) doWork(ctx context.Context) { log.Trace("Worker shutting down") return case datum, ok := <-p.dataChan: - if timer.Stop() { - select { - case <-timer.C: - default: - } - } + util.StopTimer(timer) if !ok { // the dataChan has been closed - we should finish up: if len(data) > 0 { -- cgit v1.2.3