diff --git a/pkg/controller/data_download_controller.go b/pkg/controller/data_download_controller.go index eb0e38c5a..adcb81a64 100644 --- a/pkg/controller/data_download_controller.go +++ b/pkg/controller/data_download_controller.go @@ -254,12 +254,12 @@ func (r *DataDownloadReconciler) Reconcile(ctx context.Context, req ctrl.Request if r.vgdpCounter != nil && r.vgdpCounter.IsConstrained(ctx, r.logger) { log.Debug("Data path initiation is constrained, requeue later") - return ctrl.Result{Requeue: true, RequeueAfter: time.Second * 5}, nil + return ctrl.Result{RequeueAfter: time.Second * 5}, nil } if _, err := r.getTargetPVC(ctx, dd); err != nil { log.WithField("error", err).Debugf("Cannot find target PVC for DataDownload yet. Retry later.") - return ctrl.Result{Requeue: true}, nil + return ctrl.Result{RequeueAfter: time.Second * 5}, nil } log.Info("Data download starting") @@ -350,7 +350,7 @@ func (r *DataDownloadReconciler) Reconcile(ctx context.Context, req ctrl.Request if err != nil { if err == datapath.ConcurrentLimitExceed { log.Debug("Data path instance is concurrent limited requeue later") - return ctrl.Result{Requeue: true, RequeueAfter: time.Second * 5}, nil + return ctrl.Result{RequeueAfter: time.Second * 5}, nil } else { return r.errorOut(ctx, dd, err, "error to create data path", log) } @@ -381,7 +381,7 @@ func (r *DataDownloadReconciler) Reconcile(ctx context.Context, req ctrl.Request log.WithError(err).Warnf("Failed to update datadownload %s to InProgress, will data path close and retry", dd.Name) r.closeDataPath(ctx, dd.Name) - return ctrl.Result{Requeue: true, RequeueAfter: time.Second * 5}, nil + return ctrl.Result{RequeueAfter: time.Second * 5}, nil } if terminated { diff --git a/pkg/controller/data_download_controller_test.go b/pkg/controller/data_download_controller_test.go index 9cefd5a64..a9ce47e28 100644 --- a/pkg/controller/data_download_controller_test.go +++ b/pkg/controller/data_download_controller_test.go @@ -315,12 +315,12 @@ func TestDataDownloadReconcile(t *testing.T) { dd: dataDownloadBuilder().Finalizers([]string{DataUploadDownloadFinalizer}).Result(), constrained: true, expected: dataDownloadBuilder().Finalizers([]string{DataUploadDownloadFinalizer}).Result(), - expectedResult: &ctrl.Result{Requeue: true, RequeueAfter: time.Second * 5}, + expectedResult: &ctrl.Result{RequeueAfter: time.Second * 5}, }, { name: "new dd but no target PVC", dd: dataDownloadBuilder().Finalizers([]string{DataUploadDownloadFinalizer}).Result(), - expectedResult: &ctrl.Result{Requeue: true}, + expectedResult: &ctrl.Result{RequeueAfter: time.Second * 5}, }, { name: "new dd but accept failed", @@ -390,7 +390,7 @@ func TestDataDownloadReconcile(t *testing.T) { dataMgr: datapath.NewManager(0), notNilExpose: true, notMockCleanUp: true, - expectedResult: &ctrl.Result{Requeue: true, RequeueAfter: time.Second * 5}, + expectedResult: &ctrl.Result{RequeueAfter: time.Second * 5}, }, { name: "data path init error", @@ -594,7 +594,6 @@ func TestDataDownloadReconcile(t *testing.T) { } if test.expectedResult != nil { - assert.Equal(t, test.expectedResult.Requeue, actualResult.Requeue) assert.Equal(t, test.expectedResult.RequeueAfter, actualResult.RequeueAfter) } diff --git a/pkg/controller/data_upload_controller.go b/pkg/controller/data_upload_controller.go index cac03ca47..ba6cf997d 100644 --- a/pkg/controller/data_upload_controller.go +++ b/pkg/controller/data_upload_controller.go @@ -265,7 +265,7 @@ func (r *DataUploadReconciler) Reconcile(ctx context.Context, req ctrl.Request) if r.vgdpCounter != nil && r.vgdpCounter.IsConstrained(ctx, r.logger) { log.Debug("Data path initiation is constrained, requeue later") - return ctrl.Result{Requeue: true, RequeueAfter: time.Second * 5}, nil + return ctrl.Result{RequeueAfter: time.Second * 5}, nil } log.Info("Data upload starting") @@ -359,7 +359,7 @@ func (r *DataUploadReconciler) Reconcile(ctx context.Context, req ctrl.Request) if err != nil { if err == datapath.ConcurrentLimitExceed { log.Debug("Data path instance is concurrent limited requeue later") - return ctrl.Result{Requeue: true, RequeueAfter: time.Second * 5}, nil + return ctrl.Result{RequeueAfter: time.Second * 5}, nil } else { return r.errorOut(ctx, du, err, "error to create data path", log) } @@ -391,7 +391,7 @@ func (r *DataUploadReconciler) Reconcile(ctx context.Context, req ctrl.Request) log.WithError(err).Warnf("Failed to update dataupload %s to InProgress, will data path close and retry", du.Name) r.closeDataPath(ctx, du.Name) - return ctrl.Result{Requeue: true, RequeueAfter: time.Second * 5}, nil + return ctrl.Result{RequeueAfter: time.Second * 5}, nil } if terminated { diff --git a/pkg/controller/data_upload_controller_test.go b/pkg/controller/data_upload_controller_test.go index 5839447f8..7c8b4c443 100644 --- a/pkg/controller/data_upload_controller_test.go +++ b/pkg/controller/data_upload_controller_test.go @@ -478,7 +478,7 @@ func TestReconcile(t *testing.T) { du: dataUploadBuilder().Finalizers([]string{DataUploadDownloadFinalizer}).Result(), constrained: true, expected: dataUploadBuilder().Finalizers([]string{DataUploadDownloadFinalizer}).Result(), - expectedResult: &ctrl.Result{Requeue: true, RequeueAfter: time.Second * 5}, + expectedResult: &ctrl.Result{RequeueAfter: time.Second * 5}, }, { name: "new du but accept failed", @@ -548,7 +548,7 @@ func TestReconcile(t *testing.T) { name: "Error in data path is concurrent limited", du: dataUploadBuilder().Phase(velerov2alpha1api.DataUploadPhasePrepared).SnapshotType(fakeSnapshotType).Finalizers([]string{DataUploadDownloadFinalizer}).Node("test-node").Result(), dataMgr: datapath.NewManager(0), - expectedResult: &ctrl.Result{Requeue: true, RequeueAfter: time.Second * 5}, + expectedResult: &ctrl.Result{RequeueAfter: time.Second * 5}, }, { name: "data path init error", @@ -562,7 +562,7 @@ func TestReconcile(t *testing.T) { du: dataUploadBuilder().Phase(velerov2alpha1api.DataUploadPhasePrepared).SnapshotType(fakeSnapshotType).Finalizers([]string{DataUploadDownloadFinalizer}).Node("test-node").Result(), needErrs: []bool{false, false, true, false}, expected: dataUploadBuilder().Phase(velerov2alpha1api.DataUploadPhasePrepared).Finalizers([]string{DataUploadDownloadFinalizer}).Result(), - expectedResult: &ctrl.Result{Requeue: true, RequeueAfter: time.Second * 5}, + expectedResult: &ctrl.Result{RequeueAfter: time.Second * 5}, }, { name: "data path start error", @@ -694,7 +694,6 @@ func TestReconcile(t *testing.T) { } if test.expectedResult != nil { - assert.Equal(t, test.expectedResult.Requeue, actualResult.Requeue) assert.Equal(t, test.expectedResult.RequeueAfter, actualResult.RequeueAfter) } diff --git a/pkg/controller/pod_volume_backup_controller.go b/pkg/controller/pod_volume_backup_controller.go index 2372bf25b..b16e914dc 100644 --- a/pkg/controller/pod_volume_backup_controller.go +++ b/pkg/controller/pod_volume_backup_controller.go @@ -238,7 +238,7 @@ func (r *PodVolumeBackupReconciler) Reconcile(ctx context.Context, req ctrl.Requ if r.vgdpCounter != nil && r.vgdpCounter.IsConstrained(ctx, r.logger) { log.Debug("Data path initiation is constrained, requeue later") - return ctrl.Result{Requeue: true, RequeueAfter: time.Second * 5}, nil + return ctrl.Result{RequeueAfter: time.Second * 5}, nil } log.Info("Accepting PVB") @@ -314,7 +314,7 @@ func (r *PodVolumeBackupReconciler) Reconcile(ctx context.Context, req ctrl.Requ if err != nil { if err == datapath.ConcurrentLimitExceed { log.Debug("Data path instance is concurrent limited requeue later") - return ctrl.Result{Requeue: true, RequeueAfter: time.Second * 5}, nil + return ctrl.Result{RequeueAfter: time.Second * 5}, nil } else { return r.errorOut(ctx, pvb, err, "error to create data path", log) } @@ -346,7 +346,7 @@ func (r *PodVolumeBackupReconciler) Reconcile(ctx context.Context, req ctrl.Requ log.WithError(err).Warnf("Failed to update PVB %s to InProgress, will data path close and retry", pvb.Name) r.closeDataPath(ctx, pvb.Name) - return ctrl.Result{Requeue: true, RequeueAfter: time.Second * 5}, nil + return ctrl.Result{RequeueAfter: time.Second * 5}, nil } if terminated { diff --git a/pkg/controller/pod_volume_backup_controller_test.go b/pkg/controller/pod_volume_backup_controller_test.go index 8b05f0e3b..9161fd4bb 100644 --- a/pkg/controller/pod_volume_backup_controller_test.go +++ b/pkg/controller/pod_volume_backup_controller_test.go @@ -327,7 +327,7 @@ func TestPVBReconcile(t *testing.T) { pvb: pvbBuilder().Finalizers([]string{PodVolumeFinalizer}).Node("test-node").Result(), constrained: true, expected: pvbBuilder().Finalizers([]string{PodVolumeFinalizer}).Result(), - expectedResult: &ctrl.Result{Requeue: true, RequeueAfter: time.Second * 5}, + expectedResult: &ctrl.Result{RequeueAfter: time.Second * 5}, }, { name: "new pvb but accept failed", @@ -394,7 +394,7 @@ func TestPVBReconcile(t *testing.T) { pvb: pvbBuilder().Phase(velerov1api.PodVolumeBackupPhasePrepared).Finalizers([]string{PodVolumeFinalizer}).Node("test-node").Result(), needMockExposer: true, dataMgr: datapath.NewManager(0), - expectedResult: &ctrl.Result{Requeue: true, RequeueAfter: time.Second * 5}, + expectedResult: &ctrl.Result{RequeueAfter: time.Second * 5}, }, { name: "data path init error", @@ -410,7 +410,7 @@ func TestPVBReconcile(t *testing.T) { needMockExposer: true, needErrs: []bool{false, false, true, false}, expected: pvbBuilder().Phase(velerov1api.PodVolumeBackupPhasePrepared).Finalizers([]string{PodVolumeFinalizer}).Result(), - expectedResult: &ctrl.Result{Requeue: true, RequeueAfter: time.Second * 5}, + expectedResult: &ctrl.Result{RequeueAfter: time.Second * 5}, }, { name: "data path start error", @@ -537,7 +537,6 @@ func TestPVBReconcile(t *testing.T) { } if test.expectedResult != nil { - assert.Equal(t, test.expectedResult.Requeue, actualResult.Requeue) assert.Equal(t, test.expectedResult.RequeueAfter, actualResult.RequeueAfter) } diff --git a/pkg/controller/pod_volume_restore_controller.go b/pkg/controller/pod_volume_restore_controller.go index 300acc5be..a68c93928 100644 --- a/pkg/controller/pod_volume_restore_controller.go +++ b/pkg/controller/pod_volume_restore_controller.go @@ -246,7 +246,7 @@ func (r *PodVolumeRestoreReconciler) Reconcile(ctx context.Context, req ctrl.Req if r.vgdpCounter != nil && r.vgdpCounter.IsConstrained(ctx, r.logger) { log.Debug("Data path initiation is constrained, requeue later") - return ctrl.Result{Requeue: true, RequeueAfter: time.Second * 5}, nil + return ctrl.Result{RequeueAfter: time.Second * 5}, nil } log.Info("Accepting PVR") @@ -328,7 +328,7 @@ func (r *PodVolumeRestoreReconciler) Reconcile(ctx context.Context, req ctrl.Req if err != nil { if err == datapath.ConcurrentLimitExceed { log.Debug("Data path instance is concurrent limited requeue later") - return ctrl.Result{Requeue: true, RequeueAfter: time.Second * 5}, nil + return ctrl.Result{RequeueAfter: time.Second * 5}, nil } else { return r.errorOut(ctx, pvr, err, "error to create data path", log) } @@ -358,7 +358,7 @@ func (r *PodVolumeRestoreReconciler) Reconcile(ctx context.Context, req ctrl.Req log.WithError(err).Warnf("Failed to update PVR %s to InProgress, will data path close and retry", pvr.Name) r.closeDataPath(ctx, pvr.Name) - return ctrl.Result{Requeue: true, RequeueAfter: time.Second * 5}, nil + return ctrl.Result{RequeueAfter: time.Second * 5}, nil } if terminated { diff --git a/pkg/controller/pod_volume_restore_controller_legacy.go b/pkg/controller/pod_volume_restore_controller_legacy.go index 18a920f9d..9c952e652 100644 --- a/pkg/controller/pod_volume_restore_controller_legacy.go +++ b/pkg/controller/pod_volume_restore_controller_legacy.go @@ -150,7 +150,7 @@ func (c *PodVolumeRestoreReconcilerLegacy) Reconcile(ctx context.Context, req ct fsRestore, err := c.dataPathMgr.CreateFileSystemBR(pvr.Name, pVBRRequestor, ctx, c.Client, pvr.Namespace, callbacks, log) if err != nil { if err == datapath.ConcurrentLimitExceed { - return ctrl.Result{Requeue: true, RequeueAfter: time.Second * 5}, nil + return ctrl.Result{RequeueAfter: time.Second * 5}, nil } else { return c.errorOut(ctx, pvr, err, "error to create data path", log) } diff --git a/pkg/controller/pod_volume_restore_controller_test.go b/pkg/controller/pod_volume_restore_controller_test.go index 32d158a17..e2b41e0f4 100644 --- a/pkg/controller/pod_volume_restore_controller_test.go +++ b/pkg/controller/pod_volume_restore_controller_test.go @@ -790,7 +790,7 @@ func TestPodVolumeRestoreReconcile(t *testing.T) { targetPod: builder.ForPod("test-ns", "test-pod").InitContainers(&corev1api.Container{Name: restorehelper.WaitInitContainer}).InitContainerState(corev1api.ContainerState{Running: &corev1api.ContainerStateRunning{}}).Result(), constrained: true, expected: builder.ForPodVolumeRestore(velerov1api.DefaultNamespace, pvrName).Finalizers([]string{PodVolumeFinalizer}).Result(), - expectedResult: &ctrl.Result{Requeue: true, RequeueAfter: time.Second * 5}, + expectedResult: &ctrl.Result{RequeueAfter: time.Second * 5}, }, { name: "new pvr but accept failed", @@ -858,7 +858,7 @@ func TestPodVolumeRestoreReconcile(t *testing.T) { dataMgr: datapath.NewManager(0), notNilExpose: true, notMockCleanUp: true, - expectedResult: &ctrl.Result{Requeue: true, RequeueAfter: time.Second * 5}, + expectedResult: &ctrl.Result{RequeueAfter: time.Second * 5}, }, { name: "data path init error", @@ -1057,7 +1057,6 @@ func TestPodVolumeRestoreReconcile(t *testing.T) { } if test.expectedResult != nil { - assert.Equal(t, test.expectedResult.Requeue, actualResult.Requeue) assert.Equal(t, test.expectedResult.RequeueAfter, actualResult.RequeueAfter) } diff --git a/pkg/controller/server_status_request_controller_test.go b/pkg/controller/server_status_request_controller_test.go index eb95c7e87..b41939a80 100644 --- a/pkg/controller/server_status_request_controller_test.go +++ b/pkg/controller/server_status_request_controller_test.go @@ -125,7 +125,7 @@ var _ = Describe("Server Status Request Reconciler", func() { }, }). Result(), - expectedRequeue: ctrl.Result{Requeue: false, RequeueAfter: statusRequestResyncPeriod}, + expectedRequeue: ctrl.Result{RequeueAfter: statusRequestResyncPeriod}, }), Entry("with phase=new will be processed and phased successfully patched", request{ req: statusRequestBuilder("1"). @@ -158,7 +158,7 @@ var _ = Describe("Server Status Request Reconciler", func() { }, }). Result(), - expectedRequeue: ctrl.Result{Requeue: false, RequeueAfter: statusRequestResyncPeriod}, + expectedRequeue: ctrl.Result{RequeueAfter: statusRequestResyncPeriod}, }), Entry("with phase=Processed does not get deleted if not expired", request{ req: statusRequestBuilder("1"). @@ -191,7 +191,7 @@ var _ = Describe("Server Status Request Reconciler", func() { }, }). Result(), - expectedRequeue: ctrl.Result{Requeue: false, RequeueAfter: statusRequestResyncPeriod}, + expectedRequeue: ctrl.Result{RequeueAfter: statusRequestResyncPeriod}, }), Entry("with phase=Processed gets deleted if expired", request{ req: statusRequestBuilder("1"). @@ -214,7 +214,7 @@ var _ = Describe("Server Status Request Reconciler", func() { }, }, expected: nil, - expectedRequeue: ctrl.Result{Requeue: false, RequeueAfter: statusRequestResyncPeriod}, + expectedRequeue: ctrl.Result{RequeueAfter: statusRequestResyncPeriod}, }), Entry("with invalid phase returns an error and does not requeue", request{ req: statusRequestBuilder("1"). @@ -237,7 +237,7 @@ var _ = Describe("Server Status Request Reconciler", func() { }, }, expectedErrMsg: "unexpected ServerStatusRequest phase", - expectedRequeue: ctrl.Result{Requeue: false, RequeueAfter: 0}, + expectedRequeue: ctrl.Result{RequeueAfter: 0}, }), ) })