Repository navigation
fix(files): Continue scanning after StorageInvalidException - #65585
Open
DerDreschner wants to merge 1 commit into
Open
DerDreschner wants to merge 1 commit into
DerDreschner wants to merge 1 commit into
Conversation
When a federated share was already removed on the remote end, accessing it triggers a `StorageInvalidException` after the share and its mount are removed locally. When running `occ files:scan`, this exception isn't caught by the scanner and aborts the scan of all remaining mounts of that user, printing a stack trace instead. This can be pretty frustrating on larger instances with many federated shares. To avoid that, the `StorageInvalidException` is now caught and handled the same way as the `StorageNotAvailableException`: log it as an error, report it through the `StorageNotAvailable` hook and continue with the next mount. Assisted-by: ClaudeCode:claude-opus-5-5 Signed-off-by: David Dreschner <david.dreschner@nextcloud.com>
DerDreschner
requested review from
Altahrim,
provokateurin,
salmart-dev and
sorbaugh
and removed request for
a team
October 16, 2026 14:34
CarlSchwan
approved these changes
Oct 20, 2026
DerDreschner
requested review from
come-nc
and
a balanced review from Copilot
October 27, 2026 06:58
Contributor
There was a problem hiding this comment.
🟢 Approval recommended
The narrow exception-handling change updates both consumers and includes focused regression coverage, with no blocking issues identified in static review; tests were not executed.
No open issues 🎉
What changed in this PR
This PR prevents invalid storage, such as a deleted federated share, from stopping scans of a user’s remaining mounts.
Changes:
- Handle
StorageInvalidExceptionlike unavailable storage: log it, emit the existing hook, and continue scanning. - Update both scan command listeners to accept the additional exception type.
- Add regression tests for scan continuation and app-data error reporting.
| File | Description |
|---|---|
| tests/lib/Files/Utils/ScannerTest.php | Verify logging, hook emission, and scanning of subsequent mounts. |
| lib/private/Files/Utils/Scanner.php | Catch invalid-storage exceptions within the mount scan loop. |
| apps/files/tests/Command/ScanAppDataTest.php | Verify invalid-storage errors are reported by the app-data command. |
| apps/files/lib/Command/ScanAppData.php | Accept invalid-storage exceptions in the error listener. |
| apps/files/lib/Command/Scan.php | Accept invalid-storage exceptions in the error-counting listener. |
Review effort: Balanced
DerDreschner
enabled auto-merge
October 27, 2026 10:50
This branch has not been deployed
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.
occ files:scancrashes on stale federated shares after remote deletion #64511Summary
When a federated share was already removed on the remote end, accessing it triggers a
StorageInvalidExceptionafter the share and its mount are removed locally. When runningocc files:scan, this exception isn't caught by the scanner and aborts the scan of all remaining mounts of that user, printing a stack trace instead. This can be pretty frustrating on larger instances with many federated shares.To avoid that, the
StorageInvalidExceptionis now caught and handled the same way as theStorageNotAvailableException: log it as an error, report it through theStorageNotAvailablehook and continue with the next mount.Checklist
3. to review, feature component)stable32)AI (if applicable)