fix: file deletion called twice and ignoring errors with FileSystem storage type #35905

cardoso · 2025-04-29T18:52:30Z

Proposed changes (including videos or screenshots)

Removes the call to fs.stat to check if the file existed and is a file (using isFile()) before attempting to delete it. This was done asynchronously and, if the file existed and was a file, it would then call fs.unlink to delete it.

Instead, the code now directly attempts to delete the file using unlink(path). If the file does not exist (ENOENT), the error is safely ignored.

This change also helps prevent race conditions where the file could be deleted between the stat and unlink calls.

Also fixes the delete method being called twice.

Issue(s)

https://rocketchat.atlassian.net/browse/SUP-745

Steps to test or reproduce

Further comments

dionisio-bot · 2025-04-29T18:52:32Z

Looks like this PR is ready to merge! 🎉
If you have any trouble, please check the PR guidelines

changeset-bot · 2025-04-29T18:52:35Z

🦋 Changeset detected

Latest commit: 41b1d9c

The changes in this PR will be included in the next version bump.

This PR includes changesets to release 36 packages

Name	Type
@rocket.chat/meteor	Patch
@rocket.chat/core-typings	Patch
@rocket.chat/rest-typings	Patch
@rocket.chat/uikit-playground	Patch
@rocket.chat/api-client	Patch
@rocket.chat/apps	Patch
@rocket.chat/core-services	Patch
@rocket.chat/cron	Patch
@rocket.chat/ddp-client	Patch
@rocket.chat/freeswitch	Patch
@rocket.chat/fuselage-ui-kit	Patch
@rocket.chat/gazzodown	Patch
@rocket.chat/livechat	Patch
@rocket.chat/model-typings	Patch
@rocket.chat/ui-contexts	Patch
@rocket.chat/account-service	Patch
@rocket.chat/authorization-service	Patch
@rocket.chat/ddp-streamer	Patch
@rocket.chat/omnichannel-transcript	Patch
@rocket.chat/presence-service	Patch
@rocket.chat/queue-worker	Patch
@rocket.chat/stream-hub-service	Patch
@rocket.chat/license	Patch
@rocket.chat/omnichannel-services	Patch
@rocket.chat/pdf-worker	Patch
@rocket.chat/presence	Patch
rocketchat-services	Patch
@rocket.chat/models	Patch
@rocket.chat/network-broker	Patch
@rocket.chat/mock-providers	Patch
@rocket.chat/ui-avatar	Patch
@rocket.chat/ui-client	Patch
@rocket.chat/ui-video-conf	Patch
@rocket.chat/ui-voip	Patch
@rocket.chat/web-ui-registration	Patch
@rocket.chat/instance-status	Patch

Not sure what this means? Click here to learn what changesets are.

Click here if you're a maintainer who wants to add another changeset to this PR

kodus-ai · 2025-04-29T18:52:39Z

Kody Review Complete

Great news! 🎉
No issues were found that match your current review configurations.

Keep up the excellent work! 🚀

Kody Guide: Usage and Configuration

Interacting with Kody

Request a Review: Ask Kody to review your PR manually by adding a comment with the @kody start-review command at the root of your PR.
Provide Feedback: Help Kody learn and improve by reacting to its comments with a 👍 for helpful suggestions or a 👎 if improvements are needed.

Current Kody Configuration

Review Options

The following review options are enabled or disabled:

Options	Enabled
Security	✅
Code Style	✅
Kody Rules	✅
Refactoring	✅
Error Handling	✅
Maintainability	✅
Potential Issues	✅
Documentation And Comments	✅
Performance And Optimization	✅
Breaking Changes	❌

Access your configuration settings here.

codecov · 2025-04-29T18:58:11Z

Codecov Report

Attention: Patch coverage is 91.11111% with 4 lines in your changes missing coverage. Please review.

Project coverage is 64.71%. Comparing base (aadc795) to head (41b1d9c).
Report is 1 commits behind head on develop.

Additional details and impacted files

@@             Coverage Diff             @@
##           develop   #35905      +/-   ##
===========================================
- Coverage    64.73%   64.71%   -0.02%     
===========================================
  Files         3106     3107       +1     
  Lines        92877    93094     +217     
  Branches     17675    17775     +100     
