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

Merge 06a017e098 into 2a518e8661

Browse Source
This commit is contained in:
Sebastian Willing 2022-05-20 15:14:18 +12:00 committed by GitHub
commit 3aaf0432c5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
client/client.go
View File

@ -299,6 +299,11 @@ func (client *Client) Echo(data []byte) (echo []byte, err error) {
}
var mutex sync.Mutex
mutex.Lock()
// Lock the client as only one echo may run parallel
client.Lock()
defer client.Unlock()
client.innerHandler.put("e", func(resp *Response) {
echo = resp.Data
mutex.Unlock()

8
client/pool.go
View File

@ -94,8 +94,6 @@ func (pool *Pool) Remove(addr string) {
func (pool *Pool) Do(funcname string, data []byte,
flag byte, h ResponseHandler) (addr, handle string, err error) {
client := pool.selectServer()
client.Lock()
defer client.Unlock()
handle, err = client.Do(funcname, data, flag, h)
addr = client.addr
return
@ -104,8 +102,6 @@ func (pool *Pool) Do(funcname string, data []byte,
func (pool *Pool) DoBg(funcname string, data []byte,
flag byte) (addr, handle string, err error) {
client := pool.selectServer()
client.Lock()
defer client.Unlock()
handle, err = client.DoBg(funcname, data, flag)
addr = client.addr
return
@ -115,8 +111,6 @@ func (pool *Pool) DoBg(funcname string, data []byte,
// !!!Not fully tested.!!!
func (pool *Pool) Status(addr, handle string) (status *Status, err error) {
if client, ok := pool.Clients[addr]; ok {
client.Lock()
defer client.Unlock()
status, err = client.Status(handle)
} else {
err = ErrNotFound
@ -136,8 +130,6 @@ func (pool *Pool) Echo(addr string, data []byte) (echo []byte, err error) {
return
}
}
client.Lock()
defer client.Unlock()
echo, err = client.Echo(data)
return
}