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: fix bug in rbdVol.Exists() in PVC-PVC clone case (backport #5159) #5161

Merged
merged 1 commit into from
Feb 19, 2025

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Feb 18, 2025

Describe what this PR does

This commit fixes a bug in rbdVol.Exists() which caused VolID not to be set in PVC-PVC clone case.

Is there anything that requires special attention

Do you have any questions?
No

Is the change backward compatible?
Yes

Are there concerns around backward compatibility?
No

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 #5159 done by [Mergify](https://mergify.com).

Copy link
Contributor Author

mergify bot commented Feb 18, 2025

Cherry-pick of b05d467 has failed:

On branch mergify/bp/release-v3.13/pr-5159
Your branch is up to date with 'origin/release-v3.13'.

You are currently cherry-picking commit b05d4676.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   internal/rbd/rbd_journal.go

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@mergify mergify bot added conflicts component/rbd Issues related to RBD bug Something isn't working labels Feb 18, 2025
@nixpanic
Copy link
Member

@Rakshith-R can you check this backport and fixup the conflicts?

This commit fixes a bug in rbdVol.Exists() which caused
VolID not to be set in PVC-PVC clone case.

Signed-off-by: Rakshith R <rar@redhat.com>
(cherry picked from commit b05d467)

# Conflicts:
#	internal/rbd/rbd_journal.go
@Rakshith-R Rakshith-R force-pushed the mergify/bp/release-v3.13/pr-5159 branch from 710dccd to 5841f01 Compare February 19, 2025 09:12
@Rakshith-R Rakshith-R requested a review from a team February 19, 2025 09:19
@mergify mergify bot added the ok-to-test Label to trigger E2E tests label Feb 19, 2025
@ceph-csi-bot
Copy link
Collaborator

/test ci/centos/upgrade-tests-cephfs

@ceph-csi-bot
Copy link
Collaborator

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

@ceph-csi-bot
Copy link
Collaborator

/test ci/centos/upgrade-tests-rbd

@ceph-csi-bot
Copy link
Collaborator

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

@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.30

@ceph-csi-bot
Copy link
Collaborator

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

@ceph-csi-bot
Copy link
Collaborator

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

@ceph-csi-bot
Copy link
Collaborator

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

@ceph-csi-bot
Copy link
Collaborator

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

@ceph-csi-bot
Copy link
Collaborator

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

@ceph-csi-bot ceph-csi-bot removed the ok-to-test Label to trigger E2E tests label Feb 19, 2025
@mergify mergify bot merged commit 43c3cc8 into release-v3.13 Feb 19, 2025
37 checks passed
@mergify mergify bot deleted the mergify/bp/release-v3.13/pr-5159 branch February 19, 2025 14:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working component/rbd Issues related to RBD
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants