Skip to content

Commit 84533b3

Browse files
lcwangchaolcwangchao
committed
This is an automated cherry-pick of pingcap#69971
Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
1 parent 2c22c61 commit 84533b3

16 files changed

Lines changed: 349 additions & 15 deletions

File tree

‎DEPS.bzl‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3519,8 +3519,13 @@ def go_deps():
35193519
name = "com_github_pingcap_kvproto",
35203520
build_file_proto_mode = "disable_global",
35213521
importpath = "github.com/pingcap/kvproto",
3522+
<<<<<<< HEAD
35223523
sum = "h1:PJIfTrhcVitRq5nJmzTDCV75YpaDJc+YKMtqgyBfH84=",
35233524
version = "v0.0.0-20260716111302-363178052f57",
3525+
=======
3526+
sum = "h1:qW0gHsqY3X3qmyiEfESqpYSF3Vu7agUiAyBnPWQXtm8=",
3527+
version = "v0.0.0-20260721064811-683dad8fa368",
3528+
>>>>>>> 05b396fb663 (executor: expose read pool task details in diagnostics (#69971))
35243529
)
35253530
go_repository(
35263531
name = "com_github_pingcap_log",
@@ -4206,8 +4211,13 @@ def go_deps():
42064211
build_tags = ["nextgen", "intest"],
42074212
build_file_proto_mode = "disable_global",
42084213
importpath = "github.com/tikv/client-go/v2",
4214+
<<<<<<< HEAD
42094215
sum = "h1:RSzuwb/YdgiMPQO7dRZ8ilE71YL4n03nGU9qrCXDZEg=",
42104216
version = "v2.0.8-0.20260716132210-520a5635e5e3",
4217+
=======
4218+
sum = "h1:zku+59sqBs1v9Fvl39FFjDUivvRkKvfhXnYgePdotr8=",
4219+
version = "v2.0.8-0.20260724023932-61ecd7c11416",
4220+
>>>>>>> 05b396fb663 (executor: expose read pool task details in diagnostics (#69971))
42114221
)
42124222
go_repository(
42134223
name = "com_github_tikv_pd_client",

‎go.mod‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,11 @@ require (
100100
github.com/pingcap/errors v0.11.5-0.20260508054701-306e305bcf41
101101
github.com/pingcap/failpoint v0.0.0-20240528011301-b51a646c7c86
102102
github.com/pingcap/fn v1.0.0
103+
<<<<<<< HEAD
103104
github.com/pingcap/kvproto v0.0.0-20260716111302-363178052f57
105+
=======
106+
github.com/pingcap/kvproto v0.0.0-20260721064811-683dad8fa368
107+
>>>>>>> 05b396fb663 (executor: expose read pool task details in diagnostics (#69971))
104108
github.com/pingcap/log v1.1.1-0.20250917021125-19901e015dc9
105109
github.com/pingcap/metering_sdk v0.0.0-20260324055927-14fead745f1d
106110
github.com/pingcap/sysutil v1.0.1-0.20240311050922-ae81ee01f3a5
@@ -123,8 +127,13 @@ require (
123127
github.com/stathat/consistent v1.0.0
124128
github.com/stretchr/testify v1.11.1
125129
github.com/tiancaiamao/appdash v0.0.0-20181126055449-889f96f722a2
130+
<<<<<<< HEAD
126131
github.com/tikv/client-go/v2 v2.0.8-0.20260716132210-520a5635e5e3
127132
github.com/tikv/pd/client v0.0.0-20260716095117-1636e69a936b
133+
=======
134+
github.com/tikv/client-go/v2 v2.0.8-0.20260724023932-61ecd7c11416
135+
github.com/tikv/pd/client v0.0.0-20260708075407-4e05b9d2c2d3
136+
>>>>>>> 05b396fb663 (executor: expose read pool task details in diagnostics (#69971))
128137
github.com/timakin/bodyclose v0.0.0-20241222091800-1db5c5ca4d67
129138
github.com/twmb/murmur3 v1.1.6
130139
github.com/uber/jaeger-client-go v2.22.1+incompatible

‎go.sum‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -726,8 +726,13 @@ github.com/pingcap/fn v1.0.0/go.mod h1:u9WZ1ZiOD1RpNhcI42RucFh/lBuzTu6rw88a+oF2Z
726726
github.com/pingcap/goleveldb v0.0.0-20191226122134-f82aafb29989 h1:surzm05a8C9dN8dIUmo4Be2+pMRb6f55i+UIYrluu2E=
727727
github.com/pingcap/goleveldb v0.0.0-20191226122134-f82aafb29989/go.mod h1:O17XtbryoCJhkKGbT62+L2OlrniwqiGLSqrmdHCMzZw=
728728
github.com/pingcap/kvproto v0.0.0-20191211054548-3c6b38ea5107/go.mod h1:WWLmULLO7l8IOcQG+t+ItJ3fEcrL5FxF0Wu+HrMy26w=
729+
<<<<<<< HEAD
729730
github.com/pingcap/kvproto v0.0.0-20260716111302-363178052f57 h1:PJIfTrhcVitRq5nJmzTDCV75YpaDJc+YKMtqgyBfH84=
730731
github.com/pingcap/kvproto v0.0.0-20260716111302-363178052f57/go.mod h1:rXxWk2UnwfUhLXha1jxRWPADw9eMZGWEWCg92Tgmb/8=
732+
=======
733+
github.com/pingcap/kvproto v0.0.0-20260721064811-683dad8fa368 h1:qW0gHsqY3X3qmyiEfESqpYSF3Vu7agUiAyBnPWQXtm8=
734+
github.com/pingcap/kvproto v0.0.0-20260721064811-683dad8fa368/go.mod h1:z6+aAHB7dBkA+LyinEX+48/ImRJ3jag0Hg0c7wkhEvE=
735+
>>>>>>> 05b396fb663 (executor: expose read pool task details in diagnostics (#69971))
731736
github.com/pingcap/log v0.0.0-20210625125904-98ed8e2eb1c7/go.mod h1:8AanEdAHATuRurdGxZXBz0At+9avep+ub7U1AGYLIMM=
732737
github.com/pingcap/log v1.1.0/go.mod h1:DWQW5jICDR7UJh4HtxXSM20Churx4CQL0fwL/SoOSA4=
733738
github.com/pingcap/log v1.1.1-0.20250917021125-19901e015dc9 h1:qG9BSvlWFEE5otQGamuWedx9LRm0nrHvsQRQiW8SxEs=
@@ -893,10 +898,17 @@ github.com/tidwall/pretty v1.2.1 h1:qjsOFOWWQl+N3RsoF5/ssm1pHmJJwhjlSbZ51I6wMl4=
893898
github.com/tidwall/pretty v1.2.1/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU=
894899
github.com/tidwall/sjson v1.2.5 h1:kLy8mja+1c9jlljvWTlSazM7cKDRfJuR/bOJhcY5NcY=
895900
github.com/tidwall/sjson v1.2.5/go.mod h1:Fvgq9kS/6ociJEDnK0Fk1cpYF4FIW6ZF7LAe+6jwd28=
901+
<<<<<<< HEAD
896902
github.com/tikv/client-go/v2 v2.0.8-0.20260716132210-520a5635e5e3 h1:RSzuwb/YdgiMPQO7dRZ8ilE71YL4n03nGU9qrCXDZEg=
897903
github.com/tikv/client-go/v2 v2.0.8-0.20260716132210-520a5635e5e3/go.mod h1:0IJooYYDE5i4jKOug+hnphJrmrFORf3VgwfpDWsQoTQ=
898904
github.com/tikv/pd/client v0.0.0-20260716095117-1636e69a936b h1:Bk296Skcn1GfRARDmYAuGONfnybon7ZntmCTrlCnzpQ=
899905
github.com/tikv/pd/client v0.0.0-20260716095117-1636e69a936b/go.mod h1:5xk417Ar8t3SNWBhEwAJ/uycGmTs8ZUQN3GgdUJRFhE=
906+
=======
907+
github.com/tikv/client-go/v2 v2.0.8-0.20260724023932-61ecd7c11416 h1:zku+59sqBs1v9Fvl39FFjDUivvRkKvfhXnYgePdotr8=
908+
github.com/tikv/client-go/v2 v2.0.8-0.20260724023932-61ecd7c11416/go.mod h1:JTi9j45KOswYaMEEawAItWPAlZirDAGteZZMDwOo3fE=
909+
github.com/tikv/pd/client v0.0.0-20260708075407-4e05b9d2c2d3 h1:OoBvgoeWmdNEXtS+eOlhysz/OvhA4GS0OdPVhTXteGA=
910+
github.com/tikv/pd/client v0.0.0-20260708075407-4e05b9d2c2d3/go.mod h1:3/Bu91CJONgkDA+Y0v/cnbROSJnu5tQ09vv7JGybUBA=
911+
>>>>>>> 05b396fb663 (executor: expose read pool task details in diagnostics (#69971))
900912
github.com/timakin/bodyclose v0.0.0-20241222091800-1db5c5ca4d67 h1:9LPGD+jzxMlnk5r6+hJnar67cgpDIz/iyD+rfl5r2Vk=
901913
github.com/timakin/bodyclose v0.0.0-20241222091800-1db5c5ca4d67/go.mod h1:mkjARE7Yr8qU23YcGMSALbIxTQ9r9QBVahQOBRfU460=
902914
github.com/tjfoc/gmsm v1.3.2/go.mod h1:HaUcFuY0auTiaHB9MHFGCPx5IaLhTUd2atbCFBQXn9w=

‎pkg/distsql/select_result.go‎

Lines changed: 34 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -403,6 +403,22 @@ func (r *selectResult) fetchRespWithIntermediateResults(ctx context.Context, int
403403
duration := time.Since(startTime)
404404
r.fetchDuration += duration
405405
if err != nil {
406+
<<<<<<< HEAD
407+
=======
408+
// On error paths with a non-nil resultSubset (e.g. ErrMaxKeysReadExceeded),
409+
// still merge CopExecDetails so ProcessedKeys reaches StmtCtx.ExecDetails
410+
// (feeds tidb_keys_examined and the slow query log). Skip
411+
// updateCopRuntimeStats because r.selectResp is not unmarshaled on this
412+
// path, so there are no ExecutionSummaries for per-operator stats.
413+
if resultSubset != nil {
414+
if hasStats, ok := resultSubset.(CopRuntimeStats); ok {
415+
if copStats := hasStats.GetCopRuntimeStats(); copStats != nil {
416+
r.ctx.ExecDetails.MergeCopExecDetails(&copStats.CopExecDetails, duration)
417+
r.ctx.ExecDetails.MergeReadPoolTaskDetails(copStats.ReadPoolTaskDetails)
418+
}
419+
}
420+
}
421+
>>>>>>> 05b396fb663 (executor: expose read pool task details in diagnostics (#69971))
406422
return errors.Trace(err)
407423
}
408424
if r.selectResp != nil {
@@ -463,6 +479,7 @@ func (r *selectResult) fetchRespWithIntermediateResults(ctx context.Context, int
463479
return err
464480
}
465481
r.ctx.ExecDetails.MergeCopExecDetails(&copStats.CopExecDetails, duration)
482+
r.ctx.ExecDetails.MergeReadPoolTaskDetails(copStats.ReadPoolTaskDetails)
466483
}
467484
}
468485
if len(r.selectResp.Chunks) != 0 {
@@ -673,7 +690,14 @@ func (r *selectResult) updateCopRuntimeStats(ctx context.Context, copStats *copr
673690
}
674691
if hasExecutor {
675692
if len(r.copPlanIDs) > 0 {
676-
r.ctx.RuntimeStatsColl.RecordCopStats(r.copPlanIDs[len(r.copPlanIDs)-1], r.storeType, copStats.ScanDetail, copStats.TimeDetail, nil)
693+
r.ctx.RuntimeStatsColl.RecordCopStats(
694+
r.copPlanIDs[len(r.copPlanIDs)-1],
695+
r.storeType,
696+
copStats.ScanDetail,
697+
copStats.TimeDetail,
698+
copStats.ReadPoolTaskDetails,
699+
nil,
700+
)
677701
}
678702
recordExecutionSummariesForTiFlashTasks(r.ctx.RuntimeStatsColl, r.selectResp.GetExecutionSummaries(), r.storeType, r.copPlanIDs)
679703
// report MPP cross AZ network traffic bytes to resource control manager.
@@ -707,7 +731,14 @@ func (r *selectResult) updateCopRuntimeStats(ctx context.Context, copStats *copr
707731
}
708732
planID := r.copPlanIDs[i]
709733
if i == len(r.copPlanIDs)-1 {
710-
r.ctx.RuntimeStatsColl.RecordCopStats(planID, r.storeType, copStats.ScanDetail, copStats.TimeDetail, summary)
734+
r.ctx.RuntimeStatsColl.RecordCopStats(
735+
planID,
736+
r.storeType,
737+
copStats.ScanDetail,
738+
copStats.TimeDetail,
739+
copStats.ReadPoolTaskDetails,
740+
summary,
741+
)
711742
} else if summary != nil {
712743
r.ctx.RuntimeStatsColl.RecordOneCopTask(planID, r.storeType, summary)
713744
}
@@ -757,6 +788,7 @@ func (r *selectResult) close() error {
757788
for _, copStats := range unconsumedCopStats {
758789
_ = r.updateCopRuntimeStats(context.Background(), copStats, time.Duration(0), true)
759790
r.ctx.ExecDetails.MergeCopExecDetails(&copStats.CopExecDetails, 0)
791+
r.ctx.ExecDetails.MergeReadPoolTaskDetails(copStats.ReadPoolTaskDetails)
760792
}
761793
}
762794
}

‎pkg/executor/batch_point_get.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -183,6 +183,7 @@ func (e *BatchPointGetExec) Close() error {
183183
if e.RuntimeStats() != nil {
184184
defer func() {
185185
sc := e.Ctx().GetSessionVars().StmtCtx
186+
sc.MergeReadPoolTaskDetails(e.stats.SnapshotRuntimeStats.GetReadPoolTaskDetails())
186187
sc.RuntimeStatsColl.RegisterStats(e.ID(), e.stats)
187188
timeDetail := e.stats.SnapshotRuntimeStats.GetTimeDetail()
188189
if timeDetail != nil {

‎pkg/executor/point_get.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -273,6 +273,7 @@ func (e *PointGetExecutor) Close() error {
273273
if e.stats != nil {
274274
defer func() {
275275
sc := e.Ctx().GetSessionVars().StmtCtx
276+
sc.MergeReadPoolTaskDetails(e.stats.SnapshotRuntimeStats.GetReadPoolTaskDetails())
276277
sc.RuntimeStatsColl.RegisterStats(e.ID(), e.stats)
277278
timeDetail := e.stats.SnapshotRuntimeStats.GetTimeDetail()
278279
if timeDetail != nil {

‎pkg/executor/slow_query.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1149,7 +1149,7 @@ func getColumnValueFactoryByName(colName string, columnIdx int) (slowQueryColumn
11491149
case variable.SlowLogUserStr, variable.SlowLogHostStr, execdetails.BackoffTypesStr, variable.SlowLogDBStr, variable.SlowLogIndexNamesStr, variable.SlowLogDigestStr,
11501150
variable.SlowLogStatsInfoStr, variable.SlowLogCopProcAddr, variable.SlowLogCopWaitAddr, variable.SlowLogPlanDigest,
11511151
variable.SlowLogPrevStmt, variable.SlowLogQuerySQLStr, variable.SlowLogWarnings, variable.SlowLogSessAliasStr,
1152-
variable.SlowLogResourceGroup, variable.SlowLogRequestUnitV2Detail:
1152+
variable.SlowLogResourceGroup, variable.SlowLogRequestUnitV2Detail, execdetails.ReadPoolTaskDetailsStr:
11531153
return func(row []types.Datum, value string, _ *time.Location, _ *slowLogChecker) (valid bool, err error) {
11541154
row[columnIdx] = types.NewStringDatum(value)
11551155
return true, nil

‎pkg/executor/slow_query_sql_test.go‎

Lines changed: 143 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,21 +19,27 @@ import (
1919
"fmt"
2020
"math"
2121
"os"
22+
"strings"
2223
"testing"
2324
"time"
2425

26+
"github.com/pingcap/failpoint"
27+
"github.com/pingcap/kvproto/pkg/coprocessor"
28+
"github.com/pingcap/kvproto/pkg/kvrpcpb"
2529
"github.com/pingcap/tidb/pkg/config"
2630
"github.com/pingcap/tidb/pkg/executor"
2731
"github.com/pingcap/tidb/pkg/meta/model"
2832
"github.com/pingcap/tidb/pkg/parser/ast"
2933
"github.com/pingcap/tidb/pkg/parser/auth"
3034
"github.com/pingcap/tidb/pkg/store/mockstore"
35+
"github.com/pingcap/tidb/pkg/store/mockstore/unistore"
3136
"github.com/pingcap/tidb/pkg/testkit"
3237
"github.com/pingcap/tidb/pkg/testkit/external"
3338
"github.com/pingcap/tidb/pkg/testkit/testdata"
3439
"github.com/pingcap/tidb/pkg/testkit/testutil"
3540
"github.com/pingcap/tidb/pkg/util/logutil"
3641
"github.com/stretchr/testify/require"
42+
"github.com/tikv/client-go/v2/tikvrpc"
3743
)
3844

3945
func TestSlowQueryWithoutSlowLog(t *testing.T) {
@@ -553,6 +559,143 @@ func TestStorageEnginesInSlowQuery(t *testing.T) {
553559
Check(testkit.Rows("1 0"))
554560
}
555561

562+
func TestReadPoolTaskDetailsInDiagnostics(t *testing.T) {
563+
originCfg := config.GetGlobalConfig()
564+
newCfg := *originCfg
565+
f, err := os.CreateTemp("", "tidb-slow-*.log")
566+
require.NoError(t, err)
567+
newCfg.Log.SlowQueryFile = f.Name()
568+
config.StoreGlobalConfig(&newCfg)
569+
t.Cleanup(func() {
570+
if t.Failed() {
571+
if data, err := os.ReadFile(f.Name()); err == nil {
572+
t.Logf("slow log contents (%d bytes):\n%s", len(data), data)
573+
}
574+
}
575+
config.StoreGlobalConfig(originCfg)
576+
require.NoError(t, f.Close())
577+
require.NoError(t, os.Remove(f.Name()))
578+
})
579+
require.NoError(t, logutil.InitLogger(newCfg.Log.ToLogConfig()))
580+
581+
store := testkit.CreateMockStore(t)
582+
tk := testkit.NewTestKit(t, store)
583+
tk.MustExec("use test")
584+
tk.MustExec(fmt.Sprintf("set @@tidb_slow_query_file='%v'", f.Name()))
585+
tk.MustExec("set tidb_slow_log_threshold=0")
586+
tk.MustExec("set tidb_enable_paging=0")
587+
t.Cleanup(func() {
588+
tk.MustExec("set tidb_slow_log_threshold=300")
589+
})
590+
591+
tk.MustExec("create table t_read_pool_details (id int primary key, v int)")
592+
tk.MustExec("insert into t_read_pool_details values (1, 10), (2, 20), (3, 30)")
593+
594+
responseHook := func(_ *tikvrpc.Request, resp *tikvrpc.Response) {
595+
newExecDetails := func() *kvrpcpb.ExecDetailsV2 {
596+
return &kvrpcpb.ExecDetailsV2{
597+
ReadPoolTaskDetails: &kvrpcpb.PoolTaskDetails{
598+
PollCount: 4,
599+
DispatchCount: 2,
600+
TotalWallNanos: uint64((20 * time.Millisecond).Nanoseconds()),
601+
TotalQueueWaitNanos: uint64((6 * time.Millisecond).Nanoseconds()),
602+
MaxQueueWaitNanos: uint64((4 * time.Millisecond).Nanoseconds()),
603+
MinQueueWaitNanos: uint64((2 * time.Millisecond).Nanoseconds()),
604+
TotalWakeWaitNanos: uint64((4 * time.Millisecond).Nanoseconds()),
605+
MaxWakeWaitNanos: uint64((4 * time.Millisecond).Nanoseconds()),
606+
MinWakeWaitNanos: uint64((4 * time.Millisecond).Nanoseconds()),
607+
FairQueueEnabled: true,
608+
TotalFairQueueWaitedTaskSlices: 6,
609+
MaxFairQueueWaitedTaskSlices: 4,
610+
MinFairQueueWaitedTaskSlices: 2,
611+
PollCpuNanos: uint64((8 * time.Millisecond).Nanoseconds()),
612+
MaxPollCpuNanos: uint64((3 * time.Millisecond).Nanoseconds()),
613+
MinPollCpuNanos: uint64((1 * time.Millisecond).Nanoseconds()),
614+
PollWallNanos: uint64((12 * time.Millisecond).Nanoseconds()),
615+
MaxPollWallNanos: uint64((5 * time.Millisecond).Nanoseconds()),
616+
MinPollWallNanos: uint64((2 * time.Millisecond).Nanoseconds()),
617+
},
618+
}
619+
}
620+
621+
switch typedResp := resp.Resp.(type) {
622+
case *kvrpcpb.GetResponse:
623+
typedResp.ExecDetailsV2 = newExecDetails()
624+
case *kvrpcpb.BatchGetResponse:
625+
typedResp.ExecDetailsV2 = newExecDetails()
626+
case *coprocessor.Response:
627+
typedResp.ExecDetailsV2 = newExecDetails()
628+
}
629+
}
630+
unistore.UnistoreRPCClientResponseHook.Store(&responseHook)
631+
require.NoError(t, failpoint.Enable(
632+
"github.com/pingcap/tidb/pkg/store/mockstore/unistore/unistoreRPCClientResponseHook",
633+
"return(true)",
634+
))
635+
t.Cleanup(func() {
636+
unistore.UnistoreRPCClientResponseHook.Store(nil)
637+
require.NoError(t, failpoint.Disable(
638+
"github.com/pingcap/tidb/pkg/store/mockstore/unistore/unistoreRPCClientResponseHook",
639+
))
640+
})
641+
642+
const expectedDetails = "{tasks:1, poll_count:{total:4, avg:4, max:4, min:4}, " +
643+
"dispatch_count:{total:2, max:2, min:2}, " +
644+
"task_wall_time:{total:20ms, avg:20ms, max:20ms, min:20ms}, " +
645+
"queue_wait:{total:6ms, avg:3ms, max:4ms, min:2ms}, " +
646+
"wake_wait:{total:4ms, avg:4ms, max:4ms, min:4ms}, " +
647+
"fair_queue:{enabled:true, waited_task_slices:{total:6, avg:3, max:4, min:2}}, " +
648+
"poll_cpu:{total:8ms, avg:2ms, max:3ms, min:1ms}, " +
649+
"poll_wall:{total:12ms, avg:3ms, max:5ms, min:2ms}}"
650+
cases := []struct {
651+
name string
652+
plan string
653+
sql string
654+
}{
655+
{
656+
name: "point get",
657+
plan: "Point_Get",
658+
sql: "select /* read_pool_point_get */ * from t_read_pool_details where id = 1",
659+
},
660+
{
661+
name: "batch point get",
662+
plan: "Batch_Point_Get",
663+
sql: "select /* read_pool_batch_point_get */ * from t_read_pool_details where id in (1, 2)",
664+
},
665+
{
666+
name: "cop task",
667+
plan: "TableReader",
668+
sql: "select /* read_pool_cop */ * from t_read_pool_details where v >= 10",
669+
},
670+
}
671+
672+
for _, testCase := range cases {
673+
t.Run(testCase.name, func(t *testing.T) {
674+
tk.MustHavePlan(testCase.sql, testCase.plan)
675+
tk.MustQuery(testCase.sql)
676+
tk.EventuallyMustQueryAndCheck(
677+
"select read_pool_task_details from information_schema.slow_query "+
678+
"where query = '"+testCase.sql+";' "+
679+
"order by time desc limit 1",
680+
nil,
681+
testkit.Rows(expectedDetails),
682+
2*time.Second,
683+
50*time.Millisecond,
684+
)
685+
686+
rows := tk.MustQuery("explain analyze " + testCase.sql).Rows()
687+
foundDetails := false
688+
for _, row := range rows {
689+
if strings.Contains(fmt.Sprint(row[5]), "read_pool:"+expectedDetails) {
690+
foundDetails = true
691+
break
692+
}
693+
}
694+
require.True(t, foundDetails, "read-pool task details not found in EXPLAIN ANALYZE output: %v", rows)
695+
})
696+
}
697+
}
698+
556699
func TestSessionConnectAttrsInSlowQuery(t *testing.T) {
557700
originCfg := config.GetGlobalConfig()
558701
newCfg := *originCfg

‎pkg/executor/slow_query_test.go‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,11 @@ select * from t;`
190190
}
191191
expectRecordString := `2019-04-28 15:24:04.309074,` +
192192
`405888132465033227,root,localhost,0,alias123,57,0.12,0.216905,` +
193+
<<<<<<< HEAD
193194
`0,0,0,0,0,0,0,0,0,0,0,0,,0,0,0,0,0,0,0.38,0.021,0,0,0,1,637,0,10,10,10,10,100,,,1,42a1c8aae6f133e934d4bf0147491709a8812ea05ff8819ec522780fe657b772,t1:1,t2:2,` +
195+
=======
196+
`0,0,0,0,0,0,0,0,0,0,0,0,,0,0,0,0,0,0,0.38,0.021,0,0,0,1,637,0,10,10,10,10,100,4,4096,0.015,,,,1,42a1c8aae6f133e934d4bf0147491709a8812ea05ff8819ec522780fe657b772,t1:1,t2:2,` +
197+
>>>>>>> 05b396fb663 (executor: expose read pool task details in diagnostics (#69971))
194198
`0.1,0.2,0.03,127.0.0.1:20160,0.05,0.6,0.8,0.0.0.0:20160,70724,23333,65536,0,0,0,30000,3000,10000,1000,500000,500005,300000,300005,0,0,,` +
195199
`Cop_backoff_regionMiss_total_times: 200 Cop_backoff_regionMiss_total_time: 0.2 Cop_backoff_regionMiss_max_time: 0.2 Cop_backoff_regionMiss_max_addr: 127.0.0.1 Cop_backoff_regionMiss_avg_time: 0.2 Cop_backoff_regionMiss_p90_time: 0.2 Cop_backoff_rpcPD_total_times: 200 Cop_backoff_rpcPD_total_time: 0.2 Cop_backoff_rpcPD_max_time: 0.2 Cop_backoff_rpcPD_max_addr: 127.0.0.1 Cop_backoff_rpcPD_avg_time: 0.2 Cop_backoff_rpcPD_p90_time: 0.2 Cop_backoff_rpcTiKV_total_times: 200 Cop_backoff_rpcTiKV_total_time: 0.2 Cop_backoff_rpcTiKV_max_time: 0.2 Cop_backoff_rpcTiKV_max_addr: 127.0.0.1 Cop_backoff_rpcTiKV_avg_time: 0.2 Cop_backoff_rpcTiKV_p90_time: 0.2,` +
196200
`0,0,1,0,1,1,0,default,2.158,2.123,0.05,0.01,0.021,1,1,150,total_ru:150.00, tidb_ru:0.00, tikv_ru:100.00, tiflash_ru:50.00,,60e9378c746d9a2be1c791047e008967cf252eb6de9167ad3aa6098fa2d523f4,` +
@@ -213,7 +217,11 @@ select * from t;`
213217
}
214218
expectRecordString = `2019-04-28 15:24:04.309074,` +
215219
`405888132465033227,root,localhost,0,alias123,57,0.12,0.216905,` +
220+
<<<<<<< HEAD
216221
`0,0,0,0,0,0,0,0,0,0,0,0,,0,0,0,0,0,0,0.38,0.021,0,0,0,1,637,0,10,10,10,10,100,,,1,42a1c8aae6f133e934d4bf0147491709a8812ea05ff8819ec522780fe657b772,t1:1,t2:2,` +
222+
=======
223+
`0,0,0,0,0,0,0,0,0,0,0,0,,0,0,0,0,0,0,0.38,0.021,0,0,0,1,637,0,10,10,10,10,100,4,4096,0.015,,,,1,42a1c8aae6f133e934d4bf0147491709a8812ea05ff8819ec522780fe657b772,t1:1,t2:2,` +
224+
>>>>>>> 05b396fb663 (executor: expose read pool task details in diagnostics (#69971))
217225
`0.1,0.2,0.03,127.0.0.1:20160,0.05,0.6,0.8,0.0.0.0:20160,70724,23333,65536,0,0,0,30000,3000,10000,1000,500000,500005,300000,300005,0,0,,` +
218226
`Cop_backoff_regionMiss_total_times: 200 Cop_backoff_regionMiss_total_time: 0.2 Cop_backoff_regionMiss_max_time: 0.2 Cop_backoff_regionMiss_max_addr: 127.0.0.1 Cop_backoff_regionMiss_avg_time: 0.2 Cop_backoff_regionMiss_p90_time: 0.2 Cop_backoff_rpcPD_total_times: 200 Cop_backoff_rpcPD_total_time: 0.2 Cop_backoff_rpcPD_max_time: 0.2 Cop_backoff_rpcPD_max_addr: 127.0.0.1 Cop_backoff_rpcPD_avg_time: 0.2 Cop_backoff_rpcPD_p90_time: 0.2 Cop_backoff_rpcTiKV_total_times: 200 Cop_backoff_rpcTiKV_total_time: 0.2 Cop_backoff_rpcTiKV_max_time: 0.2 Cop_backoff_rpcTiKV_max_addr: 127.0.0.1 Cop_backoff_rpcTiKV_avg_time: 0.2 Cop_backoff_rpcTiKV_p90_time: 0.2,` +
219227
`0,0,1,0,1,1,0,default,2.158,2.123,0.05,0.01,0.021,1,1,150,total_ru:150.00, tidb_ru:0.00, tikv_ru:100.00, tiflash_ru:50.00,,60e9378c746d9a2be1c791047e008967cf252eb6de9167ad3aa6098fa2d523f4,` +
@@ -281,9 +289,15 @@ select * from t;
281289
rows, err = parseSlowLog(ctx, reader)
282290
require.NoError(t, err)
283291
require.Len(t, rows, 1)
292+
<<<<<<< HEAD
284293
value, _ := rows[0][41].ToString()
285294
require.Equal(t, value, "a: b")
286295
value, _ = rows[0][42].ToString()
296+
=======
297+
value, _ := rows[0][45].ToString()
298+
require.Equal(t, value, "a: b")
299+
value, _ = rows[0][46].ToString()
300+
>>>>>>> 05b396fb663 (executor: expose read pool task details in diagnostics (#69971))
287301
require.Equal(t, value, "[t:i: a]")
288302
}
289303

0 commit comments

Comments
 (0)