Skip to content

Conversation

@icewind1991
Copy link
Member

To test:

  • setup an instance with encryption

  • create folder test and write some files into it

  • "accidentally" mess up the unencrypted_size for the folder with

    update oc_filecache set unencrypted_size = 100 where name = 'test';

  • run occ files:scan --all in an attempt to repair it

  • check if the folder size is reported correctly

@icewind1991 icewind1991 added the 3. to review Waiting for reviews label Feb 24, 2023
@icewind1991 icewind1991 added this to the Nextcloud 26 milestone Feb 24, 2023
@icewind1991 icewind1991 requested review from a team, ArtificialOwl, blizzz and come-nc and removed request for a team February 24, 2023 16:43
@icewind1991 icewind1991 marked this pull request as ready for review February 28, 2023 16:25
@icewind1991 icewind1991 force-pushed the scan-repair-unencrypted-size branch from 68d71cd to 5d71368 Compare March 3, 2023 16:11
@blizzz blizzz mentioned this pull request Mar 7, 2023
@blizzz blizzz modified the milestones: Nextcloud 26, Nextcloud 27 Mar 7, 2023
@PVince81
Copy link
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 ?

@camilasan
Copy link
Member

Any plans to merge and backport this to 25 @icewind1991 @come-nc ?

@icewind1991 icewind1991 force-pushed the scan-repair-unencrypted-size branch from 1bcae22 to 06a1bd0 Compare April 4, 2023 14:49
Signed-off-by: Robin Appelman <[email protected]>
@icewind1991 icewind1991 force-pushed the scan-repair-unencrypted-size branch from 06a1bd0 to 5267a74 Compare April 4, 2023 15:05
@icewind1991 icewind1991 requested a review from artonge April 4, 2023 15:32
@icewind1991 icewind1991 merged commit 4953296 into master Apr 24, 2023
@icewind1991 icewind1991 deleted the scan-repair-unencrypted-size branch April 24, 2023 13:24
@icewind1991
Copy link
Member Author

/backport to stable26

@icewind1991
Copy link
Member Author

/backport to stable25

@backportbot-nextcloud
Copy link

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-stable26

More info at https://docs.nextcloud.com/server/latest/developer_manual/getting_started/development_process.html#manual-backport

@backportbot-nextcloud
Copy link

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-stable25

More info at https://docs.nextcloud.com/server/latest/developer_manual/getting_started/development_process.html#manual-backport

@nextcloud nextcloud deleted a comment from backportbot-nextcloud bot May 31, 2023
@nextcloud nextcloud deleted a comment from backportbot-nextcloud bot May 31, 2023
@icewind1991
Copy link
Member Author

/backport to stable26

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

3. to review Waiting for reviews

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants