chore: support restore backoffLimit (#6242)

apecloud · Dec 26, 2023 · 5cabe46 · 5cabe46
1 parent eb9532c
commit 5cabe46
Show file tree

Hide file tree

Showing 8 changed files with 33 additions and 4 deletions.
diff --git a/apis/dataprotection/v1alpha1/restore_types.go b/apis/dataprotection/v1alpha1/restore_types.go
@@ -70,6 +70,12 @@ type RestoreSpec struct {
 	// specified the required resources of restore job's container.
 	// +optional
 	ContainerResources corev1.ResourceRequirements `json:"containerResources,omitempty"`
+
+	// Specifies the number of retries before marking the restore failed.
+	// +optional
+	// +kubebuilder:validation:Minimum=0
+	// +kubebuilder:validation:Maximum=10
+	BackoffLimit *int32 `json:"backoffLimit,omitempty"`
 }
 
 // BackupRef describes the backup name and namespace.

diff --git a/apis/dataprotection/v1alpha1/zz_generated.deepcopy.go b/apis/dataprotection/v1alpha1/zz_generated.deepcopy.go
diff --git a/config/crd/bases/dataprotection.kubeblocks.io_restores.yaml b/config/crd/bases/dataprotection.kubeblocks.io_restores.yaml
@@ -59,6 +59,13 @@ spec:
           spec:
             description: RestoreSpec defines the desired state of Restore
             properties:
+              backoffLimit:
+                description: Specifies the number of retries before marking the restore
+                  failed.
+                format: int32
+                maximum: 10
+                minimum: 0
+                type: integer
               backup:
                 description: 'backup to be restored. The restore behavior based on
                   the backup type: 1. Full: will be restored the full backup directly.

diff --git a/controllers/apps/operations/custom.go b/controllers/apps/operations/custom.go
@@ -194,7 +194,7 @@ func (c CustomOpsHandler) buildJob(reqCtx intctrlutil.RequestCtx,
 	buildJobSpec := func() (*batchv1.JobSpec, error) {
 		jobSpec := opsRes.OpsDef.Spec.JobSpec
 		if jobSpec.BackoffLimit == nil {
-			jobSpec.BackoffLimit = pointer.Int32(3)
+			jobSpec.BackoffLimit = pointer.Int32(2)
 		}
 
 		comp := opsRes.Cluster.Spec.GetComponentByName(compName)

diff --git a/deploy/helm/crds/dataprotection.kubeblocks.io_restores.yaml b/deploy/helm/crds/dataprotection.kubeblocks.io_restores.yaml
@@ -59,6 +59,13 @@ spec:
           spec:
             description: RestoreSpec defines the desired state of Restore
             properties:
+              backoffLimit:
+                description: Specifies the number of retries before marking the restore
+                  failed.
+                format: int32
+                maximum: 10
+                minimum: 0
+                type: integer
               backup:
                 description: 'backup to be restored. The restore behavior based on
                   the backup type: 1. Full: will be restored the full backup directly.

diff --git a/pkg/dataprotection/restore/builder.go b/pkg/dataprotection/restore/builder.go
@@ -300,7 +300,11 @@ func (r *restoreJobBuilder) build() *batchv1.Job {
 	job.Spec.Template.ObjectMeta = metav1.ObjectMeta{
 		Labels: r.labels,
 	}
-	job.Spec.BackoffLimit = &defaultBackoffLimit
+	if r.restore.Spec.BackoffLimit != nil {
+		job.Spec.BackoffLimit = r.restore.Spec.BackoffLimit
+	} else {
+		job.Spec.BackoffLimit = &defaultBackoffLimit
+	}
 
 	// 2. set restore container
 	r.specificVolumeMounts = append(r.specificVolumeMounts, r.commonVolumeMounts...)

diff --git a/pkg/dataprotection/restore/types.go b/pkg/dataprotection/restore/types.go
@@ -68,4 +68,4 @@ const (
 // Restore constant
 const Restore = "restore"
 
-var defaultBackoffLimit int32 = 3
+var defaultBackoffLimit int32 = 2
diff --git a/pkg/dataprotection/types/types.go b/pkg/dataprotection/types/types.go
@@ -21,5 +21,5 @@ package types
 
 var (
 	// DefaultBackOffLimit is the default backoff limit for jobs.
-	DefaultBackOffLimit = int32(3)
+	DefaultBackOffLimit = int32(2)
 )