Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix root mounts not being setup in some cases #39044

Merged
merged 2 commits into from Oct 24, 2023

Conversation

icewind1991
Copy link
Member

@icewind1991 icewind1991 commented Jun 28, 2023

In some cases, the root setup is triggered before the filesystem apps are loaded. These are then loading during the filesystem wrapper setup, if the loading of an app attempts to interact with the filesystem, it will attempt to setup the filesystem recursively.

This recursion is prevented by the SetupManager, but that also means that the app loading code sees the filesystem with no mounts setup. Which will lead to errors.

By moving the wrapper setup to before the recursion setup we can prevent this issue

@icewind1991 icewind1991 force-pushed the more-empty-mount-checking branch 2 times, most recently from 39893f0 to 8cf7451 Compare June 28, 2023 15:00
@icewind1991 icewind1991 changed the title add more checks to ensure mounts aren't empty Fix root mounts not being setup in some cases Jul 25, 2023
Signed-off-by: Robin Appelman <robin@icewind.nl>
Signed-off-by: Robin Appelman <robin@icewind.nl>
@icewind1991 icewind1991 requested review from a team, ArtificialOwl, Fenn-CS and sorbaugh and removed request for a team September 12, 2023 14:59
@icewind1991 icewind1991 added the 3. to review Waiting for reviews label Sep 12, 2023
@icewind1991 icewind1991 added this to the Nextcloud 28 milestone Sep 12, 2023
@icewind1991 icewind1991 marked this pull request as ready for review September 12, 2023 15:00
Copy link

@mr-field mr-field left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've not worked on Nextcloud before, but the changes look sensible to me. I've tested this on my setup and it successfully fixed #32194.

@tgoeg
Copy link

tgoeg commented Oct 4, 2023

This fixes active breakage of production systems and updates to those, the corresponding bug is already 1,5y open.
The review does not seem to be a big thing as the changes are minimal.
@ArtificialOwl, @sorbaugh: Can you try to fit this in in your schedule? Much appreciated.

@icewind1991 icewind1991 merged commit efe68d0 into master Oct 24, 2023
40 checks passed
@icewind1991 icewind1991 deleted the more-empty-mount-checking branch October 24, 2023 14:54
@icewind1991
Copy link
Member Author

/backport to stable27

@icewind1991
Copy link
Member Author

/backport to stable26

@tgoeg
Copy link

tgoeg commented Oct 24, 2023

Thanks a lot, much appreciated!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants