session: use the uniform log format for session #9517
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jackysp
added
type/enhancement
|
/run-all-tests |
|
pingcap/parser#227 merge it first. |
|
/run-all-tests |
1 similar comment
|
/run-all-tests |
Codecov Report
@@ Coverage Diff @@
## master #9517 +/- ##
===========================================
Coverage ? 69.7115%
===========================================
Files ? 381
Lines ? 89090
Branches ? 0
===========================================
Hits ? 62106
Misses ? 21846
Partials ? 5138 |
zimulala
reviewed
Mar 1, 2019
session/bootstrap.go
Outdated
| log.Error("[Upgrade] upgrade error", | ||
| zap.Int64("from", ver), | ||
| zap.Int("to", currentBootstrapVersion)) | ||
| log.Fatal(err.Error()) |
There was a problem hiding this comment.
Could we put these two logs together？
session/txn.go
Outdated
| zap.String("TxnState", st.GoString()), | ||
| zap.String("mutations", fmt.Sprintf("%#v", st.mutations)), | ||
| zap.String("dirtyTableOP", fmt.Sprintf("%#v", st.dirtyTableOP)), | ||
| zap.String("buf", fmt.Sprintf("%#v", st.buf)), |
There was a problem hiding this comment.
Could we add the String() for buf? Maybe other places will use it too.
session/bootstrap.go
Outdated
| @@ -238,7 +239,7 @@ const ( | |||
| func bootstrap(s Session) { | |||
| b, err := checkBootstrapped(s) | |||
| if err != nil { | |||
| log.Fatal(err) | |||
| log.Fatal(err.Error()) | |||
There was a problem hiding this comment.
Do we need to add more information to these logs?
There was a problem hiding this comment.
There're too many of them. It is better to do it in another PR.
winoros
reviewed
Mar 1, 2019
session/session.go
Outdated
| @@ -267,13 +268,13 @@ func (s *session) StoreQueryFeedback(feedback interface{}) { | |||
| if s.statsCollector != nil { | |||
| do, err := GetDomain(s.store) | |||
| if err != nil { | |||
| log.Debug("domain not found: ", err) | |||
| log.Debug("Domain not found", zap.String("error", err.Error())) | |||
There was a problem hiding this comment.
We can directly use zap.Error(err)
jackysp
force-pushed
the
session_log
branch
2 times, most recently
from
fdb5f6c
to
0c44729
Compare
lysu
reviewed
Mar 15, 2019
session/session.go
Outdated
| @@ -1191,7 +1223,8 @@ func (s *session) Auth(user *auth.UserIdentity, authentication []byte, salt []by | |||
| } | |||
| } | |||
|
|
|||
| log.Errorf("User connection verification failed %s", user) | |||
| log.Error("User connection verification failed", | |||
| zap.String("user", user.String())) | |||
There was a problem hiding this comment.
zap.Stringer can avoid String() call if error log level isnt' enable.
session/session.go
Outdated
| log.Warnf("[%s] con:%d session:%v, err:%v in retry", label, connID, s, err) | ||
| logutil.Logger(ctx).Warn("SQL", | ||
| zap.String("label", label), | ||
| zap.String("session", s.String()), |
| logutil.Logger(ctx).Warn("SQL", | ||
| zap.String("label", s.getSQLLabel()), | ||
| zap.Error(err), | ||
| zap.String("txn", s.txn.GoString())) |
There was a problem hiding this comment.
maybe we can make another PR to let zap support zap.GoStringer 😆
session/tidb.go
Outdated
| log.Info("New domain", | ||
| zap.String("store", store.UUID()), | ||
| zap.String("ddl lease", ddlLease.String()), | ||
| zap.String("stats lease", statisticLease.String())) |
zimulala
reviewed
Mar 18, 2019
session/session.go
Outdated
| @@ -267,13 +268,13 @@ func (s *session) StoreQueryFeedback(feedback interface{}) { | |||
| if s.statsCollector != nil { | |||
| do, err := GetDomain(s.store) | |||
| if err != nil { | |||
| log.Debug("domain not found: ", err) | |||
| logutil.Logger(context.Background()).Debug("Domain not found", zap.Error(err)) | |||
session/session.go
Outdated
| metrics.StoreQueryFeedbackCounter.WithLabelValues(metrics.LblError).Inc() | ||
| return | ||
| } | ||
| err = s.statsCollector.StoreQueryFeedback(feedback, do.StatsHandle()) | ||
| if err != nil { | ||
| log.Debug("store query feedback error: ", err) | ||
| logutil.Logger(context.Background()).Debug("Store query feedback", zap.Error(err)) |
session/session.go
Outdated
| @@ -408,7 +412,9 @@ func (s *session) doCommitWithRetry(ctx context.Context) error { | |||
| } | |||
|
|
|||
| if err != nil { | |||
| log.Warnf("con:%d finished txn:%#v, %v", s.sessionVars.ConnectionID, &s.txn, err) | |||
| logutil.Logger(ctx).Warn("Commit failed", | |||
There was a problem hiding this comment.
s/Commit/commit
Please update other places as well.
session/session.go
Outdated
| i, sqlForLog(st.OriginText()), sessVars.GetExecuteArgumentsInfo()) | ||
| logutil.Logger(ctx).Warn("Retrying", | ||
| zap.Int64("schemaVersion", schemaVersion), | ||
| zap.Uint("retry_cnt", retryCnt), |
winoros
approved these changes
Mar 21, 2019
jackysp
added
status/LGT2
jackysp
added a commit
to jackysp/tidb
that referenced
this pull request
Apr 2, 2019
zz-jason
pushed a commit
that referenced
this pull request
Apr 2, 2019
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What problem does this PR solve?
Use the uniform log format for session.
What is changed and how it works?
Use the uniform log format for session.
Check List
Tests
Code changes
Related changes