oadp-1.3: OADP-4265: Reconcile To Fail: Add backup/restore trackers #324
+457
−4
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
openshift-ci-robot
added
the
jira/valid-reference
|
@kaovilai: This pull request references OADP-4265 which is a valid jira issue. In response to this:
Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository. |
openshift-ci
bot
added
the
do-not-merge/work-in-progress
|
Skipping CI for Draft Pull Request. |
kaovilai
force-pushed
the
OADP-4265-oadp-1.3_addTrackers
branch
from
d218808
to
095be3e
Compare
kaovilai
commented
Jun 21, 2024
Signed-off-by: Tiger Kaovilai <tkaovila@redhat.com>
kaovilai
force-pushed
the
OADP-4265-oadp-1.3_addTrackers
branch
from
095be3e
to
de7f01a
Compare
sseago
reviewed
Jun 21, 2024
There was a problem hiding this comment.
I think on the restore side, we should flip it. Track restores we want to fail. Copying the backup code as-is doesn't work fully as-written here since we add restores when InProgress and only remove them when moving to a terminal state or when planning to fail on reconcile -- so restores that don't fail validation or fail completely will never get removed from the tracker -- we'd need to add it to the finalizer to do that, but that makes for a much bigger change in a carried patch. We only need this for marking failed, not for deletion or anything similar. I think the easiest thing here is to call the struct member failRestoreTracker. Add to the tracker when the status patch at end of reconcile fails, and remove from the tracker upon successful deletion of InProgress restore.
|
@kaovilai: This pull request references OADP-4265 which is a valid jira issue. In response to this:
Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository. |
Signed-off-by: Tiger Kaovilai <tkaovila@redhat.com>
sseago
reviewed
Jun 22, 2024
openshift-ci
bot
removed
the
do-not-merge/work-in-progress
Signed-off-by: Tiger Kaovilai <tkaovila@redhat.com>
Signed-off-by: Tiger Kaovilai <tkaovila@redhat.com>
Signed-off-by: Tiger Kaovilai <tkaovila@redhat.com>
Signed-off-by: Tiger Kaovilai <tkaovila@redhat.com>
weshayutin
reviewed
Jun 24, 2024
| @@ -922,6 +922,62 @@ func TestMostRecentCompletedBackup(t *testing.T) { | |||
| assert.Equal(t, expected, mostRecentCompletedBackup(backups)) | |||
| } | |||
|
|
|||
| // OADP Carry: Test that restore that has status inProgress on reconcile is changed to failed if velero has memory of it failing. | |||
There was a problem hiding this comment.
@sseago from a rebase perspective is this ok? would prefer another file or something different?
There was a problem hiding this comment.
rebase perspective is ok from slack.
Adding cases where err is expected from Reconcile when patch fails again.
There was a problem hiding this comment.
@weshayutin It's a separate test func, so it should be fine in the same file.
kaovilai
force-pushed
the
OADP-4265-oadp-1.3_addTrackers
branch
from
fef3510
to
4e0a810
Compare
Signed-off-by: Tiger Kaovilai <tkaovila@redhat.com>
kaovilai
force-pushed
the
OADP-4265-oadp-1.3_addTrackers
branch
from
4e0a810
to
f9bfcf2
Compare
|
@kaovilai: all tests passed! Full PR test history. Your PR dashboard. Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here. |
sseago
approved these changes
Jun 24, 2024
|
@kaovilai and I are going to test this patch tomorrow on the SNO cluster, let's hold until that time. |
openshift-ci
bot
added
the
do-not-merge/hold
|
So far e2e has some passing and some failures. |
|
Latest local e2e results, 7 of 10 backup tests passes. Test results
|
|
ahem.. been testing quay image.. oops.. not this image.. put unsupportedOverrides in the wrong spot in e2e code.. so it got overriden to empty. |
|
This has to be new... aws bsl cert error.. |
|
After setting insecureskip |
|
kopias are failing with insecure.. |
|
might need to add these kopia volumeMounts to velero deploy? how did this e2e work before... |
|
@kaovilai: This pull request references OADP-4265 which is a valid jira issue. In response to this:
Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository. |
|
@kaovilai: This pull request references OADP-4265 which is a valid jira issue. In response to this:
Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository. |
|
Testing now with ubi image instead. |
|
@kaovilai: This pull request references OADP-4265 which is a valid jira issue. In response to this:
Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository. |
great start |
doing one more backup restore suite and I think this is good. |
|
token expired mid run.. running another again |
|
|
Good run! backup restore suite test. Details
|
|
/lgtm |
|
/approve |
sseago
added
the
approved
|
[APPROVALNOTIFIER] This PR is APPROVED Approval requirements bypassed by manually added approval. This pull-request has been approved by: kaovilai, sseago The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
|
If this works it would be a miracle. /cherry-pick oadp-1.4 |
|
@kaovilai: #324 failed to apply on top of branch "oadp-1.4": In response to this:
Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. |
3 tasks
openshift-merge-bot bot
pushed a commit
that referenced
this pull request
Jul 30, 2024
…330) * oadp-1.4: OADP-3227: Mark InProgress backup/restore as failed upon requeuing (#315) * Mark InProgress backup/restore as failed upon requeuing Signed-off-by: Tiger Kaovilai <tkaovila@redhat.com> remove uuid, return err to requeue instead of requeue: true Signed-off-by: Tiger Kaovilai <tkaovila@redhat.com> * cleanup to minimize diff from upstream Signed-off-by: Scott Seago <sseago@redhat.com> * error message update Signed-off-by: Scott Seago <sseago@redhat.com> * requeue on finalize status update. Unlike the InProgress transition, there's no need to fail here, since the Finalize steps can be repeated. * Only run patch once for all backup finalizer return scenarios Signed-off-by: Scott Seago <sseago@redhat.com> --------- Signed-off-by: Tiger Kaovilai <tkaovila@redhat.com> Signed-off-by: Scott Seago <sseago@redhat.com> Co-authored-by: Scott Seago <sseago@redhat.com> * oadp-1.4: OADP-3227: Reconcile To Fail: Add backup/restore trackers (#324) * OADP-4265: Reconcile To Fail: Add backup/restore trackers Signed-off-by: Tiger Kaovilai <tkaovila@redhat.com> * Apply suggestions from code review: backupTracker * Address restoreTracker feedback Signed-off-by: Tiger Kaovilai <tkaovila@redhat.com> * s/delete from/add to/ in the comment * unit test fix Signed-off-by: Tiger Kaovilai <tkaovila@redhat.com> * backup_controller unit test Signed-off-by: Tiger Kaovilai <tkaovila@redhat.com> * restore_controller unit test Signed-off-by: Tiger Kaovilai <tkaovila@redhat.com> * `make update` Signed-off-by: Tiger Kaovilai <tkaovila@redhat.com> * mock patch to fail failure due to connection refused Signed-off-by: Tiger Kaovilai <tkaovila@redhat.com> --------- Signed-off-by: Tiger Kaovilai <tkaovila@redhat.com> * regenerate mocks Signed-off-by: Tiger Kaovilai <tkaovila@redhat.com> --------- Signed-off-by: Tiger Kaovilai <tkaovila@redhat.com> Signed-off-by: Scott Seago <sseago@redhat.com> Co-authored-by: Scott Seago <sseago@redhat.com>
sseago
added a commit
to sseago/velero
that referenced
this pull request
Aug 1, 2024
…penshift#330) * oadp-1.4: OADP-3227: Mark InProgress backup/restore as failed upon requeuing (openshift#315) * Mark InProgress backup/restore as failed upon requeuing Signed-off-by: Tiger Kaovilai <tkaovila@redhat.com> remove uuid, return err to requeue instead of requeue: true Signed-off-by: Tiger Kaovilai <tkaovila@redhat.com> * cleanup to minimize diff from upstream Signed-off-by: Scott Seago <sseago@redhat.com> * error message update Signed-off-by: Scott Seago <sseago@redhat.com> * requeue on finalize status update. Unlike the InProgress transition, there's no need to fail here, since the Finalize steps can be repeated. * Only run patch once for all backup finalizer return scenarios Signed-off-by: Scott Seago <sseago@redhat.com> --------- Signed-off-by: Tiger Kaovilai <tkaovila@redhat.com> Signed-off-by: Scott Seago <sseago@redhat.com> Co-authored-by: Scott Seago <sseago@redhat.com> * oadp-1.4: OADP-3227: Reconcile To Fail: Add backup/restore trackers (openshift#324) * OADP-4265: Reconcile To Fail: Add backup/restore trackers Signed-off-by: Tiger Kaovilai <tkaovila@redhat.com> * Apply suggestions from code review: backupTracker * Address restoreTracker feedback Signed-off-by: Tiger Kaovilai <tkaovila@redhat.com> * s/delete from/add to/ in the comment * unit test fix Signed-off-by: Tiger Kaovilai <tkaovila@redhat.com> * backup_controller unit test Signed-off-by: Tiger Kaovilai <tkaovila@redhat.com> * restore_controller unit test Signed-off-by: Tiger Kaovilai <tkaovila@redhat.com> * `make update` Signed-off-by: Tiger Kaovilai <tkaovila@redhat.com> * mock patch to fail failure due to connection refused Signed-off-by: Tiger Kaovilai <tkaovila@redhat.com> --------- Signed-off-by: Tiger Kaovilai <tkaovila@redhat.com> * regenerate mocks Signed-off-by: Tiger Kaovilai <tkaovila@redhat.com> --------- Signed-off-by: Tiger Kaovilai <tkaovila@redhat.com> Signed-off-by: Scott Seago <sseago@redhat.com> Co-authored-by: Scott Seago <sseago@redhat.com>
sseago
added a commit
to sseago/velero
that referenced
this pull request
Aug 22, 2024
…penshift#330) * oadp-1.4: OADP-3227: Mark InProgress backup/restore as failed upon requeuing (openshift#315) * Mark InProgress backup/restore as failed upon requeuing Signed-off-by: Tiger Kaovilai <tkaovila@redhat.com> remove uuid, return err to requeue instead of requeue: true Signed-off-by: Tiger Kaovilai <tkaovila@redhat.com> * cleanup to minimize diff from upstream Signed-off-by: Scott Seago <sseago@redhat.com> * error message update Signed-off-by: Scott Seago <sseago@redhat.com> * requeue on finalize status update. Unlike the InProgress transition, there's no need to fail here, since the Finalize steps can be repeated. * Only run patch once for all backup finalizer return scenarios Signed-off-by: Scott Seago <sseago@redhat.com> --------- Signed-off-by: Tiger Kaovilai <tkaovila@redhat.com> Signed-off-by: Scott Seago <sseago@redhat.com> Co-authored-by: Scott Seago <sseago@redhat.com> * oadp-1.4: OADP-3227: Reconcile To Fail: Add backup/restore trackers (openshift#324) * OADP-4265: Reconcile To Fail: Add backup/restore trackers Signed-off-by: Tiger Kaovilai <tkaovila@redhat.com> * Apply suggestions from code review: backupTracker * Address restoreTracker feedback Signed-off-by: Tiger Kaovilai <tkaovila@redhat.com> * s/delete from/add to/ in the comment * unit test fix Signed-off-by: Tiger Kaovilai <tkaovila@redhat.com> * backup_controller unit test Signed-off-by: Tiger Kaovilai <tkaovila@redhat.com> * restore_controller unit test Signed-off-by: Tiger Kaovilai <tkaovila@redhat.com> * `make update` Signed-off-by: Tiger Kaovilai <tkaovila@redhat.com> * mock patch to fail failure due to connection refused Signed-off-by: Tiger Kaovilai <tkaovila@redhat.com> --------- Signed-off-by: Tiger Kaovilai <tkaovila@redhat.com> * regenerate mocks Signed-off-by: Tiger Kaovilai <tkaovila@redhat.com> --------- Signed-off-by: Tiger Kaovilai <tkaovila@redhat.com> Signed-off-by: Scott Seago <sseago@redhat.com> Co-authored-by: Scott Seago <sseago@redhat.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Signed-off-by: Tiger Kaovilai tkaovila@redhat.com
Thank you for contributing to Velero!
Please add a summary of your change
Test image build
image
UBI build image:
ghcr.io/kaovilai/velero:[OADP-4265](https://issues.redhat.com//browse/OADP-4265)-oadp-1.3_addTrackers-ubiDoes your change fix a particular issue?
Fixes #(issue)
Please indicate you've done the following:
/kind changelog-not-requiredas a comment on this pull request.site/content/docs/main.