yuxh/gearman-go
1
0
Fork 1
Code Issues Pull Requests Releases Wiki Activity

add synchronization to prevent race condition on worker shutdown

Browse Source
This commit is contained in:
galih rivanto 2019-05-28 12:45:24 +07:00
parent b902646ce8
commit 0bae664968
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
worker/agent.go
View File

@ -111,6 +111,9 @@ func (a *agent) work() {
} }
func (a *agent) disconnect_error(err error) { func (a *agent) disconnect_error(err error) {
a.Unlock()
defer a.Unlock()
if a.conn != nil { if a.conn != nil {
err = &WorkerDisconnectError{ err = &WorkerDisconnectError{
err: err, err: err,

7
worker/worker.go
View File

@ -4,9 +4,9 @@ package worker
import ( import (
"fmt" "fmt"
"strconv"
"sync" "sync"
"time" "time"
"strconv"
) )
const ( const (
@ -186,7 +186,7 @@ func (worker *Worker) Ready() (err error) {
return return
} }
// Main loop, block here // Work start main loop (blocking)
// Most of time, this should be evaluated in goroutine. // Most of time, this should be evaluated in goroutine.
func (worker *Worker) Work() { func (worker *Worker) Work() {
if !worker.ready { if !worker.ready {
@ -197,7 +197,10 @@ func (worker *Worker) Work() {
} }
} }
worker.Lock()
worker.running = true worker.running = true
worker.Unlock()
for _, a := range worker.agents { for _, a := range worker.agents {
a.Grab() a.Grab()
} }