fix potential data race in PeriodicalExecutor (#344)
* fix potential data race in PeriodicalExecutor * add comment
This commit is contained in:
@@ -134,9 +134,6 @@ func (pe *PeriodicalExecutor) backgroundFlush() {
|
||||
} else if pe.Flush() {
|
||||
last = timex.Now()
|
||||
} else if pe.shallQuit(last) {
|
||||
pe.lock.Lock()
|
||||
pe.guarded = false
|
||||
pe.lock.Unlock()
|
||||
return
|
||||
}
|
||||
}
|
||||
@@ -180,8 +177,18 @@ func (pe *PeriodicalExecutor) hasTasks(tasks interface{}) bool {
|
||||
}
|
||||
}
|
||||
|
||||
func (pe *PeriodicalExecutor) shallQuit(last time.Duration) bool {
|
||||
idleEnough := timex.Since(last) > pe.interval*idleRound
|
||||
noPending := atomic.LoadInt32(&pe.inflight) == 0
|
||||
return idleEnough && noPending
|
||||
func (pe *PeriodicalExecutor) shallQuit(last time.Duration) (stop bool) {
|
||||
if timex.Since(last) <= pe.interval*idleRound {
|
||||
return
|
||||
}
|
||||
|
||||
// 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
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user