zeromicro/go-zero
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix potential data race in PeriodicalExecutor (#344)

Browse Source 
* fix potential data race in PeriodicalExecutor

* add comment
This commit is contained in:
Kevin Wan
2021-01-03 20:56:17 +08:00
committed by GitHub
parent 771371e051
commit efa43483b2
1 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
core/executors/periodicalexecutor.go
View File

@@ -134,9 +134,6 @@ func (pe *PeriodicalExecutor) backgroundFlush() {
} else if pe.Flush() { } else if pe.Flush() {
last = timex.Now() last = timex.Now()
} else if pe.shallQuit(last) { } else if pe.shallQuit(last) {
pe.lock.Lock()
pe.guarded = false
pe.lock.Unlock()
return return
} }
} }
@@ -180,8 +177,18 @@ func (pe *PeriodicalExecutor) hasTasks(tasks interface{}) bool {
} }
} }
func (pe *PeriodicalExecutor) shallQuit(last time.Duration) bool { func (pe *PeriodicalExecutor) shallQuit(last time.Duration) (stop bool) {
idleEnough := timex.Since(last) > pe.interval*idleRound if timex.Since(last) <= pe.interval*idleRound {
noPending := atomic.LoadInt32(&pe.inflight) == 0 return
return idleEnough && noPending }
// checking pe.inflight and setting pe.guarded should be locked together
pe.lock.Lock()
if atomic.LoadInt32(&pe.inflight) == 0 {
pe.guarded = false
stop = true
}
pe.lock.Unlock()
return
} }