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

*: add a new way to calculate TPS (#12411) #12505

Merged
merged 3 commits into from
Oct 10, 2019
Merged

*: add a new way to calculate TPS (#12411) #12505

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1ffd26d
*: add metrics for tps
zimulala Sep 26, 2019
450c369
Merge branch 'release-3.0' into release-3.0-ea6d00be0453
zimulala Oct 9, 2019
0f2cadb
Merge branch 'release-3.0' into release-3.0-ea6d00be0453
zimulala Oct 10, 2019
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
1 change: 1 addition & 0 deletions metrics/session.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,7 @@ const (
LblOK = "ok"
LblError = "error"
LblRollback = "rollback"
LblComRol = "com_rol"
LblType = "type"
LblDb = "db"
LblResult = "result"
Expand Down
57 changes: 39 additions & 18 deletions session/session.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,13 +80,14 @@ var (
transactionDurationGeneralOK = metrics.TransactionDuration.WithLabelValues(metrics.LblGeneral, "ok")
transactionDurationGeneralError = metrics.TransactionDuration.WithLabelValues(metrics.LblGeneral, "error")

transactionCounterInternalOK = metrics.TransactionCounter.WithLabelValues(metrics.LblInternal, metrics.LblOK)
transactionCounterInternalErr = metrics.TransactionCounter.WithLabelValues(metrics.LblInternal, metrics.LblError)
transactionCounterGeneralOK = metrics.TransactionCounter.WithLabelValues(metrics.LblGeneral, metrics.LblOK)
transactionCounterGeneralErr = metrics.TransactionCounter.WithLabelValues(metrics.LblGeneral, metrics.LblError)

transactionRollbackCounterInternal = metrics.TransactionCounter.WithLabelValues(metrics.LblInternal, metrics.LblRollback)
transactionRollbackCounterGeneral = metrics.TransactionCounter.WithLabelValues(metrics.LblGeneral, metrics.LblRollback)
transactionCounterInternalOK = metrics.TransactionCounter.WithLabelValues(metrics.LblInternal, metrics.LblOK)
transactionCounterInternalErr = metrics.TransactionCounter.WithLabelValues(metrics.LblInternal, metrics.LblError)
transactionCounterGeneralOK = metrics.TransactionCounter.WithLabelValues(metrics.LblGeneral, metrics.LblOK)
transactionCounterGeneralErr = metrics.TransactionCounter.WithLabelValues(metrics.LblGeneral, metrics.LblError)
transactionCounterInternalCommitRollback = metrics.TransactionCounter.WithLabelValues(metrics.LblInternal, metrics.LblComRol)
transactionCounterGeneralCommitRollback = metrics.TransactionCounter.WithLabelValues(metrics.LblGeneral, metrics.LblComRol)
transactionRollbackCounterInternal = metrics.TransactionCounter.WithLabelValues(metrics.LblInternal, metrics.LblRollback)
transactionRollbackCounterGeneral = metrics.TransactionCounter.WithLabelValues(metrics.LblGeneral, metrics.LblRollback)

sessionExecuteRunDurationInternal = metrics.SessionExecuteRunDuration.WithLabelValues(metrics.LblInternal)
sessionExecuteRunDurationGeneral = metrics.SessionExecuteRunDuration.WithLabelValues(metrics.LblGeneral)
Expand Down Expand Up @@ -469,7 +470,7 @@ func (s *session) CommitTxn(ctx context.Context) error {
s.sessionVars.StmtCtx.MergeExecDetails(nil, commitDetail)
}
s.sessionVars.TxnCtx.Cleanup()
s.recordTransactionCounter(err)
s.recordTransactionCounter(nil, err)
return err
}

Expand Down Expand Up @@ -967,6 +968,7 @@ func (s *session) executeStatement(ctx context.Context, connID uint64, stmtNode
}
return nil, err
}
s.recordTransactionCounter(stmtNode, err)
if s.isInternal() {
sessionExecuteRunDurationInternal.Observe(time.Since(startTime).Seconds())
} else {
Expand Down Expand Up @@ -1902,19 +1904,38 @@ func (s *session) recordOnTransactionExecution(err error, counter int, duration
}
}

func (s *session) recordTransactionCounter(err error) {
if s.isInternal() {
if err != nil {
transactionCounterInternalErr.Inc()
func (s *session) recordTransactionCounter(stmtNode ast.StmtNode, err error) {
if stmtNode == nil {
if s.isInternal() {
if err != nil {
transactionCounterInternalErr.Inc()
} else {
transactionCounterInternalOK.Inc()
}
} else {
transactionCounterInternalOK.Inc()
if err != nil {
transactionCounterGeneralErr.Inc()
} else {
transactionCounterGeneralOK.Inc()
}
}
return
}

var isTxn bool
switch stmtNode.(type) {
case *ast.CommitStmt:
isTxn = true
case *ast.RollbackStmt:
isTxn = true
}
if !isTxn {
return
}
if s.isInternal() {
transactionCounterInternalCommitRollback.Inc()
} else {
if err != nil {
transactionCounterGeneralErr.Inc()
} else {
transactionCounterGeneralOK.Inc()
}
transactionCounterGeneralCommitRollback.Inc()
}
}

Expand Down