Merge branch 'feature/v2' into liubo02/support-activate

Author: liubog2008

api/br/v1alpha1/restore_types.go

@@ -130,8 +130,8 @@ type RestoreSpec struct {
 	StorageProvider `json:",inline"`
 	// BR is the configs for BR.
 	BR *BRConfig `json:"br,omitempty"`
-
 	// PitrRestoredTs is the pitr restored ts.
+	// +optional
 	PitrRestoredTs string `json:"pitrRestoredTs,omitempty"`
 	// LogRestoreStartTs is the start timestamp which log restore from.
 	// +optional
@@ -184,6 +184,8 @@ type RestoreSpec struct {
 	// TolerateSingleTiKVOutage indicates whether to tolerate a single failure of a store without data loss
 	// +kubebuilder:default=false
 	TolerateSingleTiKVOutage bool `json:"tolerateSingleTiKVOutage,omitempty"`
+	// +kubebuilder:default=0
+	BackoffLimit int32 `json:"backoffLimit,omitempty"`
 }
 
 // RestoreStatus represents the current status of a tidb cluster restore.

manifests/crd/br.pingcap.com_restores.yaml

@@ -2886,6 +2886,10 @@ spec:
                       Otherwise retrieve the storage account from secret
                     type: string
                 type: object
+              backoffLimit:
+                default: 0
+                format: int32
+                type: integer
               backupType:
                 description: Type is the backup type for tidb cluster and only used
                   when Mode = snapshot, such as full, db, table.

pkg/controllers/br/manager/restore/restore_manager.go

@@ -24,7 +24,6 @@ import (
 	"k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/client-go/tools/record"
-	"k8s.io/utils/ptr"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/log"
 
@@ -228,7 +227,10 @@ func (rm *restoreManager) makeRestoreJob(ctx context.Context, restore *v1alpha1.
 
 	switch restore.Spec.Mode {
 	case v1alpha1.RestoreModePiTR:
-		args = append(args, fmt.Sprintf("--mode=%s", v1alpha1.RestoreModePiTR), fmt.Sprintf("--pitrRestoredTs=%s", restore.Spec.PitrRestoredTs))
+		args = append(args, fmt.Sprintf("--mode=%s", v1alpha1.RestoreModePiTR))
+		if restore.Spec.PitrRestoredTs != "" {
+			args = append(args, fmt.Sprintf("--pitrRestoredTs=%s", restore.Spec.PitrRestoredTs))
+		}
 	default:
 		args = append(args, fmt.Sprintf("--mode=%s", v1alpha1.RestoreModeSnapshot))
 	}
@@ -355,7 +357,7 @@ func (rm *restoreManager) makeRestoreJob(ctx context.Context, restore *v1alpha1.
 			},
 		},
 		Spec: batchv1.JobSpec{
-			BackoffLimit: ptr.To(int32(0)),
+			BackoffLimit: &restore.Spec.BackoffLimit,
 			Template:     *podSpec,
 		},
 	}

pkg/reloadable/pd.go

@@ -105,7 +105,7 @@ func convertPDTemplate(tmpl *v1alpha1.PDTemplate) *v1alpha1.PDTemplate {
 	return newTmpl
 }
 
-func equalPDTemplate(p, c *v1alpha1.PDTemplate) bool {
+func equalPDTemplate(c, p *v1alpha1.PDTemplate) bool {
 	p = convertPDTemplate(p)
 	c = convertPDTemplate(c)
 	// not equal only when current strategy is Restart and config is changed

pkg/reloadable/scheduler.go

@@ -105,7 +105,7 @@ func convertSchedulerTemplate(tmpl *v1alpha1.SchedulerTemplate) *v1alpha1.Schedu
 	return newTmpl
 }
 
-func equalSchedulerTemplate(p, c *v1alpha1.SchedulerTemplate) bool {
+func equalSchedulerTemplate(c, p *v1alpha1.SchedulerTemplate) bool {
 	p = convertSchedulerTemplate(p)
 	c = convertSchedulerTemplate(c)
 	// not equal only when current strategy is Restart and config is changed

pkg/reloadable/ticdc.go

@@ -110,7 +110,7 @@ func convertTiCDCTemplate(tmpl *v1alpha1.TiCDCTemplate) *v1alpha1.TiCDCTemplate
 	return newTmpl
 }
 
-func equalTiCDCTemplate(p, c *v1alpha1.TiCDCTemplate) bool {
+func equalTiCDCTemplate(c, p *v1alpha1.TiCDCTemplate) bool {
 	p = convertTiCDCTemplate(p)
 	c = convertTiCDCTemplate(c)
 	// not equal only when current strategy is Restart and config is changed

pkg/reloadable/tiflash.go

@@ -109,7 +109,7 @@ func convertTiFlashTemplate(tmpl *v1alpha1.TiFlashTemplate) *v1alpha1.TiFlashTem
 	return newTmpl
 }
 
-func equalTiFlashTemplate(p, c *v1alpha1.TiFlashTemplate) bool {
+func equalTiFlashTemplate(c, p *v1alpha1.TiFlashTemplate) bool {
 	p = convertTiFlashTemplate(p)
 	c = convertTiFlashTemplate(c)
 	// not equal only when current strategy is Restart and config is changed

pkg/reloadable/tikv.go

@@ -109,7 +109,7 @@ func convertTiKVTemplate(tmpl *v1alpha1.TiKVTemplate) *v1alpha1.TiKVTemplate {
 	return newTmpl
 }
 
-func equalTiKVTemplate(p, c *v1alpha1.TiKVTemplate) bool {
+func equalTiKVTemplate(c, p *v1alpha1.TiKVTemplate) bool {
 	p = convertTiKVTemplate(p)
 	c = convertTiKVTemplate(c)
 	// not equal only when current strategy is Restart and config is changed

pkg/reloadable/tiproxy.go

@@ -108,7 +108,7 @@ func convertTiProxyTemplate(tmpl *v1alpha1.TiProxyTemplate) *v1alpha1.TiProxyTem
 	return newTmpl
 }
 
-func equalTiProxyTemplate(p, c *v1alpha1.TiProxyTemplate) bool {
+func equalTiProxyTemplate(c, p *v1alpha1.TiProxyTemplate) bool {
 	p = convertTiProxyTemplate(p)
 	c = convertTiProxyTemplate(c)
 	// not equal only when current strategy is Restart and config is changed

pkg/reloadable/tso.go

@@ -105,7 +105,7 @@ func convertTSOTemplate(tmpl *v1alpha1.TSOTemplate) *v1alpha1.TSOTemplate {
 	return newTmpl
 }
 
-func equalTSOTemplate(p, c *v1alpha1.TSOTemplate) bool {
+func equalTSOTemplate(c, p *v1alpha1.TSOTemplate) bool {
 	p = convertTSOTemplate(p)
 	c = convertTSOTemplate(c)
 	// not equal only when current strategy is Restart and config is changed