fix unencrypted_size for folders when scanning the filesystem with encryption enabled#36857
Merged
icewind1991 merged 4 commits intomasterfrom Apr 24, 2023
Merged
fix unencrypted_size for folders when scanning the filesystem with encryption enabled#36857icewind1991 merged 4 commits intomasterfrom
icewind1991 merged 4 commits intomasterfrom
Conversation
come-nc
reviewed
Feb 27, 2023
come-nc
approved these changes
Mar 3, 2023
68d71cd to
5d71368
Compare
Merged
Member
|
is this related / should this be linked with #25283 which has the whole discussion about unencrypted_size ? also there might be people there who could test this PR ? |
Member
|
Any plans to merge and backport this to 25 @icewind1991 @come-nc ? |
…cryption enabled Signed-off-by: Robin Appelman <robin@icewind.nl>
Signed-off-by: Robin Appelman <robin@icewind.nl>
…t are left Signed-off-by: Robin Appelman <robin@icewind.nl>
1bcae22 to
06a1bd0
Compare
Signed-off-by: Robin Appelman <robin@icewind.nl>
06a1bd0 to
5267a74
Compare
artonge
reviewed
Apr 5, 2023
artonge
approved these changes
Apr 24, 2023
Member
Author
|
/backport to stable26 |
Member
Author
|
/backport to stable25 |
|
The backport to stable26 failed. Please do this backport manually. # Switch to the target branch and update it
git checkout stable26
git pull origin/stable26
# Create the new backport branch
git checkout -b fix/foo-stable26
# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts. Resolve them.
git cherry-pick abc123
# Push the cherry pick commit to the remote repository and open a pull request
git push origin fix/foo-stable26More info at https://docs.nextcloud.com/server/latest/developer_manual/getting_started/development_process.html#manual-backport |
|
The backport to stable25 failed. Please do this backport manually. # Switch to the target branch and update it
git checkout stable25
git pull origin/stable25
# Create the new backport branch
git checkout -b fix/foo-stable25
# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts. Resolve them.
git cherry-pick abc123
# Push the cherry pick commit to the remote repository and open a pull request
git push origin fix/foo-stable25More info at https://docs.nextcloud.com/server/latest/developer_manual/getting_started/development_process.html#manual-backport |
Member
Author
|
/backport to stable26 |
1 task
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
To test:
setup an instance with encryption
create folder
testand write some files into it"accidentally" mess up the
unencrypted_sizefor the folder withupdate oc_filecache set unencrypted_size = 100 where name = 'test';run
occ files:scan --allin an attempt to repair itcheck if the folder size is reported correctly