fix rpc client panic cause by concurrent close (tikv#1359)

close issue tikv#1357 --------- Signed-off-by: crazycs520 <[email protected]>
crazycs520 · Jul 24, 2024 · 1baa1dc · 1baa1dc
1 parent be14c99
commit 1baa1dc
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 0 deletions.
diff --git a/internal/client/client.go b/internal/client/client.go
@@ -863,6 +863,10 @@ func (c *RPCClient) CloseAddr(addr string) error {
 
 func (c *RPCClient) CloseAddrVer(addr string, ver uint64) error {
 	c.Lock()
+	if c.isClosed {
+		c.Unlock()
+		return nil
+	}
 	conn, ok := c.conns[addr]
 	if ok {
 		if conn.ver <= ver {

diff --git a/internal/client/client_test.go b/internal/client/client_test.go
@@ -1047,3 +1047,23 @@ func TestFastFailWhenNoAvailableConn(t *testing.T) {
 	require.Equal(t, "no available connections", err.Error())
 	require.Less(t, time.Since(start), timeout)
 }
+
+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()
+}