Skip to content

fix(trashbin): keep cache and db consistent#57360

Open
hweihwang wants to merge 8 commits intomasterfrom
fix/trashbin-atomic-cache
Open

fix(trashbin): keep cache and db consistent#57360
hweihwang wants to merge 8 commits intomasterfrom
fix/trashbin-atomic-cache

Conversation

@hweihwang
Copy link
Copy Markdown
Contributor

@hweihwang hweihwang commented Jan 6, 2026 •
edited
Loading

Summary

  • insert files_trash row before payload move and remove it (and payload/cache) on move failure
  • update trash cache for uncached sources using size delta to avoid full folder scan
  • delete files_trash row after payload delete
  • add regression test for uncached delete

Testing

  • not run (phpunit bootstrap requires installed instance)

Fixes #56493

@hweihwang hweihwang requested a review from a team as a code owner January 6, 2026 10:33
@hweihwang hweihwang requested review from Altahrim, leftybournes, salmart-dev and yemkareems and removed request for a team January 6, 2026 10:33
@hweihwang hweihwang marked this pull request as draft January 6, 2026 10:34
@hweihwang hweihwang marked this pull request as ready for review January 6, 2026 11:08
@hweihwang hweihwang marked this pull request as draft January 6, 2026 11:47
@hweihwang hweihwang mentioned this pull request Jan 6, 2026
Open
hweihwang and others added 4 commits April 1, 2026 18:00
@hweihwang @icewind1991
fix: keep trashbin cache and db in sync
ac9c17c 
Signed-off-by: Hoang Pham <hoangmaths96@gmail.com>
@hweihwang @icewind1991
fix(trashbin): keep metadata consistent on move
eedd8dc 
Signed-off-by: Hoang Pham <hoangmaths96@gmail.com>
@hweihwang @icewind1991
perf(trashbin): avoid full rescan for uncached moves
b7150ad 
Signed-off-by: Hoang Pham <hoangmaths96@gmail.com>
@icewind1991
chore: deduplicate trashbin row delete logic
7eae0e5 
Signed-off-by: Robin Appelman <robin@icewind.nl>
@icewind1991 icewind1991 force-pushed the fix/trashbin-atomic-cache branch from b5f9df8 to 0cad873 Compare April 1, 2026 17:17
@icewind1991
Copy link
Copy Markdown
Member

icewind1991 commented Apr 1, 2026

  • Added some more tests
  • Performed some cleanup

@icewind1991
test: add test for trashbin when cross-storage move fails
921ee17 
Signed-off-by: Robin Appelman <robin@icewind.nl>
@icewind1991
fix: catch all exceptions during trashbin cache move
b76cdd0 
Signed-off-by: Robin Appelman <robin@icewind.nl>
@icewind1991
chore: psalm fix
966db54 
Signed-off-by: Robin Appelman <robin@icewind.nl>
@icewind1991 icewind1991 force-pushed the fix/trashbin-atomic-cache branch from 0cad873 to 966db54 Compare April 1, 2026 17:25
@icewind1991
test: skip testTrashEntryCreatedWhenSourceNotInCache on object store
0317e00 
Signed-off-by: Robin Appelman <robin@icewind.nl>
@icewind1991 icewind1991 marked this pull request as ready for review April 1, 2026 18:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@Altahrim Altahrim Awaiting requested review from Altahrim Altahrim is a code owner automatically assigned from nextcloud/server-backend

@salmart-dev salmart-dev Awaiting requested review from salmart-dev salmart-dev is a code owner automatically assigned from nextcloud/server-backend

@yemkareems yemkareems Awaiting requested review from yemkareems yemkareems is a code owner automatically assigned from nextcloud/server-backend

@leftybournes leftybournes Awaiting requested review from leftybournes leftybournes is a code owner automatically assigned from nextcloud/server-backend

At least 2 approving reviews are required to merge this pull request.

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Trashbin copy leaves blob in /files_trashbin without oc_files_trash / filecache rows when request aborts after moveFromStorage

2 participants

@hweihwang @icewind1991