Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

internal/client: remove the lock for idle connection recycle #277

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 2 additions & 8 deletions internal/client/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -261,9 +261,7 @@ type RPCClient struct {
security config.Security

idleNotify uint32
// recycleMu protect the conns from being modified during a connArray is taken out and used.
// That means recycleIdleConnArray() will wait until nobody doing sendBatchRequest()
recycleMu sync.RWMutex

// Periodically check whether there is any connection that is idle and then close and remove these connections.
// Implement background cleanup.
isClosed bool
Expand Down Expand Up @@ -363,22 +361,18 @@ func (c *RPCClient) SendRequest(ctx context.Context, addr string, req *tikvrpc.R
ctx = opentracing.ContextWithSpan(ctx, span1)
}

start := time.Now()
if atomic.CompareAndSwapUint32(&c.idleNotify, 1, 0) {
go c.recycleIdleConnArray()
}

// TiDB will not send batch commands to TiFlash, to resolve the conflict with Batch Cop Request.
enableBatch := req.StoreTp != tikvrpc.TiDB && req.StoreTp != tikvrpc.TiFlash
c.recycleMu.RLock()
defer c.recycleMu.RUnlock()
connArray, err := c.getConnArray(addr, enableBatch)
if err != nil {
return nil, errors.Trace(err)
}
metrics.TiKVBatchClientRecycle.Observe(time.Since(start).Seconds())

start = time.Now()
start := time.Now()
defer func() {
stmtExec := ctx.Value(util.ExecDetailsKey)
if stmtExec != nil {
Expand Down
8 changes: 6 additions & 2 deletions internal/client/client_batch.go
Original file line number Diff line number Diff line change
Expand Up @@ -795,8 +795,7 @@ func sendBatchRequest(
}

func (c *RPCClient) recycleIdleConnArray() {
c.recycleMu.Lock()
defer c.recycleMu.Unlock()
start := time.Now()

var addrs []string
c.RLock()
Expand All @@ -816,8 +815,13 @@ func (c *RPCClient) recycleIdleConnArray() {
zap.String("target", addr))
}
c.Unlock()

// NOTE, There is a risk that an idle connection become active again, and here is
// a race condition someone is using the connection and it's closed here.
if conn != nil {
conn.Close()
}
}

metrics.TiKVBatchClientRecycle.Observe(time.Since(start).Seconds())
}