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

Fix DataImportCron PVC timestamping #2566

Merged
merged 1 commit into from
Feb 1, 2023

Conversation

arnongilboa
Copy link
Collaborator

Signed-off-by: Arnon Gilboa [email protected]

What this PR does / why we need it:
DataImportCron PVC garbage collection is LRU-based, so it's broken when PVCs are not timestamped.

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 bz #2165793

Special notes for your reviewer:

Release note:

Fix DataImportCron PVC timestamping

DataImportCron PVC garbage collection is LRU-based, so it's broken when
PVCs are not timestamped.

Signed-off-by: Arnon Gilboa <[email protected]>
@kubevirt-bot kubevirt-bot added release-note Denotes a PR that will be considered when it comes time to generate release notes. dco-signoff: yes Indicates the PR's author has DCO signed all their commits. labels Jan 31, 2023
@kubevirt-bot kubevirt-bot requested review from aglitke and awels January 31, 2023 16:17
@awels
Copy link
Member

awels commented Jan 31, 2023

/retest-required
/lgtm
/approve

@kubevirt-bot kubevirt-bot added the lgtm Indicates that a PR is ready to be merged. label Jan 31, 2023
@kubevirt-bot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: awels

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 Jan 31, 2023
@arnongilboa
Copy link
Collaborator Author

/retest

1 similar comment
@arnongilboa
Copy link
Collaborator Author

/retest

@kubevirt-bot kubevirt-bot merged commit d5b67e0 into kubevirt:main Feb 1, 2023
@arnongilboa
Copy link
Collaborator Author

/hold

@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 Feb 1, 2023
@aglitke
Copy link
Member

aglitke commented Feb 1, 2023

@arnongilboa Can you do a backport to release-v1.55 ?

@arnongilboa
Copy link
Collaborator Author

/cherrypick release-v1.55

@kubevirt-bot
Copy link
Contributor

@arnongilboa: #2566 failed to apply on top of branch "release-v1.55":

Applying: Fix DataImportCron PVC timestamping
Using index info to reconstruct a base tree...
M	pkg/controller/dataimportcron-controller.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/controller/dataimportcron-controller.go
CONFLICT (content): Merge conflict in pkg/controller/dataimportcron-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 Fix DataImportCron PVC timestamping
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:

/cherrypick release-v1.55

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.

@arnongilboa
Copy link
Collaborator Author

@arnongilboa Can you do a backport to release-v1.55 ?

@aglitke sure, working on a manual backport

@arnongilboa
Copy link
Collaborator Author

/unhold
no idea how it got merged before removing it...

@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 Feb 1, 2023
@awels
Copy link
Member

awels commented Feb 1, 2023

You held it after the merge.

@arnongilboa
Copy link
Collaborator Author

You held it after the merge.

oh, so I just didn't notice it merged. It seems I introduced a short timeout issue which may cause flackiness. 10 sec was nice for local debugging but not for CI...

https://github.com/kubevirt/containerized-data-importer/blob/main/tests/dataimportcron_test.go#L279

arnongilboa added a commit to arnongilboa/containerized-data-importer that referenced this pull request Feb 1, 2023
Manual backport of kubevirt#2566.

DataImportCron PVC garbage collection is LRU-based, so it's broken when
PVCs are not timestamped.

Signed-off-by: Arnon Gilboa <[email protected]>
kubevirt-bot pushed a commit that referenced this pull request Feb 1, 2023
Manual backport of #2566.

DataImportCron PVC garbage collection is LRU-based, so it's broken when
PVCs are not timestamped.

Signed-off-by: Arnon Gilboa <[email protected]>
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 Denotes a PR that will be considered when it comes time to generate release notes. size/L
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants