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

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

Closed
wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented May 13, 2024

In older versions of fscrypt there is a race condition when multiple encrypted cephfs instances are deployed simultaneously.
This PR upgrades the fscrypt version to the latest version that contains a fix to the concurrency issue, used the commit sha as we cannot know when the next official release will happen from fscrypt side.

This PR fixes: #4592


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

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)

# Conflicts:
#	go.mod
#	vendor/modules.txt
@mergify mergify bot added the conflicts label May 13, 2024
Copy link
Contributor Author

mergify bot commented May 13, 2024

Cherry-pick of 3073409 has failed:

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

You are currently cherry-picking commit 307340969.
  (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)

Changes to be committed:
	modified:   go.sum
	modified:   vendor/github.com/google/fscrypt/actions/context.go
	modified:   vendor/github.com/google/fscrypt/actions/policy.go
	modified:   vendor/github.com/google/fscrypt/crypto/crypto.go
	modified:   vendor/github.com/google/fscrypt/crypto/rand.go
	modified:   vendor/github.com/google/fscrypt/filesystem/filesystem.go
	modified:   vendor/github.com/google/fscrypt/filesystem/mountpoint.go
	modified:   vendor/github.com/google/fscrypt/metadata/config.go
	modified:   vendor/github.com/google/fscrypt/metadata/metadata.pb.go
	modified:   vendor/github.com/google/fscrypt/metadata/policy.go
	modified:   vendor/github.com/google/fscrypt/security/privileges.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   go.mod
	both modified:   vendor/modules.txt

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 component/cephfs Issues related to CephFS bug Something isn't working labels May 13, 2024
@NymanRobin
Copy link
Contributor

I will look at this and try to resolve it manually

@NymanRobin
Copy link
Contributor

NymanRobin commented May 13, 2024

The PR is now open at #4613, so this can be closed? Hopefully this was okay, @Madhu-1 let me know in case I missed something?

@Madhu-1 Madhu-1 closed this May 15, 2024
@mergify mergify bot deleted the mergify/bp/release-v3.11/pr-4609 branch May 15, 2024 11:26
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/cephfs Issues related to CephFS conflicts
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants