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.

Sign up for GitHub

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

Revert "server: Set default drainClientWait as 15s (#42134) (#48944)" #49101

Merged
merged 1 commit into from
Dec 4, 2023
Merged

Revert "server: Set default drainClientWait as 15s (#42134) (#48944)" #49101

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 0 additions & 2 deletions server/conn.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1111,8 +1111,6 @@ func (cc *clientConn) Run(ctx context.Context) {
// by CAS operation, it would then take some actions accordingly.
for {
// Close connection between txn when we are going to shutdown server.
// Note the current implementation when shutting down, for an idle connection, the connection may block at readPacket()
// consider provider a way to close the connection directly after sometime if we can not read any data.
if cc.server.inShutdownMode.Load() {
if !cc.ctx.GetSessionVars().InTxn() {
return
Expand Down
12 changes: 7 additions & 5 deletions tidb-server/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -836,15 +836,17 @@ func closeDomainAndStorage(storage kv.Storage, dom *domain.Domain) {
terror.Log(errors.Trace(err))
}

// The amount of time we wait for the ongoing txt to finished.
// We should better provider a dynamic way to set this value.
var gracefulCloseConnectionsTimeout = 15 * time.Second

func cleanup(svr *server.Server, storage kv.Storage, dom *domain.Domain, _ bool) {
func cleanup(svr *server.Server, storage kv.Storage, dom *domain.Domain, graceful bool) {
dom.StopAutoAnalyze()

drainClientWait := gracefulCloseConnectionsTimeout

var drainClientWait time.Duration
if graceful {
drainClientWait = 1<<63 - 1
} else {
drainClientWait = gracefulCloseConnectionsTimeout
}
cancelClientWait := time.Second * 1
svr.DrainClients(drainClientWait, cancelClientWait)

Expand Down