Rescan external storage shares on missing metadata - #63254
Open
pdostal wants to merge 1 commit into
Open
Conversation
SharedStorage::getWatcher() decided between a real Watcher and a NullWatcher purely from the share's node cache entry storage_string_id. When that metadata was null or missing the key (e.g. shares fetched via DefaultShareProvider::getSharesBy()/getShareById()/getSharesByPath(), or not yet scanned at share-fetch time), it silently assumed home storage and installed a NullWatcher, so re-shares of external storage (SMB, S3, etc.) never got rescanned for the recipient. Fall back to a live check of the real underlying storage (instanceOfStorage(IHomeStorage::class)) when the metadata is missing or incomplete, mirroring the existing fallback in getSourceRootInfo(). A FailedStorage guard keeps a deleted owner/offline storage safely on NullWatcher. Fixes nextcloud#63253 Assisted-by: OpenCode:claude-sonnet-5 Signed-off-by: Pavel Dostál <pdostal@suse.cz>
pdostal
requested review from
Altahrim,
CarlSchwan,
icewind1991 and
provokateurin
and removed request for
a team
August 14, 2026 23:56
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
1 participant
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.
Summary
SharedStorage::getWatcher()decided between a realWatcherand aNullWatcherpurely from the share's node cache entrystorage_string_id.When that metadata was
nullor missing the key (e.g. shares fetched viaDefaultShareProvider::getSharesBy()/getShareById()/getSharesByPath(),or not yet scanned at share-fetch time), it silently assumed home storage
and installed a
NullWatcher, so re-shares of external storage (SMB, S3,etc.) never got rescanned for the recipient.
This falls back to a live check of the real underlying storage
(
instanceOfStorage(IHomeStorage::class)) when the metadata is missing orincomplete, mirroring the existing fallback in
getSourceRootInfo(). AFailedStorageguard keeps a deleted owner/offline storage safely onNullWatcher.Checklist
3. to review, feature component)stable32)AI (if applicable)