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.

Sign up for GitHub

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

Jump to bottom

cephfs: upgrade fscrypt version to fix concurrency issue (backport #4609) #4613

Merged
merged 1 commit into from
May 15, 2024
Merged

cephfs: upgrade fscrypt version to fix concurrency issue (backport #4609) #4613

merged 1 commit into from
May 15, 2024

Conversation

NymanRobin
Copy link
Contributor

Mergify bot could not resolve a conflict in #4612 when cherry-picking the commit from #4609
So here is cherry-pick manually

@mergify mergify bot added component/cephfs Issues related to CephFS bug Something isn't working labels May 13, 2024
@NymanRobin NymanRobin mentioned this pull request May 13, 2024
Closed
Madhu-1
Madhu-1 previously approved these changes May 14, 2024
View reviewed changes
@Madhu-1
Copy link
Collaborator

Madhu-1 commented May 14, 2024

@NymanRobin can you use git cherry-pick which helps us to keep track of the changes?

@mergify mergify bot dismissed Madhu-1’s stale review May 14, 2024 06:25

Pull request has been modified.

@NymanRobin
Copy link
Contributor Author

Sure @Madhu-1, I think now it should be cherry-picked properly :D
First time just upgraded fscrypt manually to avoid having to solve conflicts, but let's do it the right way 👍

@Madhu-1
Copy link
Collaborator

Madhu-1 commented May 14, 2024

Sure @Madhu-1, I think now it should be cherry-picked properly :D First time just upgraded fscrypt manually to avoid having to solve conflicts, but let's do it the right way 👍

@NymanRobin can you use -x to indicate which commit this change was cherry-picked from?

@NymanRobin
cephfs: upgrade fscrypt version to fix concurrency issue
c21b967 
In older versions of fscrypt there is a race condition
when multiple encrypted cephfs instances are deployed
simultaneously.

Signed-off-by: NymanRobin <robin.nyman@est.tech>
(cherry picked from commit 3073409)
@NymanRobin
Copy link
Contributor Author

Hopefully third time is the charm 🤞

@Madhu-1 Madhu-1 added the ready-to-merge This PR is ready to be merged and it doesn't need second review (backports only) label May 14, 2024
@Madhu-1
Copy link
Collaborator

Madhu-1 commented May 14, 2024

Hopefully third time is the charm 🤞

yes , this looks good, Thanks for taking care of it!

@Madhu-1
Copy link
Collaborator

Madhu-1 commented May 14, 2024

@Mergifyio queue

@mergify Mergify
Copy link
Contributor

mergify bot commented May 14, 2024 •
edited

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.

@mergify mergify bot added the ok-to-test Label to trigger E2E tests label May 14, 2024
@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.28

@ceph-csi-bot
Copy link
Collaborator

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

@ceph-csi-bot
Copy link
Collaborator

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

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

@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-helm/k8s-1.29

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

@ceph-csi-bot
Copy link
Collaborator

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

@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/k8s-1.26

@ceph-csi-bot ceph-csi-bot removed the ok-to-test Label to trigger E2E tests label May 14, 2024
@iPraveenParihar
Copy link
Contributor

@Madhu-1, I think we need to back-port #4589 to release-v3.11 to exclude the 1.26 tests?

@Madhu-1
Copy link
Collaborator

Madhu-1 commented May 15, 2024

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

@Madhu-1
Copy link
Collaborator

Madhu-1 commented May 15, 2024

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

@Madhu-1
Copy link
Collaborator

Madhu-1 commented May 15, 2024

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

@Madhu-1
Copy link
Collaborator

Madhu-1 commented May 15, 2024

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

@mergify mergify bot merged commit ca71394 into ceph:release-v3.11 May 15, 2024
44 of 45 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Madhu-1 Madhu-1 Madhu-1 approved these changes

Assignees
No one assigned
Labels
bug Something isn't working component/cephfs Issues related to CephFS ready-to-merge This PR is ready to be merged and it doesn't need second review (backports only)
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@NymanRobin @Madhu-1 @ceph-csi-bot @iPraveenParihar