mergify[bot]
commented
4 months ago Cherry-pick of 3073409695df75c2add5b326ada9b34b74467e59 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
NymanRobin
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.