server, session: Reduce noise from SELECT...FOR UPDATE NOWAIT

Issue: pingcap#26842
dveeden · Sep 14, 2021 · a2e490b · a2e490b
1 parent 6ebfe8a
commit a2e490b
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 9 deletions.
diff --git a/server/conn.go b/server/conn.go
@@ -995,14 +995,18 @@ func (cc *clientConn) Run(ctx context.Context) {
  txnMode = cc.ctx.GetSessionVars().GetReadableTxnMode()
  }
  metrics.ExecuteErrorCounter.WithLabelValues(metrics.ExecuteErrorToLabel(err)).Inc()
- logutil.Logger(ctx).Info("command dispatched failed",
- zap.String("connInfo", cc.String()),
- zap.String("command", mysql.Command2Str[data[0]]),
- zap.String("status", cc.SessionStatusToString()),
- zap.Stringer("sql", getLastStmtInConn{cc}),
- zap.String("txn_mode", txnMode),
- zap.String("err", errStrForLog(err, cc.ctx.GetSessionVars().EnableRedactLog)),
- )
+ if storeerr.ErrLockAcquireFailAndNoWaitSet.Equal(err) {
+ logutil.Logger(ctx).Debug("Expected error for FOR UPDATE NOWAIT", zap.Error(err))
+ } else {
+ logutil.Logger(ctx).Info("command dispatched failed",
+ zap.String("connInfo", cc.String()),
+ zap.String("command", mysql.Command2Str[data[0]]),
+ zap.String("status", cc.SessionStatusToString()),
+ zap.Stringer("sql", getLastStmtInConn{cc}),
+ zap.String("txn_mode", txnMode),
+ zap.String("err", errStrForLog(err, cc.ctx.GetSessionVars().EnableRedactLog)),
+ )
+ }
  err1 := cc.writeError(ctx, err)
  terror.Log(err1)
  }

diff --git a/session/session.go b/session/session.go
@@ -74,6 +74,7 @@ import (
  "github.com/pingcap/tidb/sessionctx/variable"
  "github.com/pingcap/tidb/statistics"
  "github.com/pingcap/tidb/statistics/handle"
+ storeerr "github.com/pingcap/tidb/store/driver/error"
  "github.com/pingcap/tidb/tablecodec"
  "github.com/pingcap/tidb/telemetry"
  "github.com/pingcap/tidb/types"
@@ -1568,7 +1569,7 @@ func (s *session) ExecuteStmt(ctx context.Context, stmtNode ast.StmtNode) (sqlex
  logStmt(stmt, s)
  recordSet, err := runStmt(ctx, s, stmt)
  if err != nil {
- if !kv.ErrKeyExists.Equal(err) {
+ if !kv.ErrKeyExists.Equal(err) && !storeerr.ErrLockAcquireFailAndNoWaitSet.Equal(err) {
  logutil.Logger(ctx).Warn("run statement failed",
  zap.Int64("schemaVersion", s.GetInfoSchema().SchemaMetaVersion()),
  zap.Error(err),