br: Allow restore retry if failed (#6092)

pingcap · Feb 21, 2025 · 610a9f9 · 610a9f9
1 parent e84b19c
commit 610a9f9
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 1 deletion.
diff --git a/docs/api-references/docs.md b/docs/api-references/docs.md
@@ -1713,6 +1713,16 @@ bool
 <p>TolerateSingleTiKVOutage indicates whether to tolerate a single failure of a store without data loss</p>
 </td>
 </tr>
+<tr>
+<td>
+<code>backoffLimit</code></br>
+<em>
+int32
+</em>
+</td>
+<td>
+</td>
+</tr>
 </table>
 </td>
 </tr>
@@ -15759,6 +15769,16 @@ bool
 <p>TolerateSingleTiKVOutage indicates whether to tolerate a single failure of a store without data loss</p>
 </td>
 </tr>
+<tr>
+<td>
+<code>backoffLimit</code></br>
+<em>
+int32
+</em>
+</td>
+<td>
+</td>
+</tr>
 </tbody>
 </table>
 <h3 id="restorestatus">RestoreStatus</h3>

diff --git a/manifests/crd.yaml b/manifests/crd.yaml
@@ -22493,6 +22493,10 @@ spec:
                   storageAccount:
                     type: string
                 type: object
+              backoffLimit:
+                default: 0
+                format: int32
+                type: integer
               backupType:
                 type: string
               br:

diff --git a/manifests/crd/v1/pingcap.com_restores.yaml b/manifests/crd/v1/pingcap.com_restores.yaml
@@ -1167,6 +1167,10 @@ spec:
                   storageAccount:
                     type: string
                 type: object
+              backoffLimit:
+                default: 0
+                format: int32
+                type: integer
               backupType:
                 type: string
               br:

diff --git a/pkg/apis/pingcap/v1alpha1/openapi_generated.go b/pkg/apis/pingcap/v1alpha1/openapi_generated.go
diff --git a/pkg/apis/pingcap/v1alpha1/types.go b/pkg/apis/pingcap/v1alpha1/types.go
@@ -2804,6 +2804,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"`
 }
 
 // FederalVolumeRestorePhase represents a phase to execute in federal volume restore

diff --git a/pkg/backup/restore/restore_manager.go b/pkg/backup/restore/restore_manager.go
@@ -921,7 +921,7 @@ func (rm *restoreManager) makeRestoreJob(restore *v1alpha1.Restore) (*batchv1.Jo
 			},
 		},
 		Spec: batchv1.JobSpec{
-			BackoffLimit: pointer.Int32Ptr(0),
+			BackoffLimit: &restore.Spec.BackoffLimit,
 			Template:     *podSpec,
 		},
 	}