===========================================
+ Hits         60127    60250     +123     
- Misses       29964    30056      +92     
- Partials      2786     2788       +2

Flag	Coverage Δ
e2e	`58.38% <ø> (-0.01%)`	⬇️
unit	`71.49% <91.11%> (-0.18%)`	⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

github-actions · 2025-04-29T18:58:18Z

PR Preview Action v1.6.1
🚀 View preview at https://RocketChat.github.io/Rocket.Chat/pr-preview/pr-35905/
Built to branch `gh-pages` at 2025-05-19 23:16 UTC. Preview will be ready when the GitHub Pages deployment is complete.

kodus-ai · 2025-04-29T20:05:16Z

Code Review Completed! 🔥

The code review was successfully completed based on your current configurations.

Kody Guide: Usage and Configuration

Interacting with Kody

Request a Review: Ask Kody to review your PR manually by adding a comment with the @kody start-review command at the root of your PR.
Provide Feedback: Help Kody learn and improve by reacting to its comments with a 👍 for helpful suggestions or a 👎 if improvements are needed.

Current Kody Configuration

Review Options

The following review options are enabled or disabled:

Options	Enabled
Security	✅
Code Style	✅
Kody Rules	✅
Refactoring	✅
Error Handling	✅
Maintainability	✅
Potential Issues	✅
Documentation And Comments	✅
Performance And Optimization	✅
Breaking Changes	❌

Access your configuration settings here.

kodus-ai · 2025-04-30T15:16:43Z

Code Review Completed! 🔥

The code review was successfully completed based on your current configurations.

Kody Guide: Usage and Configuration

Interacting with Kody

Request a Review: Ask Kody to review your PR manually by adding a comment with the @kody start-review command at the root of your PR.
Provide Feedback: Help Kody learn and improve by reacting to its comments with a 👍 for helpful suggestions or a 👎 if improvements are needed.

Current Kody Configuration

Review Options

The following review options are enabled or disabled:

Options	Enabled
Security	✅
Code Style	✅
Kody Rules	✅
Refactoring	✅
Error Handling	✅
Maintainability	✅
Potential Issues	✅
Documentation And Comments	✅
Performance And Optimization	✅
Breaking Changes	❌

Access your configuration settings here.

kodus-ai · 2025-05-02T14:45:31Z

Code Review Completed! 🔥

The code review was successfully completed based on your current configurations.

Kody Guide: Usage and Configuration

Interacting with Kody

Request a Review: Ask Kody to review your PR manually by adding a comment with the @kody start-review command at the root of your PR.
Provide Feedback: Help Kody learn and improve by reacting to its comments with a 👍 for helpful suggestions or a 👎 if improvements are needed.

Current Kody Configuration

Review Options

The following review options are enabled or disabled:

Options	Enabled
Security	✅
Code Style	✅
Kody Rules	✅
Refactoring	✅
Error Handling	✅
Maintainability	✅
Potential Issues	✅
Documentation And Comments	✅
Performance And Optimization	✅
Breaking Changes	❌

Access your configuration settings here.

kodus-ai · 2025-05-02T16:38:03Z

Code Review Completed! 🔥

The code review was successfully completed based on your current configurations.

Kody Guide: Usage and Configuration

Interacting with Kody

Request a Review: Ask Kody to review your PR manually by adding a comment with the @kody start-review command at the root of your PR.
Provide Feedback: Help Kody learn and improve by reacting to its comments with a 👍 for helpful suggestions or a 👎 if improvements are needed.

Current Kody Configuration

Review Options

The following review options are enabled or disabled:

Options	Enabled
Security	✅
Code Style	✅
Kody Rules	✅
Refactoring	✅
Error Handling	✅
Maintainability	✅
Potential Issues	✅
Documentation And Comments	✅
Performance And Optimization	✅
Breaking Changes	❌

Access your configuration settings here.

kodus-ai · 2025-05-02T17:45:25Z

Code Review Completed! 🔥

The code review was successfully completed based on your current configurations.

Kody Guide: Usage and Configuration

Interacting with Kody

Request a Review: Ask Kody to review your PR manually by adding a comment with the @kody start-review command at the root of your PR.
Provide Feedback: Help Kody learn and improve by reacting to its comments with a 👍 for helpful suggestions or a 👎 if improvements are needed.

