Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Queue DataVolumes referred to in "populatedFor" annotations #2373

Merged
merged 2 commits into from
Aug 3, 2022

Conversation

mhenriks
Copy link
Member

@mhenriks mhenriks commented Jul 25, 2022

Signed-off-by: Michael Henriksen mhenriks@redhat.com

What this PR does / why we need it:

This issue came up in testing backup/restore with Kasten k10. Should queue DataVolumes referred to in "populatedFor" annotations. Without this change, a "prePopulated" DV created before a "populatedFor" DV will be pending forever if the PVC is not owned by the DV.

Which issue(s) this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged):
Fixes #

Special notes for your reviewer:

Release note:

NONE

Signed-off-by: Michael Henriksen <mhenriks@redhat.com>
@kubevirt-bot kubevirt-bot added release-note-none Denotes a PR that doesn't merit a release note. dco-signoff: yes Indicates the PR's author has DCO signed all their commits. labels Jul 25, 2022
@kubevirt-bot kubevirt-bot requested review from awels and maya-r July 25, 2022 19:28
@mhenriks
Copy link
Member Author

/retest

@brybacki
Copy link
Contributor

I can see that you changed the watcher to also get PVCs with populatedFor.
But what was the actual problem, and what is actually fixed. Can you improve the description of the PR?

@mhenriks
Copy link
Member Author

I can see that you changed the watcher to also get PVCs with populatedFor. But what was the actual problem, and what is actually fixed. Can you improve the description of the PR?

Sorry, thought it was pretty obvious if you look at the difference to the functional test. The reason the test worked before is because the PVC was owned by the DataVolume. But that will not always be the case (at least initially). Without this change the PVC (without owner ref) would leave the DV pending forever.

Signed-off-by: Michael Henriksen <mhenriks@redhat.com>
@mhenriks
Copy link
Member Author

/hold
while I figure out test failures with GC enabled

@kubevirt-bot kubevirt-bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jul 27, 2022
@mhenriks
Copy link
Member Author

/retest

@mhenriks
Copy link
Member Author

/test pull-containerized-data-importer-e2e-ceph-gc

@ShellyKa13
Copy link
Contributor

/lgtm

@kubevirt-bot kubevirt-bot added the lgtm Indicates that a PR is ready to be merged. label Aug 1, 2022
@mhenriks
Copy link
Member Author

mhenriks commented Aug 3, 2022

/hold cancel
/approve

@kubevirt-bot kubevirt-bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Aug 3, 2022
@kubevirt-bot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: mhenriks

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 /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@kubevirt-bot kubevirt-bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Aug 3, 2022
@kubevirt-bot kubevirt-bot merged commit 90ee754 into kubevirt:main Aug 3, 2022
@mhenriks
Copy link
Member Author

/cherry-pick release-v1.49

@kubevirt-bot
Copy link
Contributor

@mhenriks: #2373 failed to apply on top of branch "release-v1.49":

Applying: Queue DataVolumes referred to in "populatedFor" annotations
Using index info to reconstruct a base tree...
M	pkg/controller/datavolume-controller.go
M	tests/datavolume_test.go
Falling back to patching base and 3-way merge...
Auto-merging tests/datavolume_test.go
CONFLICT (content): Merge conflict in tests/datavolume_test.go
Auto-merging pkg/controller/datavolume-controller.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Queue DataVolumes referred to in "populatedFor" annotations
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release-v1.49

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/test-infra repository.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. dco-signoff: yes Indicates the PR's author has DCO signed all their commits. lgtm Indicates that a PR is ready to be merged. release-note-none Denotes a PR that doesn't merit a release note. size/M
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants