Skip to content

Commit

Permalink
fix rpc client panic cause by concurrent close (#1359) (#1396)
Browse files Browse the repository at this point in the history
close issue #1357



---------

Signed-off-by: crazycs520 <[email protected]>
  • Loading branch information
crazycs520 authored Aug 21, 2024
1 parent e46211a commit 9c2e786
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 0 deletions.
4 changes: 4 additions & 0 deletions internal/client/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -786,6 +786,10 @@ func (c *RPCClient) Close() error {
// CloseAddr closes gRPC connections to the address.
func (c *RPCClient) CloseAddr(addr string) error {
c.Lock()
if c.isClosed {
c.Unlock()
return nil
}
conn, ok := c.conns[addr]
if ok {
delete(c.conns, addr)
Expand Down
20 changes: 20 additions & 0 deletions internal/client/client_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -640,3 +640,23 @@ func TestTraceExecDetails(t *testing.T) {
})
}
}

func TestConcurrentCloseConnPanic(t *testing.T) {
client := NewRPCClient()
addr := "127.0.0.1:6379"
_, err := client.getConnArray(addr, true)
assert.Nil(t, err)
var wg sync.WaitGroup
wg.Add(2)
go func() {
defer wg.Done()
err := client.Close()
assert.Nil(t, err)
}()
go func() {
defer wg.Done()
err := client.CloseAddr(addr)
assert.Nil(t, err)
}()
wg.Wait()
}

0 comments on commit 9c2e786

Please sign in to comment.