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

Jump to bottom

executor, server: reduce connect/disconnect log spam #19308

Merged
merged 9 commits into from Aug 25, 2020
Merged

executor, server: reduce connect/disconnect log spam #19308

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
df4794f
executor, server: reduce log spam
Aug 19, 2020
717da81
Merge branch 'master' into reduce-log-spam
ti-srebot Aug 20, 2020
d530803
Merge branch 'master' into reduce-log-spam
ti-srebot Aug 20, 2020
9950e69
Merge branch 'master' into reduce-log-spam
ngaut Aug 20, 2020
458285d
Merge branch 'master' into reduce-log-spam
ngaut Aug 21, 2020
3b96a3a
Merge branch 'master' into reduce-log-spam
ti-srebot Aug 24, 2020
33fa756
Merge branch 'master' into reduce-log-spam
ti-srebot Aug 25, 2020
252e43d
Merge branch 'master' into reduce-log-spam
ti-srebot Aug 25, 2020
247f602
Merge branch 'master' into reduce-log-spam
ti-srebot Aug 25, 2020
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
6 changes: 3 additions & 3 deletions executor/set.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,11 +212,11 @@ func (e *SetExecutor) setSysVariable(name string, v *expression.VarAssignment) e
terror.Log(err)
}
}
if name != variable.AutoCommit {
if scopeStr == scopeGlobal {
logutil.BgLogger().Info(fmt.Sprintf("set %s var", scopeStr), zap.Uint64("conn", sessionVars.ConnectionID), zap.String("name", name), zap.String("val", valStr))
} else {
// Some applications will set `autocommit` variable before query.
// This will print too many unnecessary log info.
// Clients are often noisy in setting session variables such as
// autocommit, timezone, query cache
logutil.BgLogger().Debug(fmt.Sprintf("set %s var", scopeStr), zap.Uint64("conn", sessionVars.ConnectionID), zap.String("name", name), zap.String("val", valStr))
}

Expand Down
4 changes: 2 additions & 2 deletions server/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -391,10 +391,10 @@ func (s *Server) onConn(conn *clientConn) {
return
}

logutil.Logger(ctx).Info("new connection", zap.String("remoteAddr", conn.bufReadConn.RemoteAddr().String()))
logutil.Logger(ctx).Debug("new connection", zap.String("remoteAddr", conn.bufReadConn.RemoteAddr().String()))

defer func() {
logutil.Logger(ctx).Info("connection closed")
logutil.Logger(ctx).Debug("connection closed")
}()
s.rwlock.Lock()
s.clients[conn.connectionID] = conn
Expand Down