Restore: support configuring TiKV GC life time

pingcap · Mar 2, 2020 · 414597d · 414597d
1 parent 82e05a0
commit 414597d
Show file tree

Hide file tree

Showing 21 changed files with 296 additions and 138 deletions.
diff --git a/cmd/backup-manager/app/backup/backup.go b/cmd/backup-manager/app/backup/backup.go
@@ -20,17 +20,16 @@ import (
 	"os/exec"
 
 	"github.com/gogo/protobuf/proto"
-	"k8s.io/klog"
-
 	kvbackup "github.com/pingcap/kvproto/pkg/backup"
 	"github.com/pingcap/tidb-operator/cmd/backup-manager/app/constants"
 	"github.com/pingcap/tidb-operator/cmd/backup-manager/app/util"
 	"github.com/pingcap/tidb-operator/pkg/apis/pingcap/v1alpha1"
+	"k8s.io/klog"
 )
 
 // Options contains the input arguments to the backup command
 type Options struct {
-	util.GenericBackupOptions
+	util.GenericOptions
 }
 
 func (bo *Options) backupData(backup *v1alpha1.Backup) (string, error) {

diff --git a/cmd/backup-manager/app/backup/manager.go b/cmd/backup-manager/app/backup/manager.go
@@ -21,6 +21,7 @@ import (
 	"github.com/pingcap/tidb-operator/cmd/backup-manager/app/constants"
 	"github.com/pingcap/tidb-operator/cmd/backup-manager/app/util"
 	"github.com/pingcap/tidb-operator/pkg/apis/pingcap/v1alpha1"
+	bkconstants "github.com/pingcap/tidb-operator/pkg/backup/constants"
 	listers "github.com/pingcap/tidb-operator/pkg/client/listers/pingcap/v1alpha1"
 	"github.com/pingcap/tidb-operator/pkg/controller"
 	corev1 "k8s.io/api/core/v1"
@@ -48,11 +49,29 @@ func NewManager(
 	}
 }
 
+func (bm *Manager) setOptions(backup *v1alpha1.Backup) {
+	bm.Options.Host = backup.Spec.From.Host
+
+	if backup.Spec.From.Port != 0 {
+		bm.Options.Port = backup.Spec.From.Port
+	} else {
+		bm.Options.Port = bkconstants.DefaultTidbPort
+	}
+
+	if backup.Spec.From.User != "" {
+		bm.Options.User = backup.Spec.From.User
+	} else {
+		bm.Options.User = bkconstants.DefaultTidbUser
+	}
+
+	bm.Options.Password = util.GetOptionValueFromEnv(bkconstants.TidbPasswordKey, bkconstants.BackupManagerEnvVarPrefix)
+}
+
 // ProcessBackup used to process the backup logic
 func (bm *Manager) ProcessBackup() error {
-	backup, err := bm.backupLister.Backups(bm.Namespace).Get(bm.BackupName)
+	backup, err := bm.backupLister.Backups(bm.Namespace).Get(bm.ResourceName)
 	if err != nil {
-		klog.Errorf("can't find cluster %s backup %s CRD object, err: %v", bm, bm.BackupName, err)
+		klog.Errorf("can't find cluster %s backup %s CRD object, err: %v", bm, bm.ResourceName, err)
 		return bm.StatusUpdater.Update(backup, &v1alpha1.BackupCondition{
 			Type:    v1alpha1.BackupFailed,
 			Status:  corev1.ConditionTrue,
@@ -65,9 +84,11 @@ func (bm *Manager) ProcessBackup() error {
 		return fmt.Errorf("no br config in %s", bm)
 	}
 
+	bm.setOptions(backup)
+
 	var db *sql.DB
 	err = wait.PollImmediate(constants.PollInterval, constants.CheckTimeout, func() (done bool, err error) {
-		db, err = util.OpenDB(bm.GetDSN(constants.TidbMetaDB))
+		db, err = util.OpenDB(bm.GetDSN())
 		if err != nil {
 			klog.Warningf("can't connect to tidb cluster %s, err: %s", bm, err)
 			return false, nil

diff --git a/cmd/backup-manager/app/cmd/backup.go b/cmd/backup-manager/app/cmd/backup.go
@@ -19,7 +19,6 @@ import (
 	"github.com/pingcap/tidb-operator/cmd/backup-manager/app/backup"
 	"github.com/pingcap/tidb-operator/cmd/backup-manager/app/constants"
 	"github.com/pingcap/tidb-operator/cmd/backup-manager/app/util"
-	bkconstants "github.com/pingcap/tidb-operator/pkg/backup/constants"
 	informers "github.com/pingcap/tidb-operator/pkg/client/informers/externalversions"
 	"github.com/pingcap/tidb-operator/pkg/controller"
 	"github.com/spf13/cobra"
@@ -42,12 +41,7 @@ func NewBackupCommand() *cobra.Command {
 	}
 
 	cmd.Flags().StringVar(&bo.Namespace, "namespace", "", "Backup CR's namespace")
-	cmd.Flags().StringVar(&bo.BackupName, "backupName", "", "Backup CRD object name")
-	cmd.Flags().StringVar(&bo.Host, "host", "", "Tidb cluster access address")
-	cmd.Flags().Int32Var(&bo.Port, "port", bkconstants.DefaultTidbPort, "Port number to use for connecting tidb cluster")
-	cmd.Flags().StringVar(&bo.Password, bkconstants.TidbPasswordKey, "", "Password to use when connecting to tidb cluster")
-	cmd.Flags().StringVar(&bo.User, "user", "", "User for login tidb cluster")
-	util.SetFlagsFromEnv(cmd.Flags(), bkconstants.BackupManagerEnvVarPrefix)
+	cmd.Flags().StringVar(&bo.ResourceName, "backupName", "", "Backup CRD object name")
 	return cmd
 }
 

diff --git a/cmd/backup-manager/app/cmd/export.go b/cmd/backup-manager/app/cmd/export.go
@@ -21,7 +21,6 @@ import (
 	"github.com/pingcap/tidb-operator/cmd/backup-manager/app/constants"
 	"github.com/pingcap/tidb-operator/cmd/backup-manager/app/export"
 	"github.com/pingcap/tidb-operator/cmd/backup-manager/app/util"
-	bkconstants "github.com/pingcap/tidb-operator/pkg/backup/constants"
 	informers "github.com/pingcap/tidb-operator/pkg/client/informers/externalversions"
 	"github.com/pingcap/tidb-operator/pkg/controller"
 	"github.com/spf13/cobra"
@@ -44,14 +43,9 @@ func NewExportCommand() *cobra.Command {
 	}
 
 	cmd.Flags().StringVar(&bo.Namespace, "namespace", "", "Backup CR's namespace")
-	cmd.Flags().StringVar(&bo.Host, "host", "", "Tidb cluster access address")
-	cmd.Flags().Int32Var(&bo.Port, "port", bkconstants.DefaultTidbPort, "Port number to use for connecting tidb cluster")
+	cmd.Flags().StringVar(&bo.ResourceName, "backupName", "", "Backup CRD object name")
 	cmd.Flags().StringVar(&bo.Bucket, "bucket", "", "Bucket in which to store the backup data")
-	cmd.Flags().StringVar(&bo.Password, bkconstants.TidbPasswordKey, "", "Password to use when connecting to tidb cluster")
-	cmd.Flags().StringVar(&bo.User, "user", "", "User for login tidb cluster")
 	cmd.Flags().StringVar(&bo.StorageType, "storageType", "", "Backend storage type")
-	cmd.Flags().StringVar(&bo.BackupName, "backupName", "", "Backup CRD object name")
-	util.SetFlagsFromEnv(cmd.Flags(), bkconstants.BackupManagerEnvVarPrefix)
 	return cmd
 }
 

diff --git a/cmd/backup-manager/app/cmd/import.go b/cmd/backup-manager/app/cmd/import.go
@@ -21,7 +21,6 @@ import (
 	"github.com/pingcap/tidb-operator/cmd/backup-manager/app/constants"
 	"github.com/pingcap/tidb-operator/cmd/backup-manager/app/import"
 	"github.com/pingcap/tidb-operator/cmd/backup-manager/app/util"
-	bkconstants "github.com/pingcap/tidb-operator/pkg/backup/constants"
 	informers "github.com/pingcap/tidb-operator/pkg/client/informers/externalversions"
 	"github.com/pingcap/tidb-operator/pkg/controller"
 	"github.com/spf13/cobra"
@@ -32,7 +31,7 @@ import (
 
 // NewImportCommand implements the restore command
 func NewImportCommand() *cobra.Command {
-	ro := _import.RestoreOpts{}
+	ro := _import.Options{}
 
 	cmd := &cobra.Command{
 		Use:   "import",
@@ -44,17 +43,12 @@ func NewImportCommand() *cobra.Command {
 	}
 
 	cmd.Flags().StringVar(&ro.Namespace, "namespace", "", "Restore CR's namespace")
-	cmd.Flags().StringVar(&ro.Host, "host", "", "Tidb cluster access address")
-	cmd.Flags().Int32Var(&ro.Port, "port", bkconstants.DefaultTidbPort, "Port number to use for connecting tidb cluster")
-	cmd.Flags().StringVar(&ro.Password, bkconstants.TidbPasswordKey, "", "Password to use when connecting to tidb cluster")
-	cmd.Flags().StringVar(&ro.User, "user", "", "User for login tidb cluster")
-	cmd.Flags().StringVar(&ro.RestoreName, "restoreName", "", "Restore CRD object name")
+	cmd.Flags().StringVar(&ro.ResourceName, "restoreName", "", "Restore CRD object name")
 	cmd.Flags().StringVar(&ro.BackupPath, "backupPath", "", "The location of the backup")
-	util.SetFlagsFromEnv(cmd.Flags(), bkconstants.BackupManagerEnvVarPrefix)
 	return cmd
 }
 
-func runImport(restoreOpts _import.RestoreOpts, kubecfg string) error {
+func runImport(restoreOpts _import.Options, kubecfg string) error {
 	kubeCli, cli, err := util.NewKubeAndCRCli(kubecfg)
 	cmdutil.CheckErr(err)
 	options := []informers.SharedInformerOption{

diff --git a/cmd/backup-manager/app/cmd/restore.go b/cmd/backup-manager/app/cmd/restore.go
@@ -21,7 +21,6 @@ import (
 	"github.com/pingcap/tidb-operator/cmd/backup-manager/app/constants"
 	"github.com/pingcap/tidb-operator/cmd/backup-manager/app/restore"
 	"github.com/pingcap/tidb-operator/cmd/backup-manager/app/util"
-	bkconstants "github.com/pingcap/tidb-operator/pkg/backup/constants"
 	informers "github.com/pingcap/tidb-operator/pkg/client/informers/externalversions"
 	"github.com/pingcap/tidb-operator/pkg/controller"
 	"github.com/spf13/cobra"
@@ -44,8 +43,7 @@ func NewRestoreCommand() *cobra.Command {
 	}
 
 	cmd.Flags().StringVar(&ro.Namespace, "namespace", "", "Restore CR's namespace")
-	cmd.Flags().StringVar(&ro.RestoreName, "restoreName", "", "Restore CRD object name")
-	util.SetFlagsFromEnv(cmd.Flags(), bkconstants.BackupManagerEnvVarPrefix)
+	cmd.Flags().StringVar(&ro.ResourceName, "restoreName", "", "Restore CRD object name")
 	return cmd
 }
 

diff --git a/cmd/backup-manager/app/export/export.go b/cmd/backup-manager/app/export/export.go
@@ -23,15 +23,14 @@ import (
 	"time"
 
 	"github.com/mholt/archiver"
-	"k8s.io/klog"
-
 	"github.com/pingcap/tidb-operator/cmd/backup-manager/app/constants"
 	"github.com/pingcap/tidb-operator/cmd/backup-manager/app/util"
+	"k8s.io/klog"
 )
 
 // Options contains the input arguments to the backup command
 type Options struct {
-	util.GenericBackupOptions
+	util.GenericOptions
 	Bucket      string
 	StorageType string
 }

diff --git a/cmd/backup-manager/app/export/manager.go b/cmd/backup-manager/app/export/manager.go
@@ -21,6 +21,7 @@ import (
 	"github.com/pingcap/tidb-operator/cmd/backup-manager/app/constants"
 	"github.com/pingcap/tidb-operator/cmd/backup-manager/app/util"
 	"github.com/pingcap/tidb-operator/pkg/apis/pingcap/v1alpha1"
+	bkconstants "github.com/pingcap/tidb-operator/pkg/backup/constants"
 	listers "github.com/pingcap/tidb-operator/pkg/client/listers/pingcap/v1alpha1"
 	"github.com/pingcap/tidb-operator/pkg/controller"
 	corev1 "k8s.io/api/core/v1"
@@ -48,11 +49,29 @@ func NewBackupManager(
 	}
 }
 
+func (bm *BackupManager) setOptions(backup *v1alpha1.Backup) {
+	bm.Options.Host = backup.Spec.From.Host
+
+	if backup.Spec.From.Port != 0 {
+		bm.Options.Port = backup.Spec.From.Port
+	} else {
+		bm.Options.Port = bkconstants.DefaultTidbPort
+	}
+
+	if backup.Spec.From.User != "" {
+		bm.Options.User = backup.Spec.From.User
+	} else {
+		bm.Options.User = bkconstants.DefaultTidbUser
+	}
+
+	bm.Options.Password = util.GetOptionValueFromEnv(bkconstants.TidbPasswordKey, bkconstants.BackupManagerEnvVarPrefix)
+}
+
 // ProcessBackup used to process the backup logic
 func (bm *BackupManager) ProcessBackup() error {
-	backup, err := bm.backupLister.Backups(bm.Namespace).Get(bm.BackupName)
+	backup, err := bm.backupLister.Backups(bm.Namespace).Get(bm.ResourceName)
 	if err != nil {
-		klog.Errorf("can't find cluster %s backup %s CRD object, err: %v", bm, bm.BackupName, err)
+		klog.Errorf("can't find cluster %s backup %s CRD object, err: %v", bm, bm.ResourceName, err)
 		return bm.StatusUpdater.Update(backup, &v1alpha1.BackupCondition{
 			Type:    v1alpha1.BackupFailed,
 			Status:  corev1.ConditionTrue,
@@ -61,9 +80,11 @@ func (bm *BackupManager) ProcessBackup() error {
 		})
 	}
 
+	bm.setOptions(backup)
+
 	var db *sql.DB
 	err = wait.PollImmediate(constants.PollInterval, constants.CheckTimeout, func() (done bool, err error) {
-		db, err = util.OpenDB(bm.GetDSN(constants.TidbMetaDB))
+		db, err = util.OpenDB(bm.GetDSN())
 		if err != nil {
 			klog.Warningf("can't connect to tidb cluster %s, err: %s", bm, err)
 			return false, nil

diff --git a/cmd/backup-manager/app/import/manager.go b/cmd/backup-manager/app/import/manager.go
@@ -14,13 +14,15 @@
 package _import
 
 import (
+	"database/sql"
 	"fmt"
 	"path/filepath"
 	"time"
 
 	"github.com/pingcap/tidb-operator/cmd/backup-manager/app/constants"
 	"github.com/pingcap/tidb-operator/cmd/backup-manager/app/util"
 	"github.com/pingcap/tidb-operator/pkg/apis/pingcap/v1alpha1"
+	bkconstants "github.com/pingcap/tidb-operator/pkg/backup/constants"
 	listers "github.com/pingcap/tidb-operator/pkg/client/listers/pingcap/v1alpha1"
 	"github.com/pingcap/tidb-operator/pkg/controller"
 	corev1 "k8s.io/api/core/v1"
@@ -29,30 +31,48 @@ import (
 	"k8s.io/klog"
 )
 
-// RestoreManager mainly used to manage backup related work
+// RestoreManager mainly used to manage restore related work
 type RestoreManager struct {
 	restoreLister listers.RestoreLister
 	StatusUpdater controller.RestoreConditionUpdaterInterface
-	RestoreOpts
+	Options
 }
 
 // NewRestoreManager return a RestoreManager
 func NewRestoreManager(
 	restoreLister listers.RestoreLister,
 	statusUpdater controller.RestoreConditionUpdaterInterface,
-	backupOpts RestoreOpts) *RestoreManager {
+	restoreOpts Options) *RestoreManager {
 	return &RestoreManager{
 		restoreLister,
 		statusUpdater,
-		backupOpts,
+		restoreOpts,
 	}
 }
 
+func (rm *RestoreManager) setOptions(restore *v1alpha1.Restore) {
+	rm.Options.Host = restore.Spec.To.Host
+
+	if restore.Spec.To.Port != 0 {
+		rm.Options.Port = restore.Spec.To.Port
+	} else {
+		rm.Options.Port = bkconstants.DefaultTidbPort
+	}
+
+	if restore.Spec.To.User != "" {
+		rm.Options.User = restore.Spec.To.User
+	} else {
+		rm.Options.User = bkconstants.DefaultTidbUser
+	}
+
+	rm.Options.Password = util.GetOptionValueFromEnv(bkconstants.TidbPasswordKey, bkconstants.BackupManagerEnvVarPrefix)
+}
+
 // ProcessRestore used to process the restore logic
 func (rm *RestoreManager) ProcessRestore() error {
-	restore, err := rm.restoreLister.Restores(rm.Namespace).Get(rm.RestoreName)
+	restore, err := rm.restoreLister.Restores(rm.Namespace).Get(rm.ResourceName)
 	if err != nil {
-		klog.Errorf("can't find cluster %s restore %s CRD object, err: %v", rm, rm.RestoreName, err)
+		klog.Errorf("can't find cluster %s restore %s CRD object, err: %v", rm, rm.ResourceName, err)
 		return rm.StatusUpdater.Update(restore, &v1alpha1.RestoreCondition{
 			Type:    v1alpha1.RestoreFailed,
 			Status:  corev1.ConditionTrue,
@@ -61,18 +81,15 @@ func (rm *RestoreManager) ProcessRestore() error {
 		})
 	}
 
+	rm.setOptions(restore)
+
+	var db *sql.DB
 	err = wait.PollImmediate(constants.PollInterval, constants.CheckTimeout, func() (done bool, err error) {
-		db, err := util.OpenDB(rm.getDSN(constants.TidbMetaDB))
+		db, err = util.OpenDB(rm.GetDSN())
 		if err != nil {
-			klog.Warningf("can't open connection to tidb cluster %s, err: %v", rm, err)
-			return false, nil
-		}
-
-		if err := db.Ping(); err != nil {
 			klog.Warningf("can't connect to tidb cluster %s, err: %s", rm, err)
 			return false, nil
 		}
-		db.Close()
 		return true, nil
 	})
 
@@ -86,6 +103,7 @@ func (rm *RestoreManager) ProcessRestore() error {
 		})
 	}
 
+	defer db.Close()
 	return rm.performRestore(restore.DeepCopy())
 }