Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: tikv/pd
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: d271fd91510449fa2dee4ed5db1741149ab91605
Choose a base ref
..
head repository: tikv/pd
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 383b147964c1e71578f5b941aa1f49eecdf0106a
Choose a head ref
Showing with 3 additions and 8 deletions.
  1. +0 −1 client/errs/errno.go
  2. +3 −1 client/pkg/deadline/watcher.go
  3. +0 −5 errors.toml
  4. +0 −1 pkg/errs/errno.go
1 change: 0 additions & 1 deletion client/errs/errno.go
View file
Original file line number Diff line number Diff line change
@@ -56,7 +56,6 @@ var (
ErrClientGetMetaStorageClient = errors.Normalize("failed to get meta storage client", errors.RFCCodeText("PD:client:ErrClientGetMetaStorageClient"))
ErrClientCreateTSOStream = errors.Normalize("create TSO stream failed, %s", errors.RFCCodeText("PD:client:ErrClientCreateTSOStream"))
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"))
ErrClientGetMinTSO = errors.Normalize("get min TSO failed, %v", errors.RFCCodeText("PD:client:ErrClientGetMinTSO"))
ErrClientGetLeader = errors.Normalize("get leader failed, %v", errors.RFCCodeText("PD:client:ErrClientGetLeader"))
4 changes: 3 additions & 1 deletion client/pkg/deadline/watcher.go
View file
Original file line number Diff line number Diff line change
@@ -18,9 +18,11 @@ import (
"context"
"time"

"go.uber.org/zap"

"github.com/pingcap/log"

"github.com/tikv/pd/client/pkg/utils/timerutil"
"go.uber.org/zap"
)

// The `cancel` function will be invoked once the specified `timeout` elapses without receiving a `done` signal.
5 changes: 0 additions & 5 deletions errors.toml
View file
Original file line number Diff line number Diff line change
@@ -131,11 +131,6 @@ error = '''
get TSO failed
'''

["PD:client:ErrClientGetTSOTimeout"]
error = '''
get TSO timeout
'''

["PD:cluster:ErrInvalidStoreID"]
error = '''
invalid store id %d, not found
1 change: 0 additions & 1 deletion pkg/errs/errno.go
View file
Original file line number Diff line number Diff line change
@@ -144,7 +144,6 @@ var (
// client errors
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", errors.RFCCodeText("PD:client:ErrClientGetTSO"))
ErrClientGetLeader = errors.Normalize("get leader failed, %v", errors.RFCCodeText("PD:client:ErrClientGetLeader"))
ErrClientGetMember = errors.Normalize("get member failed", errors.RFCCodeText("PD:client:ErrClientGetMember"))