Clean unused BR code on operator v2 (#6084)

Author: ideascf

api/br/v1alpha1/backup.go

@@ -291,58 +291,6 @@ func IsBackupPrepared(backup *Backup) bool {
 	return condition != nil && condition.Status == metav1.ConditionTrue
 }
 
-// IsVolumeBackupInitialized returns true if volume backup is initialized
-func IsVolumeBackupInitialized(backup *Backup) bool {
-	if backup.Spec.Mode != BackupModeVolumeSnapshot {
-		return false
-	}
-	_, condition := GetBackupCondition(&backup.Status, VolumeBackupInitialized)
-	return condition != nil && condition.Status == metav1.ConditionTrue
-}
-
-// IsVolumeBackupInitializeFailed returns true if volume backup is initialized failed
-func IsVolumeBackupInitializeFailed(backup *Backup) bool {
-	if backup.Spec.Mode != BackupModeVolumeSnapshot {
-		return false
-	}
-	_, condition := GetBackupCondition(&backup.Status, VolumeBackupInitializeFailed)
-	return condition != nil && condition.Status == metav1.ConditionTrue
-}
-
-func IsVolumeBackupSnapshotsCreated(backup *Backup) bool {
-	if backup.Spec.Mode != BackupModeVolumeSnapshot {
-		return false
-	}
-	_, condition := GetBackupCondition(&backup.Status, VolumeBackupSnapshotsCreated)
-	return condition != nil && condition.Status == metav1.ConditionTrue
-}
-
-func IsVolumeBackupInitializeComplete(backup *Backup) bool {
-	if backup.Spec.Mode != BackupModeVolumeSnapshot {
-		return false
-	}
-	_, condition := GetBackupCondition(&backup.Status, VolumeBackupInitializeComplete)
-	return condition != nil && condition.Status == metav1.ConditionTrue
-}
-
-// IsVolumeBackupComplete returns true if volume backup is complete
-func IsVolumeBackupComplete(backup *Backup) bool {
-	if backup.Spec.Mode != BackupModeVolumeSnapshot {
-		return false
-	}
-	_, condition := GetBackupCondition(&backup.Status, VolumeBackupComplete)
-	return condition != nil && condition.Status == metav1.ConditionTrue
-}
-
-// IsVolumeBackupFailed returns true if volume backup is failed
-func IsVolumeBackupFailed(backup *Backup) bool {
-	if backup.Spec.Mode != BackupModeVolumeSnapshot {
-		return false
-	}
-	_, condition := GetBackupCondition(&backup.Status, VolumeBackupFailed)
-	return condition != nil && condition.Status == metav1.ConditionTrue
-}
-
 // IsBackupClean returns true if a Backup has been successfully cleaned up
 func IsBackupClean(backup *Backup) bool {
 	// TODO: now we don't handle fault state, maybe we should consider it in the future
@@ -469,7 +417,6 @@ func IsLogBackupAlreadyStart(backup *Backup) bool {
 	return backup.Spec.Mode == BackupModeLog && backup.Status.CommitTs != ""
 }
 
-// TODO(ideascf): do we need theses functions?
 // IsLogBackupAlreadyTruncate return whether log backup has already truncated.
 func IsLogBackupAlreadyTruncate(backup *Backup) bool {
 	if backup.Spec.Mode != BackupModeLog {

api/br/v1alpha1/backup_types.go

@@ -31,7 +31,6 @@ import (
 // +kubebuilder:printcolumn:name="Status",type=string,JSONPath=`.status.phase`,description="The current status of the backup"
 // +kubebuilder:printcolumn:name="BackupPath",type=string,JSONPath=`.status.backupPath`,description="The full path of backup data"
 // +kubebuilder:printcolumn:name="BackupSize",type=string,JSONPath=`.status.backupSizeReadable`,description="The data size of the backup"
-// +kubebuilder:printcolumn:name="IncrementalBackupSize",type=string,JSONPath=`.status.incrementalBackupSizeReadable`,description="The real size of volume snapshot backup, only valid to volume snapshot backup",priority=10
 // +kubebuilder:printcolumn:name="CommitTS",type=string,JSONPath=`.status.commitTs`,description="The commit ts of the backup"
 // +kubebuilder:printcolumn:name="LogTruncateUntil",type=string,JSONPath=`.status.logSuccessTruncateUntil`,description="The log backup truncate until ts"
 // +kubebuilder:printcolumn:name="Started",type=date,JSONPath=`.status.timeStarted`,description="The time at which the backup was started",priority=1
@@ -209,27 +208,8 @@ const (
 	BackupModeSnapshot BackupMode = "snapshot"
 	// BackupModeLog represents the log backup of tidb cluster.
 	BackupModeLog BackupMode = "log"
-	// BackupModeVolumeSnapshot represents volume backup of tidb cluster.
-	BackupModeVolumeSnapshot BackupMode = "volume-snapshot"
 )
 
-// TiDBAccessConfig defines the configuration for access tidb cluster
-// +k8s:openapi-gen=true
-type TiDBAccessConfig struct {
-	// Host is the tidb cluster access address
-	Host string `json:"host"`
-	// Port is the port number to use for connecting tidb cluster
-	Port int32 `json:"port,omitempty"`
-	// User is the user for login tidb cluster
-	User string `json:"user,omitempty"`
-	// SecretName is the name of secret which stores tidb cluster's password.
-	SecretName string `json:"secretName"`
-	// TLSClientSecretName is the name of secret which stores tidb server client certificate
-	// Optional: Defaults to nil
-	// +optional
-	TLSClientSecretName *string `json:"tlsClientSecretName,omitempty"`
-}
-
 // +k8s:openapi-gen=true
 // CleanPolicyType represents the clean policy of backup data in remote storage
 type CleanPolicyType string
@@ -273,11 +253,6 @@ type CleanOption struct {
 	BackoffEnabled bool `json:"backoffEnabled,omitempty"`
 
 	BatchDeleteOption `json:",inline"`
-
-	// TODO(ideascf): remove this field, EBS volume snapshot backup is deprecated in v2
-	// SnapshotsDeleteRatio represents the number of snapshots deleted per second
-	// +kubebuilder:default=1
-	// SnapshotsDeleteRatio float64 `json:"snapshotsDeleteRatio,omitempty"`
 }
 
 type Progress struct {
@@ -315,9 +290,6 @@ type BackupSpec struct {
 	// - BR_LOG_TO_TERM
 	// +optional
 	Env []corev1.EnvVar `json:"env,omitempty"`
-	// TODO(ideascf): remove it in v2
-	// From is the tidb cluster that needs to backup.
-	From *TiDBAccessConfig `json:"from,omitempty"`
 	// Type is the backup type for tidb cluster and only used when Mode = snapshot, such as full, db, table.
 	Type BackupType `json:"backupType,omitempty"`
 	// Mode is the backup mode, such as snapshot backup or log backup.
@@ -357,19 +329,6 @@ type BackupSpec struct {
 	// LogStop indicates that will stop the log backup.
 	// +optional
 	LogStop bool `json:"logStop,omitempty"`
-	// CalcSizeLevel determines how to size calculation of snapshots for EBS volume snapshot backup
-	// +optional
-	// +kubebuilder:default="all"
-	CalcSizeLevel string `json:"calcSizeLevel,omitempty"`
-	// FederalVolumeBackupPhase indicates which phase to execute in federal volume backup
-	// +optional
-	FederalVolumeBackupPhase FederalVolumeBackupPhase `json:"federalVolumeBackupPhase,omitempty"`
-	// ResumeGcSchedule indicates whether resume gc and pd scheduler for EBS volume snapshot backup
-	// +optional
-	ResumeGcSchedule bool `json:"resumeGcSchedule,omitempty"`
-	// TODO(ideascf): remove it in v2
-	// DumplingConfig is the configs for dumpling
-	Dumpling *DumplingConfig `json:"dumpling,omitempty"`
 	// Base tolerations of backup Pods, components may add more tolerations upon this respectively
 	// +optional
 	Tolerations []corev1.Toleration `json:"tolerations,omitempty"`
@@ -418,27 +377,6 @@ type BackupSpec struct {
 	VolumeBackupInitJobMaxActiveSeconds int `json:"volumeBackupInitJobMaxActiveSeconds,omitempty"`
 }
 
-// FederalVolumeBackupPhase represents a phase to execute in federal volume backup
-type FederalVolumeBackupPhase string
-
-const (
-	// FederalVolumeBackupInitialize means we should stop GC and PD schedule
-	FederalVolumeBackupInitialize FederalVolumeBackupPhase = "initialize"
-	// FederalVolumeBackupExecute means we should take volume snapshots for TiKV
-	FederalVolumeBackupExecute FederalVolumeBackupPhase = "execute"
-	// FederalVolumeBackupTeardown means we should resume GC and PD schedule
-	FederalVolumeBackupTeardown FederalVolumeBackupPhase = "teardown"
-)
-
-// +k8s:openapi-gen=true
-// DumplingConfig contains config for dumpling
-type DumplingConfig struct {
-	// Options means options for backup data to remote storage with dumpling.
-	Options []string `json:"options,omitempty"`
-	// Deprecated. Please use `Spec.TableFilter` instead. TableFilter means Table filter expression for 'db.table' matching
-	TableFilter []string `json:"tableFilter,omitempty"`
-}
-
 // +k8s:openapi-gen=true
 // BRConfig contains config for BR
 type BRConfig struct {
@@ -543,32 +481,13 @@ const (
 	BackupStopped BackupConditionType = "Stopped"
 	// BackupRestart means the backup was restarted, now just support snapshot backup
 	BackupRestart BackupConditionType = "Restart"
-	// VolumeBackupInitialized means the volume backup has stopped GC and PD scheduler
-	VolumeBackupInitialized BackupConditionType = "VolumeBackupInitialized"
-	// VolumeBackupInitializeFailed means the volume backup initialize job failed
-	VolumeBackupInitializeFailed BackupConditionType = "VolumeBackupInitializeFailed"
-	// VolumeBackupSnapshotsCreated means the local volume snapshots created, and they won't be changed
-	VolumeBackupSnapshotsCreated BackupConditionType = "VolumeBackupSnapshotsCreated"
-	// VolumeBackupInitializeComplete means the volume backup has safely resumed GC and PD scheduler
-	VolumeBackupInitializeComplete BackupConditionType = "VolumeBackupInitializeComplete"
-	// VolumeBackupComplete means the volume backup has taken volume snapshots successfully
-	VolumeBackupComplete BackupConditionType = "VolumeBackupComplete"
-	// VolumeBackupFailed means the volume backup take volume snapshots failed
-	VolumeBackupFailed BackupConditionType = "VolumeBackupFailed"
 )
 
 // BackupCondition describes the observed state of a Backup at a certain point.
 type BackupCondition struct {
 	Command LogSubCommandType `json:"command,omitempty"`
 
 	metav1.Condition `json:",inline"`
-	// TODO(ideascf):  remove these fields
-	// Type    BackupConditionType    `json:"type"`
-	// Status  corev1.ConditionStatus `json:"status"`
-	// // +nullable
-	// LastTransitionTime metav1.Time `json:"lastTransitionTime,omitempty"`
-	// Reason             string      `json:"reason,omitempty"`
-	// Message            string      `json:"message,omitempty"`
 }
 
 // LogSubCommandType is the log backup subcommand type.
@@ -628,11 +547,6 @@ type BackupStatus struct {
 	BackupSizeReadable string `json:"backupSizeReadable,omitempty"`
 	// BackupSize is the data size of the backup.
 	BackupSize int64 `json:"backupSize,omitempty"`
-	// the difference with IncrementalBackupSize is that its format is human readable
-	IncrementalBackupSizeReadable string `json:"incrementalBackupSizeReadable,omitempty"`
-	// IncrementalBackupSize is the incremental data size of the backup, it is only used for volume snapshot backup
-	// it is the real size of volume snapshot backup
-	IncrementalBackupSize int64 `json:"incrementalBackupSize,omitempty"`
 	// CommitTs is the commit ts of the backup, snapshot ts for full backup or start ts for log backup.
 	CommitTs string `json:"commitTs,omitempty"`
 	// LogSuccessTruncateUntil is log backup already successfully truncate until timestamp.

api/br/v1alpha1/restore.go

@@ -24,9 +24,6 @@ import (
 
 // GetRestoreJobName return the restore job name
 func (rs *Restore) GetRestoreJobName() string {
-	if IsRestoreVolumeComplete(rs) && !IsRestoreDataComplete(rs) {
-		return fmt.Sprintf("restore-data-%s", rs.GetName())
-	}
 	return fmt.Sprintf("restore-%s", rs.GetName())
 }
 
@@ -125,37 +122,6 @@ func IsRestoreFailed(restore *Restore) bool {
 	return condition != nil && condition.Status == metav1.ConditionTrue
 }
 
-// IsRestoreVolumeComplete returns true if a Restore for volume has successfully completed
-func IsRestoreVolumeComplete(restore *Restore) bool {
-	_, condition := GetRestoreCondition(&restore.Status, RestoreVolumeComplete)
-	return condition != nil && condition.Status == metav1.ConditionTrue
-}
-
-// IsRestoreVolumeFailed returns true if a Restore for volume is Failed
-func IsRestoreVolumeFailed(restore *Restore) bool {
-	return restore.Spec.Mode == RestoreModeVolumeSnapshot &&
-		IsRestoreFailed(restore) &&
-		!IsRestoreVolumeComplete(restore)
-}
-
-// IsCleanVolumeComplete returns true if restored volumes are cleaned
-func IsCleanVolumeComplete(restore *Restore) bool {
-	_, condition := GetRestoreCondition(&restore.Status, CleanVolumeComplete)
-	return condition != nil && condition.Status == metav1.ConditionTrue
-}
-
-// IsRestoreWarmUpStarted returns true if all the warmup jobs has successfully started
-func IsRestoreWarmUpStarted(restore *Restore) bool {
-	_, condition := GetRestoreCondition(&restore.Status, RestoreWarmUpStarted)
-	return condition != nil && condition.Status == metav1.ConditionTrue
-}
-
-// IsRestoreWarmUpComplete returns true if all the warmup jobs has successfully finished
-func IsRestoreWarmUpComplete(restore *Restore) bool {
-	_, condition := GetRestoreCondition(&restore.Status, RestoreWarmUpComplete)
-	return condition != nil && condition.Status == metav1.ConditionTrue
-}
-
 // IsRestoreTiKVComplete returns true if all TiKVs run successfully during volume restore
 func IsRestoreTiKVComplete(restore *Restore) bool {
 	_, condition := GetRestoreCondition(&restore.Status, RestoreTiKVComplete)

api/br/v1alpha1/restore_types.go

@@ -66,8 +66,6 @@ const (
 	RestoreModeSnapshot RestoreMode = "snapshot"
 	// RestoreModePiTR represents PiTR restore which is from a snapshot backup and log backup.
 	RestoreModePiTR RestoreMode = "pitr"
-	// RestoreModeVolumeSnapshot represents restore from a volume snapshot backup.
-	RestoreModeVolumeSnapshot RestoreMode = "volume-snapshot"
 )
 
 // RestoreConditionType represents a valid condition of a Restore.
@@ -78,16 +76,6 @@ const (
 	RestoreScheduled RestoreConditionType = "Scheduled"
 	// RestoreRunning means the Restore is currently being executed.
 	RestoreRunning RestoreConditionType = "Running"
-	// RestoreVolumeComplete means the Restore has successfully executed part-1 and the
-	// backup volumes have been rebuilded from the corresponding snapshot
-	RestoreVolumeComplete RestoreConditionType = "VolumeComplete"
-	// CleanVolumeComplete means volumes are cleaned successfully if restore volume failed
-	CleanVolumeComplete RestoreConditionType = "CleanVolumeComplete"
-	// RestoreWarmUpStarted means the Restore has successfully started warm up pods to
-	// initialize volumes restored from snapshots
-	RestoreWarmUpStarted RestoreConditionType = "WarmUpStarted"
-	// RestoreWarmUpComplete means the Restore has successfully warmed up all TiKV volumes
-	RestoreWarmUpComplete RestoreConditionType = "WarmUpComplete"
 	// RestoreDataComplete means the Restore has successfully executed part-2 and the
 	// data in restore volumes has been deal with consistency based on min_resolved_ts
 	RestoreDataComplete RestoreConditionType = "DataComplete"
@@ -138,9 +126,6 @@ type RestoreSpec struct {
 	// - BR_LOG_TO_TERM
 	// +optional
 	Env []corev1.EnvVar `json:"env,omitempty"`
-	// TODO(ideascf): remove it in v2
-	// To is the tidb cluster that needs to restore.
-	To *TiDBAccessConfig `json:"to,omitempty"`
 	// Type is the backup type for tidb cluster and only used when Mode = snapshot, such as full, db, table.
 	Type BackupType `json:"backupType,omitempty"`
 	// Mode is the restore mode. such as snapshot or pitr.
@@ -151,13 +136,6 @@ type RestoreSpec struct {
 	// LogRestoreStartTs is the start timestamp which log restore from.
 	// +optional
 	LogRestoreStartTs string `json:"logRestoreStartTs,omitempty"`
-	// FederalVolumeRestorePhase indicates which phase to execute in federal volume restore
-	// +optional
-	FederalVolumeRestorePhase FederalVolumeRestorePhase `json:"federalVolumeRestorePhase,omitempty"`
-	// VolumeAZ indicates which AZ the volume snapshots restore to.
-	// it is only valid for mode of volume-snapshot
-	// +optional
-	VolumeAZ string `json:"volumeAZ,omitempty"`
 	// TikvGCLifeTime is to specify the safe gc life time for restore.
 	// The time limit during which data is retained for each GC, in the format of Go Duration.
 	// When a GC happens, the current time minus this value is the safe point.
@@ -195,15 +173,6 @@ type RestoreSpec struct {
 	ImagePullSecrets []corev1.LocalObjectReference `json:"imagePullSecrets,omitempty"`
 	// TableFilter means Table filter expression for 'db.table' matching. BR supports this from v4.0.3.
 	TableFilter []string `json:"tableFilter,omitempty"`
-	// Warmup represents whether to initialize TiKV volumes after volume snapshot restore
-	// +optional
-	Warmup RestoreWarmupMode `json:"warmup,omitempty"`
-	// WarmupImage represents using what image to initialize TiKV volumes
-	// +optional
-	WarmupImage string `json:"warmupImage,omitempty"`
-	// WarmupStrategy
-	// +kubebuilder:default=hybrid
-	WarmupStrategy RestoreWarmupStrategy `json:"warmupStrategy,omitempty"`
 
 	// PodSecurityContext of the component
 	// +optional
@@ -223,42 +192,6 @@ type RestoreSpec struct {
 	TolerateSingleTiKVOutage bool `json:"tolerateSingleTiKVOutage,omitempty"`
 }
 
-// FederalVolumeRestorePhase represents a phase to execute in federal volume restore
-type FederalVolumeRestorePhase string
-
-const (
-	// FederalVolumeRestoreVolume means restore volumes of TiKV and start TiKV
-	FederalVolumeRestoreVolume FederalVolumeRestorePhase = "restore-volume"
-	// FederalVolumeRestoreData means restore data of TiKV to resolved TS
-	FederalVolumeRestoreData FederalVolumeRestorePhase = "restore-data"
-	// FederalVolumeRestoreFinish means restart TiKV and set recoveryMode true
-	FederalVolumeRestoreFinish FederalVolumeRestorePhase = "restore-finish"
-)
-
-// RestoreWarmupMode represents when to initialize TiKV volumes
-type RestoreWarmupMode string
-
-const (
-	// RestoreWarmupModeSync means initialize TiKV volumes before TiKV starts
-	RestoreWarmupModeSync RestoreWarmupMode = "sync"
-	// RestoreWarmupModeASync means initialize TiKV volumes after restore complete
-	RestoreWarmupModeASync RestoreWarmupMode = "async"
-)
-
-// RestoreWarmupStrategy represents how to initialize TiKV volumes
-type RestoreWarmupStrategy string
-
-const (
-	// RestoreWarmupStrategyFio warms up all data block by block. (use fio)
-	RestoreWarmupStrategyFio RestoreWarmupStrategy = "fio"
-	// RestoreWarmupStrategyHybrid warms up data volume by read sst files one by one, other (e.g. WAL or Raft) will be warmed up via fio.
-	RestoreWarmupStrategyHybrid RestoreWarmupStrategy = "hybrid"
-	// RestoreWarmupStrategyFsr warms up data volume by enabling Fast Snapshot Restore, other (e.g. WAL or Raft) will be warmed up via fio.
-	RestoreWarmupStrategyFsr RestoreWarmupStrategy = "fsr"
-	// RestoreWarmupStrategyCheckOnly warm up none data volumes and check wal consistency
-	RestoreWarmupStrategyCheckOnly RestoreWarmupStrategy = "check-wal-only"
-)
-
 // RestoreStatus represents the current status of a tidb cluster restore.
 type RestoreStatus struct {
 	// TimeStarted is the time at which the restore was started.