database/tidb
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

util/etcd: remove useless code (#62833)

Browse Source 
ref pingcap/tidb#59737
This commit is contained in:
CbcWestwolf
2025-08-05 17:52:27 +08:00
committed by GitHub
parent 387e2148ea
commit 2f0bafe98b
10 changed files with 23 additions and 710 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/executor/importer/BUILD.bazel
View File

@ -153,7 +153,6 @@ go_test(
"//pkg/util/chunk",
"//pkg/util/dbterror/exeerrors",
"//pkg/util/dbterror/plannererrors",
"//pkg/util/etcd",
"//pkg/util/logutil",
"//pkg/util/mock",
"//pkg/util/promutil",

15
pkg/executor/importer/precheck.go
View File

@ -28,9 +28,9 @@ import (
"github.com/pingcap/tidb/pkg/util"
"github.com/pingcap/tidb/pkg/util/cdcutil"
"github.com/pingcap/tidb/pkg/util/dbterror/exeerrors"
"github.com/pingcap/tidb/pkg/util/etcd"
"github.com/pingcap/tidb/pkg/util/intest"
"github.com/pingcap/tidb/pkg/util/sqlexec"
clientv3 "go.etcd.io/etcd/client/v3"
)
const (
@ -112,7 +112,7 @@ func (*LoadDataController) checkCDCPiTRTasks(ctx context.Context) error {
}
defer terror.Call(cli.Close)
pitrCli := streamhelper.NewMetaDataClient(cli.GetClient())
pitrCli := streamhelper.NewMetaDataClient(cli)
tasks, err := pitrCli.GetAllTasks(ctx)
if err != nil {
return err
@ -125,7 +125,7 @@ func (*LoadDataController) checkCDCPiTRTasks(ctx context.Context) error {
return exeerrors.ErrLoadDataPreCheckFailed.FastGenByArgs(fmt.Sprintf("found PiTR log streaming task(s): %v,", names))
}
nameSet, err := cdcutil.GetRunningChangefeeds(ctx, cli.GetClient())
nameSet, err := cdcutil.GetRunningChangefeeds(ctx, cli)
if err != nil {
return errors.Trace(err)
}
@ -171,7 +171,7 @@ func (e *LoadDataController) checkGlobalSortStorePrivilege(ctx context.Context)
return nil
}
func getEtcdClient() (*etcd.Client, error) {
func getEtcdClient() (cli *clientv3.Client, err error) {
tidbCfg := tidb.GetGlobalConfig()
tls, err := util.NewTLSConfig(
util.WithCAPath(tidbCfg.Security.ClusterSSLCA),
@ -184,5 +184,10 @@ func getEtcdClient() (*etcd.Client, error) {
if err != nil {
return nil, err
}
return etcd.NewClientFromCfg(ectdEndpoints, etcdDialTimeout, "", tls)
return clientv3.New(clientv3.Config{
Endpoints: ectdEndpoints,
DialTimeout: etcdDialTimeout,
TLS: tls,
AutoSyncInterval: 30 * time.Second,
})
}

5
pkg/executor/importer/precheck_test.go
View File

@ -33,7 +33,6 @@ import (
"github.com/pingcap/tidb/pkg/testkit"
"github.com/pingcap/tidb/pkg/util/cdcutil"
"github.com/pingcap/tidb/pkg/util/dbterror/exeerrors"
"github.com/pingcap/tidb/pkg/util/etcd"
"github.com/stretchr/testify/require"
"github.com/tikv/client-go/v2/util"
clientv3 "go.etcd.io/etcd/client/v3"
@ -126,12 +125,12 @@ func TestCheckRequirements(t *testing.T) {
embedEtcd.Close()
})
backup := importer.GetEtcdClient
importer.GetEtcdClient = func() (*etcd.Client, error) {
importer.GetEtcdClient = func() (*clientv3.Client, error) {
etcdCli, err := clientv3.New(clientv3.Config{
Endpoints: []string{clientAddr},
})
require.NoError(t, err)
return etcd.NewClient(etcdCli, ""), nil
return etcdCli, nil
}
t.Cleanup(func() {
importer.GetEtcdClient = backup