Current Kody Configuration

Review Options

The following review options are enabled or disabled:

Options	Enabled
Security	✅
Code Style	✅
Kody Rules	✅
Refactoring	✅
Error Handling	✅
Maintainability	✅
Potential Issues	✅
Documentation And Comments	✅
Performance And Optimization	✅
Breaking Changes	❌

Access your configuration settings here.

kodus-ai · 2025-05-02T17:49:56Z

Kody Review Complete

Great news! 🎉
No issues were found that match your current review configurations.

Keep up the excellent work! 🚀

Kody Guide: Usage and Configuration

Interacting with Kody

Request a Review: Ask Kody to review your PR manually by adding a comment with the @kody start-review command at the root of your PR.
Provide Feedback: Help Kody learn and improve by reacting to its comments with a 👍 for helpful suggestions or a 👎 if improvements are needed.

Current Kody Configuration

Review Options

The following review options are enabled or disabled:

Options	Enabled
Security	✅
Code Style	✅
Kody Rules	✅
Refactoring	✅
Error Handling	✅
Maintainability	✅
Potential Issues	✅
Documentation And Comments	✅
Performance And Optimization	✅
Breaking Changes	❌

Access your configuration settings here.

…item

…ages tests

kodus-ai · 2025-05-05T17:12:49Z

Code Review Completed! 🔥

The code review was successfully completed based on your current configurations.

Kody Guide: Usage and Configuration

Interacting with Kody

Request a Review: Ask Kody to review your PR manually by adding a comment with the @kody start-review command at the root of your PR.
Provide Feedback: Help Kody learn and improve by reacting to its comments with a 👍 for helpful suggestions or a 👎 if improvements are needed.

Current Kody Configuration

Review Options

The following review options are enabled or disabled:

Options	Enabled
Security	✅
Code Style	✅
Kody Rules	✅
Refactoring	✅
Error Handling	✅
Maintainability	✅
Potential Issues	✅
Documentation And Comments	✅
Performance And Optimization	✅
Breaking Changes	❌

Access your configuration settings here.

apps/meteor/app/lib/server/functions/cleanRoomHistory.ts

apps/meteor/server/ufs/ufs-store.ts

apps/meteor/server/ufs/ufs-methods.ts

kodus-ai · 2025-05-05T20:55:40Z

Code Review Completed! 🔥

The code review was successfully completed based on your current configurations.

Kody Guide: Usage and Configuration

Interacting with Kody

Request a Review: Ask Kody to review your PR manually by adding a comment with the @kody start-review command at the root of your PR.
Provide Feedback: Help Kody learn and improve by reacting to its comments with a 👍 for helpful suggestions or a 👎 if improvements are needed.

Current Kody Configuration

Review Options

The following review options are enabled or disabled:

Options	Enabled
Security	✅
Code Style	✅
Kody Rules	✅
Refactoring	✅
Error Handling	✅
Maintainability	✅
Potential Issues	✅
Documentation And Comments	✅
Performance And Optimization	✅
Breaking Changes	❌

Access your configuration settings here.

Handles potential errors during file deletion within the prune history functionality. If file deletion fails during the prune history process, it now stores the failed files instead of deleting the message attachment in the database. Updates tests to reflect changes to the pruning process.

…nto SUP-745-fix-pruning-ufs-local

Refactors the rooms.cleanHistory API endpoint to directly pass parameters to the cleanRoomHistoryMethod, removing unnecessary parameter object creation. Removes filesOnly property from the API response as it is no longer needed.

…nto SUP-745-fix-pruning-ufs-local

debdutdeb · 2025-05-17T16:12:21Z

Does this really "fix" the issue? Or is it a better version of the old code i.e. with better logging?

I'm asking because i don't necessarily see any change that makes it actually delete things, not do I see the old code not deleting things.

