vmware-tanzu
/
velero
mirror of https://github.com/vmware-tanzu/velero.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #7458 from Lyndon-Li/issue-fix-7308 

Issue 7308: change the data path requeue time to 5 second
pull/7137/head
lyndon-li 2024-02-22 15:58:14 +08:00 committed by GitHub
parent 74bf4c3d80 e1bcdf0f63
commit 174c10fa8a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
8 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelogs/unreleased/7458-Lyndon-Li Normal file
View File

@ -0,0 +1 @@
Fix issue #7308, change the data path requeue time to 5 second for data mover backup/restore, PVB and PVR.

2
pkg/controller/data_download_controller.go
View File

@ -261,7 +261,7 @@ func (r *DataDownloadReconciler) Reconcile(ctx context.Context, req ctrl.Request
if err != nil { if err != nil {
if err == datapath.ConcurrentLimitExceed { if err == datapath.ConcurrentLimitExceed {
log.Info("Data path instance is concurrent limited requeue later") log.Info("Data path instance is concurrent limited requeue later")
return ctrl.Result{Requeue: true, RequeueAfter: time.Minute}, nil return ctrl.Result{Requeue: true, RequeueAfter: time.Second * 5}, nil
} else { } else {
return r.errorOut(ctx, dd, err, "error to create data path", log) return r.errorOut(ctx, dd, err, "error to create data path", log)
} }

6
pkg/controller/data_download_controller_test.go
View File

@ -219,7 +219,7 @@ func TestDataDownloadReconcile(t *testing.T) {
dataMgr: datapath.NewManager(0), dataMgr: datapath.NewManager(0),
notNilExpose: true, notNilExpose: true,
notMockCleanUp: true, notMockCleanUp: true,
expectedResult: &ctrl.Result{Requeue: true, RequeueAfter: time.Minute}, expectedResult: &ctrl.Result{Requeue: true, RequeueAfter: time.Second * 5},
}, },
{ {
name: "Error getting volume directory name for pvc in pod", name: "Error getting volume directory name for pvc in pod",
@ -416,8 +416,8 @@ func TestDataDownloadReconcile(t *testing.T) {
require.NotNil(t, actualResult) require.NotNil(t, actualResult)
if test.expectedResult != nil { if test.expectedResult != nil {
assert.Equal(t, test.expectedResult.Requeue, test.expectedResult.Requeue) assert.Equal(t, test.expectedResult.Requeue, actualResult.Requeue)
assert.Equal(t, test.expectedResult.RequeueAfter, test.expectedResult.RequeueAfter) assert.Equal(t, test.expectedResult.RequeueAfter, actualResult.RequeueAfter)
} }
dd := velerov2alpha1api.DataDownload{} dd := velerov2alpha1api.DataDownload{}

2
pkg/controller/data_upload_controller.go
View File

@ -269,7 +269,7 @@ func (r *DataUploadReconciler) Reconcile(ctx context.Context, req ctrl.Request)
if err != nil { if err != nil {
if err == datapath.ConcurrentLimitExceed { if err == datapath.ConcurrentLimitExceed {
log.Info("Data path instance is concurrent limited requeue later") log.Info("Data path instance is concurrent limited requeue later")
return ctrl.Result{Requeue: true, RequeueAfter: time.Minute}, nil return ctrl.Result{Requeue: true, RequeueAfter: time.Second * 5}, nil
} else { } else {
return r.errorOut(ctx, du, err, "error to create data path", log) return r.errorOut(ctx, du, err, "error to create data path", log)
} }

2
pkg/controller/data_upload_controller_test.go
View File

@ -413,7 +413,7 @@ func TestReconcile(t *testing.T) {
du: dataUploadBuilder().Phase(velerov2alpha1api.DataUploadPhasePrepared).SnapshotType(fakeSnapshotType).Result(), du: dataUploadBuilder().Phase(velerov2alpha1api.DataUploadPhasePrepared).SnapshotType(fakeSnapshotType).Result(),
expectedProcessed: false, expectedProcessed: false,
expected: dataUploadBuilder().Phase(velerov2alpha1api.DataUploadPhasePrepared).Result(), expected: dataUploadBuilder().Phase(velerov2alpha1api.DataUploadPhasePrepared).Result(),
expectedRequeue: ctrl.Result{Requeue: true, RequeueAfter: time.Minute}, expectedRequeue: ctrl.Result{Requeue: true, RequeueAfter: time.Second * 5},
}, },
{ {
name: "prepare timeout", name: "prepare timeout",

2
pkg/controller/pod_volume_backup_controller.go
View File

@ -126,7 +126,7 @@ func (r *PodVolumeBackupReconciler) Reconcile(ctx context.Context, req ctrl.Requ
fsBackup, err := r.dataPathMgr.CreateFileSystemBR(pvb.Name, pVBRRequestor, ctx, r.Client, pvb.Namespace, callbacks, log) fsBackup, err := r.dataPathMgr.CreateFileSystemBR(pvb.Name, pVBRRequestor, ctx, r.Client, pvb.Namespace, callbacks, log)
if err != nil { if err != nil {
if err == datapath.ConcurrentLimitExceed { if err == datapath.ConcurrentLimitExceed {
return ctrl.Result{Requeue: true, RequeueAfter: time.Minute}, nil return ctrl.Result{Requeue: true, RequeueAfter: time.Second * 5}, nil
} else { } else {
return r.errorOut(ctx, &pvb, err, "error to create data path", log) return r.errorOut(ctx, &pvb, err, "error to create data path", log)
} }

2
pkg/controller/pod_volume_backup_controller_test.go
View File

@ -383,7 +383,7 @@ var _ = Describe("PodVolumeBackup Reconciler", func() {
expected: builder.ForPodVolumeBackup(velerov1api.DefaultNamespace, "pvb-1"). expected: builder.ForPodVolumeBackup(velerov1api.DefaultNamespace, "pvb-1").
Phase(""). Phase("").
Result(), Result(),
expectedRequeue: ctrl.Result{Requeue: true, RequeueAfter: time.Minute}, expectedRequeue: ctrl.Result{Requeue: true, RequeueAfter: time.Second * 5},
}), }),
) )
}) })

2
pkg/controller/pod_volume_restore_controller.go
View File

@ -122,7 +122,7 @@ func (c *PodVolumeRestoreReconciler) Reconcile(ctx context.Context, req ctrl.Req
fsRestore, err := c.dataPathMgr.CreateFileSystemBR(pvr.Name, pVBRRequestor, ctx, c.Client, pvr.Namespace, callbacks, log) fsRestore, err := c.dataPathMgr.CreateFileSystemBR(pvr.Name, pVBRRequestor, ctx, c.Client, pvr.Namespace, callbacks, log)
if err != nil { if err != nil {
if err == datapath.ConcurrentLimitExceed { if err == datapath.ConcurrentLimitExceed {
return ctrl.Result{Requeue: true, RequeueAfter: time.Minute}, nil return ctrl.Result{Requeue: true, RequeueAfter: time.Second * 5}, nil
} else { } else {
return c.errorOut(ctx, pvr, err, "error to create data path", log) return c.errorOut(ctx, pvr, err, "error to create data path", log)
} }