From e19478d9d02de5fced6d2a373ac0b4fcc44fc908 Mon Sep 17 00:00:00 2001 From: Ti Chi Robot Date: Tue, 11 Feb 2025 16:14:10 +0800 Subject: [PATCH] client: fix confusing error (#9050) (#9061) close tikv/pd#9036 Signed-off-by: ti-chi-bot Signed-off-by: Ryan Leung Co-authored-by: Ryan Leung --- client/base_client.go | 2 +- client/errs/errno.go | 2 +- errors.toml | 2 +- pkg/errs/errno.go | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/client/base_client.go b/client/base_client.go index a5da38dd15c..761e65b9a47 100644 --- a/client/base_client.go +++ b/client/base_client.go @@ -294,7 +294,7 @@ func (c *baseClient) updateMember() error { var errTSO error if err == nil { if members.GetLeader() == nil || len(members.GetLeader().GetClientUrls()) == 0 { - err = errs.ErrClientGetLeader.FastGenByArgs("leader address don't exist") + err = errs.ErrClientGetLeader.FastGenByArgs("leader address doesn't exist") } // Still need to update TsoAllocatorLeaders, even if there is no PD leader errTSO = c.switchTSOAllocatorLeader(members.GetTsoAllocatorLeaders()) diff --git a/client/errs/errno.go b/client/errs/errno.go index 6a490039921..82d723e5d17 100644 --- a/client/errs/errno.go +++ b/client/errs/errno.go @@ -30,7 +30,7 @@ var ( ErrClientTSOStreamClosed = errors.Normalize("encountered TSO stream being closed unexpectedly", errors.RFCCodeText("PD:client:ErrClientTSOStreamClosed")) ErrClientGetTSOTimeout = errors.Normalize("get TSO timeout", errors.RFCCodeText("PD:client:ErrClientGetTSOTimeout")) ErrClientGetTSO = errors.Normalize("get TSO failed, %v", errors.RFCCodeText("PD:client:ErrClientGetTSO")) - ErrClientGetLeader = errors.Normalize("get leader from %v error", errors.RFCCodeText("PD:client:ErrClientGetLeader")) + ErrClientGetLeader = errors.Normalize("get leader failed, %v", errors.RFCCodeText("PD:client:ErrClientGetLeader")) ErrClientGetMember = errors.Normalize("get member failed", errors.RFCCodeText("PD:client:ErrClientGetMember")) ErrClientUpdateMember = errors.Normalize("update member failed, %v", errors.RFCCodeText("PD:client:ErrUpdateMember")) ) diff --git a/errors.toml b/errors.toml index 4630932c00d..6f15a05d5a0 100644 --- a/errors.toml +++ b/errors.toml @@ -63,7 +63,7 @@ create TSO stream failed, %s ["PD:client:ErrClientGetLeader"] error = ''' -get leader from %v error +get leader failed, %v ''' ["PD:client:ErrClientGetMember"] diff --git a/pkg/errs/errno.go b/pkg/errs/errno.go index 38c8385004d..0460c2c7dee 100644 --- a/pkg/errs/errno.go +++ b/pkg/errs/errno.go @@ -66,7 +66,7 @@ var ( ErrClientCreateTSOStream = errors.Normalize("create TSO stream failed, %s", errors.RFCCodeText("PD:client:ErrClientCreateTSOStream")) ErrClientGetTSOTimeout = errors.Normalize("get TSO timeout", errors.RFCCodeText("PD:client:ErrClientGetTSOTimeout")) ErrClientGetTSO = errors.Normalize("get TSO failed, %v", errors.RFCCodeText("PD:client:ErrClientGetTSO")) - ErrClientGetLeader = errors.Normalize("get leader from %v error", errors.RFCCodeText("PD:client:ErrClientGetLeader")) + ErrClientGetLeader = errors.Normalize("get leader failed, %v", errors.RFCCodeText("PD:client:ErrClientGetLeader")) ErrClientGetMember = errors.Normalize("get member failed", errors.RFCCodeText("PD:client:ErrClientGetMember")) )