Unless stat fails both times (first actual call, second i don't know why, but regardless). If so do you know why?

cardoso · 2025-05-17T17:58:56Z

@debdutdeb there's a root cause analysis in the ticket and 3 other related tickets which were part of the issue and were merged (especially #35797 which clears the files array).

About the improvements here: the old code would call delete twice, and there are possible race conditions between stat and unlink. There's no reason to call stat since unlink will perform the same pre-conditions and throw.

Indeed there's no way to fully guarantee deletion, but now we'll see real errors if something goes wrong (except for the file not existing, which is expected in some cases like changing FileUpload_FileSystemPath apart from the double call fixed here).

Maybe this PR can be renamed.

MarcosSpessatto · 2025-05-19T12:38:42Z

@debdutdeb there's a root cause analysis in the ticket and 3 other related tickets which were part of the issue and were merged (especially #35797 which clears the files array).

About the improvements here: the old code would call delete twice, and there are possible race conditions between stat and unlink. There's no reason to call stat since unlink will perform the same pre-conditions and throw.

Indeed there's no way to fully guarantee deletion, but now we'll see real errors if something goes wrong (except for the file not existing, which is expected in some cases like changing FileUpload_FileSystemPath apart from the double call fixed here).

Maybe this PR can be renamed.

I think it makes sense to rename it @cardoso, maybe a chore instead?

cardoso · 2025-05-19T13:10:36Z

@MarcosSpessatto I updated the name already to match what's being done:

fix: pruning does not get rid of physical files -> fix: file deletion called twice and ignoring errors with FileSystem storage type

I think it's better to keep it as a fix, but I can change to chore if you prefer.

fix: pruning does not get rid of physical files

7d79f4f

cardoso added this to the 7.7.0 milestone Apr 29, 2025

Merge branch 'develop' into SUP-745-fix-pruning-ufs-local

3cbc520

Merge branch 'develop' into SUP-745-fix-pruning-ufs-local

4bfed4f

Merge branch 'develop' into SUP-745-fix-pruning-ufs-local

f84bee3

Merge branch 'develop' into SUP-745-fix-pruning-ufs-local

33e7d5f

Merge branch 'develop' into SUP-745-fix-pruning-ufs-local

bcaf170

test: add e2e tests for message pruning functionality

b0bf299

cardoso added 4 commits May 2, 2025 16:10

test: update prune messages e2e test to ensure proper message deletion

342d75b

test: update prune messages test to use role-based selector for menu …

2e9d10e

…item

test: remove unnecessary media type blacklist setting from prune mess…

c1def42

…ages tests

refactor: enhance file deletion logic and improve prune messages tests

15b0bd5

kodus-ai bot reviewed May 5, 2025

View reviewed changes

apps/meteor/app/lib/server/functions/cleanRoomHistory.ts Outdated Show resolved Hide resolved

kodus-ai bot reviewed May 5, 2025

View reviewed changes

apps/meteor/server/ufs/ufs-store.ts Outdated Show resolved Hide resolved

kodus-ai bot reviewed May 5, 2025

View reviewed changes

apps/meteor/server/ufs/ufs-methods.ts Outdated Show resolved Hide resolved

cardoso added 2 commits May 5, 2025 15:06

test: check file download and channel deletion

f9d96f0

Merge branch 'develop' into SUP-745-fix-pruning-ufs-local

254ecb6

cardoso added 13 commits May 12, 2025 18:23

Merge branch 'develop' into SUP-745-fix-pruning-ufs-local

1f07439

Merge branch 'develop' of https://github.com/RocketChat/Rocket.Chat i…

6f95786

…nto SUP-745-fix-pruning-ufs-local

Merge branch 'develop' into SUP-745-fix-pruning-ufs-local

895d84b

revert: room history cleaning API endpoint

2025e87

Refactors the rooms.cleanHistory API endpoint to directly pass parameters to the cleanRoomHistoryMethod, removing unnecessary parameter object creation. Removes filesOnly property from the API response as it is no longer needed.

Merge branch 'develop' into SUP-745-fix-pruning-ufs-local

9a1d8ed

Merge branch 'develop' of https://github.com/RocketChat/Rocket.Chat i…

622a93c

…nto SUP-745-fix-pruning-ufs-local

chore: apply changes from develop

8213241

test: add e2e test for clean history

99da0b1

test: simplify clean-history spec

4eb619c

fix: file deletion issues in prune messages

326c828

refactor: move ENOENT handling to ufs-local

e8158b3

Merge branch 'develop' of https://github.com/RocketChat/Rocket.Chat i…

acf5d31

…nto SUP-745-fix-pruning-ufs-local

cardoso marked this pull request as ready for review May 17, 2025 16:07

cardoso requested a review from a team as a code owner May 17, 2025 16:07

Create young-ants-applaud.md

0797ca4

cardoso changed the title ~~fix: pruning does not get rid of physical files~~ fix: file deletion called twice and ignoring errors with FileSystem storage type May 17, 2025

cardoso added 2 commits May 19, 2025 15:54

test: ufs-local

da275f0

test: use unmocked config

bdd8b72

MarcosSpessatto approved these changes May 19, 2025

View reviewed changes

scuciatto added the stat: QA assured Means it has been tested and approved by a company insider label May 19, 2025

dionisio-bot bot added the stat: ready to merge PR tested and approved waiting for merge label May 19, 2025

Merge branch 'develop' into SUP-745-fix-pruning-ufs-local

41b1d9c

kodiakhq bot merged commit b1e5fd0 into develop May 20, 2025
49 checks passed

kodiakhq bot deleted the SUP-745-fix-pruning-ufs-local branch May 20, 2025 00:02

rocketchat-github-ci mentioned this pull request May 20, 2025

Release 7.7.0 #36031

Merged

fix: file deletion called twice and ignoring errors with FileSystem storage type #35905

fix: file deletion called twice and ignoring errors with FileSystem storage type #35905

Uh oh!

Conversation

cardoso commented Apr 29, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Proposed changes (including videos or screenshots)

Issue(s)

Steps to test or reproduce

Further comments

Uh oh!

dionisio-bot bot commented Apr 29, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

changeset-bot bot commented Apr 29, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

🦋 Changeset detected

Uh oh!

kodus-ai bot commented Apr 29, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Kody Review Complete

Uh oh!

codecov bot commented Apr 29, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

github-actions bot commented Apr 29, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Built to branch gh-pages at 2025-05-19 23:16 UTC. Preview will be ready when the GitHub Pages deployment is complete.

Uh oh!

kodus-ai bot commented Apr 29, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Code Review Completed! 🔥

Uh oh!

kodus-ai bot commented Apr 30, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Code Review Completed! 🔥

Uh oh!

kodus-ai bot commented May 2, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Code Review Completed! 🔥

Uh oh!

kodus-ai bot commented May 2, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Code Review Completed! 🔥

Uh oh!

kodus-ai bot commented May 2, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Code Review Completed! 🔥

Uh oh!

kodus-ai bot commented May 2, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Kody Review Complete

Uh oh!

kodus-ai bot commented May 5, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Code Review Completed! 🔥

Uh oh!

Uh oh!

Uh oh!

Uh oh!

kodus-ai bot commented May 5, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Code Review Completed! 🔥

Uh oh!

debdutdeb commented May 17, 2025

Uh oh!

cardoso commented May 17, 2025

Uh oh!

MarcosSpessatto commented May 19, 2025

Uh oh!

cardoso commented May 19, 2025

Uh oh!

Uh oh!

Uh oh!

cardoso commented Apr 29, 2025 •

edited

Loading

dionisio-bot bot commented Apr 29, 2025 •

edited

Loading

changeset-bot bot commented Apr 29, 2025 •

edited

Loading

kodus-ai bot commented Apr 29, 2025 •

edited

Loading

codecov bot commented Apr 29, 2025 •

edited

Loading

github-actions bot commented Apr 29, 2025 •

edited

Loading

Built to branch `gh-pages` at 2025-05-19 23:16 UTC.
Preview will be ready when the GitHub Pages deployment is complete.

kodus-ai bot commented Apr 29, 2025 •

edited

Loading

kodus-ai bot commented Apr 30, 2025 •

edited

Loading

kodus-ai bot commented May 2, 2025 •

edited

Loading

kodus-ai bot commented May 2, 2025 •

edited

Loading

kodus-ai bot commented May 2, 2025 •

edited

Loading

kodus-ai bot commented May 2, 2025 •

edited

Loading

kodus-ai bot commented May 5, 2025 •

edited

Loading

kodus-ai bot commented May 5, 2025 •

edited

Loading