br: remove error when create the backup client to make caller easier (#…

…39303) close #39302
pingcap · Nov 22, 2022 · 6477e75 · 6477e75
1 parent f894d9b
commit 6477e75
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 24 deletions.
diff --git a/br/pkg/backup/client.go b/br/pkg/backup/client.go
@@ -94,14 +94,14 @@ type Client struct {
 }
 
 // NewBackupClient returns a new backup client.
-func NewBackupClient(ctx context.Context, mgr ClientMgr) (*Client, error) {
+func NewBackupClient(ctx context.Context, mgr ClientMgr) *Client {
 	log.Info("new backup client")
 	pdClient := mgr.GetPDClient()
 	clusterID := pdClient.GetClusterID(ctx)
 	return &Client{
 		clusterID: clusterID,
 		mgr:       mgr,
-	}, nil
+	}
 }
 
 // GetTS gets a new timestamp from PD.

diff --git a/br/pkg/backup/client_test.go b/br/pkg/backup/client_test.go
@@ -57,8 +57,7 @@ func createBackupSuite(t *testing.T) *testBackup {
 	mockMgr := &conn.Mgr{PdController: &pdutil.PdController{}}
 	mockMgr.SetPDClient(s.mockPDClient)
 	mockMgr.SetHTTP([]string{"test"}, nil)
-	s.backupClient, err = backup.NewBackupClient(s.ctx, mockMgr)
-	require.NoError(t, err)
+	s.backupClient = backup.NewBackupClient(s.ctx, mockMgr)
 
 	s.cluster, err = mock.NewCluster()
 	require.NoError(t, err)

diff --git a/br/pkg/task/backup.go b/br/pkg/task/backup.go
@@ -320,10 +320,7 @@ func RunBackup(c context.Context, g glue.Glue, cmdName string, cfg *BackupConfig
 		return errors.Trace(err)
 	}
 
-	client, err := backup.NewBackupClient(ctx, mgr)
-	if err != nil {
-		return errors.Trace(err)
-	}
+	client := backup.NewBackupClient(ctx, mgr)
 	opts := storage.ExternalStorageOptions{
 		NoCredentials:            cfg.NoCreds,
 		SendCredentials:          cfg.SendCreds,
@@ -348,8 +345,10 @@ func RunBackup(c context.Context, g glue.Glue, cmdName string, cfg *BackupConfig
 		TTL:      client.GetGCTTL(),
 		ID:       utils.MakeSafePointID(),
 	}
+
 	// use lastBackupTS as safePoint if exists
-	if cfg.LastBackupTS > 0 {
+	isIncrementalBackup := cfg.LastBackupTS > 0
+	if isIncrementalBackup {
 		sp.BackupTS = cfg.LastBackupTS
 	}
 
@@ -359,8 +358,6 @@ func RunBackup(c context.Context, g glue.Glue, cmdName string, cfg *BackupConfig
 		return errors.Trace(err)
 	}
 
-	isIncrementalBackup := cfg.LastBackupTS > 0
-
 	if cfg.RemoveSchedulers {
 		log.Debug("removing some PD schedulers")
 		restore, e := mgr.RemoveSchedulers(ctx)
@@ -422,7 +419,7 @@ func RunBackup(c context.Context, g glue.Glue, cmdName string, cfg *BackupConfig
 	}
 
 	// nothing to backup
-	if ranges == nil || len(ranges) <= 0 {
+	if len(ranges) == 0 {
 		pdAddress := strings.Join(cfg.PD, ",")
 		log.Warn("Nothing to backup, maybe connected to cluster for restoring",
 			zap.String("PD address", pdAddress))

diff --git a/br/pkg/task/backup_ebs.go b/br/pkg/task/backup_ebs.go
@@ -111,10 +111,7 @@ func RunBackupEBS(c context.Context, g glue.Glue, cfg *BackupConfig) error {
 		return errors.Trace(err)
 	}
 	defer mgr.Close()
-	client, err := backup.NewBackupClient(ctx, mgr)
-	if err != nil {
-		return errors.Trace(err)
-	}
+	client := backup.NewBackupClient(ctx, mgr)
 
 	opts := storage.ExternalStorageOptions{
 		NoCredentials:   cfg.NoCreds,

diff --git a/br/pkg/task/backup_raw.go b/br/pkg/task/backup_raw.go
@@ -144,10 +144,7 @@ func RunBackupRaw(c context.Context, g glue.Glue, cmdName string, cfg *RawKvConf
 	}
 	defer mgr.Close()
 
-	client, err := backup.NewBackupClient(ctx, mgr)
-	if err != nil {
-		return errors.Trace(err)
-	}
+	client := backup.NewBackupClient(ctx, mgr)
 	opts := storage.ExternalStorageOptions{
 		NoCredentials:            cfg.NoCreds,
 		SendCredentials:          cfg.SendCreds,

diff --git a/br/pkg/task/stream.go b/br/pkg/task/stream.go
@@ -307,10 +307,7 @@ func NewStreamMgr(ctx context.Context, cfg *StreamConfig, g glue.Glue, isStreamS
 		mgr: mgr,
 	}
 	if isStreamStart {
-		client, err := backup.NewBackupClient(ctx, mgr)
-		if err != nil {
-			return nil, errors.Trace(err)
-		}
+		client := backup.NewBackupClient(ctx, mgr)
 
 		backend, err := storage.ParseBackend(cfg.Storage, &cfg.BackendOptions)
 		if err != nil {