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

rbd: add ParentInTrash parameter in rbdImage struct (backport #4522) #4579

Merged
merged 2 commits into from
Apr 25, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Apr 23, 2024

rbd: add ParentInTrash parameter in rbdImage struct

  • This commit adds ParentInTrash parameter in rbdImage struct
    and makes use of it in getParent() function in order to avoid
    error in case the parent is present but in trash.

  • This commit modifies a test case to check creation of PVC-PVC clone of a restored PVC when parent snapshot is deleted.

Signed-off-by: Rakshith R [email protected]

Describe what this PR does

Provide some context for the reviewer

Is there anything that requires special attention

Do you have any questions?

Is the change backward compatible?

Are there concerns around backward compatibility?

Provide any external context for the change, if any.

For example:

  • Kubernetes links that explain why the change is required
  • CSI spec related changes/catch-up that necessitates this patch
  • golang related practices that necessitates this change

Related issues

Mention any github issues relevant to this PR. Adding below line
will help to auto close the issue once the PR is merged.

Fixes: #issue_number

Future concerns

List items that are not part of the PR and do not impact it's
functionality, but are work items that can be taken up subsequently.

Checklist:

  • Commit Message Formatting: Commit titles and messages follow
    guidelines in the developer
    guide
    .
  • Reviewed the developer guide on Submitting a Pull
    Request
  • Pending release
    notes

    updated with breaking and/or notable changes for the next major release.
  • Documentation has been updated, if necessary.
  • Unit tests have been added, if necessary.
  • Integration tests have been added, if necessary.

Show available bot commands

These commands are normally not required, but in case of issues, leave any of
the following bot commands in an otherwise empty comment in this PR:

  • /retest ci/centos/<job-name>: retest the <job-name> after unrelated
    failure (please report the failure too!)

This is an automatic backport of pull request #4522 done by [Mergify](https://mergify.com).

This commit adds ParentInTrash parameter in rbdImage struct
and makes use of it in getParent() function in order to avoid
error in case the parent is present but in trash.

Signed-off-by: Rakshith R <[email protected]>
(cherry picked from commit c34b31e)
This commit modifies a test case to check creation of
PVC-PVC clone of a restored PVC when parent snapshot
is deleted.

Signed-off-by: Rakshith R <[email protected]>
(cherry picked from commit 1bb78fd)
@mergify mergify bot added ok-to-test Label to trigger E2E tests component/rbd Issues related to RBD labels Apr 23, 2024
@ceph-csi-bot
Copy link
Collaborator

/test ci/centos/upgrade-tests-cephfs

@ceph-csi-bot
Copy link
Collaborator

/test ci/centos/upgrade-tests-rbd

@ceph-csi-bot
Copy link
Collaborator

/test ci/centos/k8s-e2e-external-storage/1.26

@ceph-csi-bot
Copy link
Collaborator

/test ci/centos/mini-e2e-helm/k8s-1.26

@ceph-csi-bot
Copy link
Collaborator

/test ci/centos/mini-e2e/k8s-1.26

@ceph-csi-bot
Copy link
Collaborator

/test ci/centos/k8s-e2e-external-storage/1.27

@ceph-csi-bot
Copy link
Collaborator

/test ci/centos/mini-e2e-helm/k8s-1.27

@ceph-csi-bot
Copy link
Collaborator

/test ci/centos/mini-e2e/k8s-1.27

@ceph-csi-bot
Copy link
Collaborator

/test ci/centos/k8s-e2e-external-storage/1.28

@ceph-csi-bot
Copy link
Collaborator

/test ci/centos/mini-e2e-helm/k8s-1.28

@ceph-csi-bot
Copy link
Collaborator

/test ci/centos/k8s-e2e-external-storage/1.29

@ceph-csi-bot
Copy link
Collaborator

/test ci/centos/mini-e2e/k8s-1.28

@ceph-csi-bot
Copy link
Collaborator

/test ci/centos/mini-e2e-helm/k8s-1.29

@ceph-csi-bot
Copy link
Collaborator

/test ci/centos/mini-e2e/k8s-1.29

@ceph-csi-bot ceph-csi-bot removed the ok-to-test Label to trigger E2E tests label Apr 23, 2024
@nixpanic
Copy link
Member

@Mergifyio refresh

Copy link
Contributor Author

mergify bot commented Apr 24, 2024

refresh

✅ Pull request refreshed

@nixpanic nixpanic added the ready-to-merge This PR is ready to be merged and it doesn't need second review (backports only) label Apr 24, 2024
@nixpanic
Copy link
Member

@Mergifyio requeue

Copy link
Contributor Author

mergify bot commented Apr 24, 2024

requeue

✅ The queue state of this pull request has been cleaned. It can be re-embarked automatically

@nixpanic
Copy link
Member

@Mergifyio refresh

Copy link
Contributor Author

mergify bot commented Apr 24, 2024

refresh

✅ Pull request refreshed

@nixpanic
Copy link
Member

@Mergifyio rebase

Copy link
Contributor Author

mergify bot commented Apr 24, 2024

rebase

✅ Nothing to do for rebase action

@nixpanic
Copy link
Member

@Mergifyio queue

Copy link
Contributor Author

mergify bot commented Apr 24, 2024

queue

🛑 The pull request has been removed from the queue default

The queue conditions cannot be satisfied due to failing checks.

You can take a look at Queue: Embarked in merge queue check runs for more details.

In case of a failure due to a flaky test, you should first retrigger the CI.
Then, re-embark the pull request into the merge queue by posting the comment
@mergifyio refresh on the pull request.

@nixpanic
Copy link
Member

@Mergifyio requeue

Copy link
Contributor Author

mergify bot commented Apr 25, 2024

requeue

✅ The queue state of this pull request has been cleaned. It can be re-embarked automatically

@nixpanic
Copy link
Member

I fail to see why this rule is not sufficient:
image

Possibly this is because ci/centos/k8s-e2e-external-storage/1.26 failed, but that one should not be required 🤔

@Madhu-1
Copy link
Collaborator

Madhu-1 commented Apr 25, 2024

image

this says it required 1.26

@Madhu-1
Copy link
Collaborator

Madhu-1 commented Apr 25, 2024

@Mergifyio refresh

Copy link
Contributor Author

mergify bot commented Apr 25, 2024

refresh

✅ Pull request refreshed

@Madhu-1
Copy link
Collaborator

Madhu-1 commented Apr 25, 2024

@Mergifyio dequeue

Copy link
Contributor Author

mergify bot commented Apr 25, 2024

dequeue

☑️ The pull request is not queued

@Madhu-1
Copy link
Collaborator

Madhu-1 commented Apr 25, 2024

@Mergifyio refresh

@Madhu-1 Madhu-1 added the ci/skip/e2e skip running e2e CI jobs label Apr 25, 2024
Copy link
Contributor Author

mergify bot commented Apr 25, 2024

refresh

✅ Pull request refreshed

@Madhu-1
Copy link
Collaborator

Madhu-1 commented Apr 25, 2024

/test ci/centos/k8s-e2e-external-storage/1.26

@mergify mergify bot merged commit 2f19479 into release-v3.11 Apr 25, 2024
50 checks passed
@mergify mergify bot deleted the mergify/bp/release-v3.11/pr-4522 branch April 25, 2024 07:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ci/skip/e2e skip running e2e CI jobs component/rbd Issues related to RBD ready-to-merge This PR is ready to be merged and it doesn't need second review (backports only)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants