fix test

pingcap · Sep 25, 2020 · 38e0f7a · 38e0f7a
1 parent 8814bb6
commit 38e0f7a
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 24 deletions.
diff --git a/pkg/conn/conn.go b/pkg/conn/conn.go
@@ -45,11 +45,11 @@ const (
 
 // Mgr manages connections to a TiDB cluster.
 type Mgr struct {
-	PdMgr    *PdController
-	tlsConf  *tls.Config
-	dom      *domain.Domain
-	storage  tikv.Storage
-	grpcClis struct {
+	PdController *PdController
+	tlsConf      *tls.Config
+	dom          *domain.Domain
+	storage      tikv.Storage
+	grpcClis     struct {
 		mu   sync.Mutex
 		clis map[uint64]*grpc.ClientConn
 	}
@@ -199,29 +199,29 @@ func NewMgr(
 	}
 
 	mgr := &Mgr{
-		PdMgr: &PdController{
+		PdController: &PdController{
 			pdClient: pdClient,
 		},
 		storage:     storage,
 		dom:         dom,
 		tlsConf:     tlsConf,
 		ownsStorage: g.OwnsStorage(),
 	}
-	mgr.PdMgr.addrs = processedAddrs
-	mgr.PdMgr.cli = cli
+	mgr.PdController.addrs = processedAddrs
+	mgr.PdController.cli = cli
 	mgr.grpcClis.clis = make(map[uint64]*grpc.ClientConn)
 	return mgr, nil
 }
 
 // SetPDHTTP set pd addrs and cli for test.
 func (mgr *Mgr) SetPDHTTP(addrs []string, cli *http.Client) {
-	mgr.PdMgr.addrs = addrs
-	mgr.PdMgr.cli = cli
+	mgr.PdController.addrs = addrs
+	mgr.PdController.cli = cli
 }
 
 // SetPDClient set pd addrs and cli for test.
 func (mgr *Mgr) SetPDClient(pdClient pd.Client) {
-	mgr.PdMgr.pdClient = pdClient
+	mgr.PdController.pdClient = pdClient
 }
 
 // GetClusterVersion returns the current cluster version.
@@ -231,8 +231,8 @@ func (mgr *Mgr) GetClusterVersion(ctx context.Context) (string, error) {
 
 func (mgr *Mgr) getClusterVersionWith(ctx context.Context, get pdHTTPRequest) (string, error) {
 	var err error
-	for _, addr := range mgr.PdMgr.addrs {
-		v, e := get(ctx, addr, clusterVersionPrefix, mgr.PdMgr.cli, http.MethodGet, nil)
+	for _, addr := range mgr.PdController.addrs {
+		v, e := get(ctx, addr, clusterVersionPrefix, mgr.PdController.cli, http.MethodGet, nil)
 		if e != nil {
 			err = e
 			continue
@@ -258,11 +258,11 @@ func (mgr *Mgr) getRegionCountWith(
 		end = url.QueryEscape(string(codec.EncodeBytes(nil, endKey)))
 	}
 	var err error
-	for _, addr := range mgr.PdMgr.addrs {
+	for _, addr := range mgr.PdController.addrs {
 		query := fmt.Sprintf(
 			"%s?start_key=%s&end_key=%s",
 			regionCountPrefix, start, end)
-		v, e := get(ctx, addr, query, mgr.PdMgr.cli, http.MethodGet, nil)
+		v, e := get(ctx, addr, query, mgr.PdController.cli, http.MethodGet, nil)
 		if e != nil {
 			err = e
 			continue
@@ -278,7 +278,7 @@ func (mgr *Mgr) getRegionCountWith(
 }
 
 func (mgr *Mgr) getGrpcConnLocked(ctx context.Context, storeID uint64) (*grpc.ClientConn, error) {
-	store, err := mgr.PdMgr.pdClient.GetStore(ctx, storeID)
+	store, err := mgr.PdController.pdClient.GetStore(ctx, storeID)
 	if err != nil {
 		return nil, errors.Trace(err)
 	}
@@ -369,7 +369,7 @@ func (mgr *Mgr) ResetBackupClient(ctx context.Context, storeID uint64) (backup.B
 
 // GetPDClient returns a pd client.
 func (mgr *Mgr) GetPDClient() pd.Client {
-	return mgr.PdMgr.pdClient
+	return mgr.PdController.pdClient
 }
 
 // GetTiKV returns a tikv storage.
@@ -414,5 +414,5 @@ func (mgr *Mgr) Close() {
 		mgr.storage.Close()
 	}
 
-	mgr.PdMgr.Close()
+	mgr.PdController.Close()
 }
diff --git a/pkg/conn/conn_test.go b/pkg/conn/conn_test.go
@@ -37,7 +37,7 @@ type testClientSuite struct {
 
 func (s *testClientSuite) SetUpSuite(c *C) {
 	s.ctx, s.cancel = context.WithCancel(context.Background())
-	s.mgr = &Mgr{}
+	s.mgr = &Mgr{PdController: &PdController{}}
 	s.regions = core.NewRegionsInfo()
 }
 
@@ -46,7 +46,7 @@ func (s *testClientSuite) TearDownSuite(c *C) {
 }
 
 func (s *testClientSuite) TestGetClusterVersion(c *C) {
-	s.mgr.PdMgr.addrs = []string{"", ""} // two endpoints
+	s.mgr.PdController.addrs = []string{"", ""} // two endpoints
 	counter := 0
 	mock := func(context.Context, string, string, *http.Client, string, io.Reader) ([]byte, error) {
 		counter++
@@ -105,7 +105,7 @@ func (s *testClientSuite) TestRegionCount(c *C) {
 		c.Assert(err, IsNil)
 		return ret, nil
 	}
-	s.mgr.PdMgr.addrs = []string{"http://mock"}
+	s.mgr.PdController.addrs = []string{"http://mock"}
 	ctx := context.Background()
 	resp, err := s.mgr.getRegionCountWith(ctx, mock, []byte{}, []byte{})
 	c.Assert(err, IsNil)

diff --git a/pkg/task/backup.go b/pkg/task/backup.go
@@ -217,7 +217,7 @@ func RunBackup(c context.Context, g glue.Glue, cmdName string, cfg *BackupConfig
 
 	if cfg.RemoveSchedulers {
 		log.Debug("removing some PD schedulers")
-		restore, e := mgr.PdMgr.RemoveSchedulers(ctx)
+		restore, e := mgr.PdController.RemoveSchedulers(ctx)
 		defer func() {
 			if restoreE := restore(ctx); restoreE != nil {
 				log.Warn("failed to restore removed schedulers, you may need to restore them manually", zap.Error(restoreE))

diff --git a/pkg/task/backup_raw.go b/pkg/task/backup_raw.go
@@ -142,7 +142,7 @@ func RunBackupRaw(c context.Context, g glue.Glue, cmdName string, cfg *RawKvConf
 	backupRange := rtree.Range{StartKey: cfg.StartKey, EndKey: cfg.EndKey}
 
 	if cfg.RemoveSchedulers {
-		restore, e := mgr.PdMgr.RemoveSchedulers(ctx)
+		restore, e := mgr.PdController.RemoveSchedulers(ctx)
 		defer func() {
 			if restoreE := restore(ctx); restoreE != nil {
 				log.Warn("failed to restore removed schedulers, you may need to restore them manually", zap.Error(restoreE))

diff --git a/pkg/task/restore.go b/pkg/task/restore.go
@@ -344,7 +344,7 @@ func restorePreWork(ctx context.Context, client *restore.Client, mgr *conn.Mgr)
 	// Switch TiKV cluster to import mode (adjust rocksdb configuration).
 	client.SwitchToImportMode(ctx)
 
-	return mgr.PdMgr.RemoveSchedulers(ctx)
+	return mgr.PdController.RemoveSchedulers(ctx)
 }
 
 // restorePostWork executes some post work after restore.