Skip to content

move root mount setup to mountproviders - #31266

Merged
icewind1991 merged 8 commits into
masterfrom
root-setup-mountprovider
Mar 4, 2022
Merged

move root mount setup to mountproviders#31266
icewind1991 merged 8 commits into
masterfrom
root-setup-mountprovider

Conversation

@icewind1991

@icewind1991icewind1991 commented Feb 18, 2022•
edited
Loading

Copy link
Copy Markdown
Member

Removes special casing for the root storage from the filesystem setup logic

Requires:

Part of #31265

@icewind1991icewind1991 added the 3. to review Waiting for reviews label Feb 18, 2022
@icewind1991icewind1991 added this to the Nextcloud 24 milestone Feb 18, 2022
@icewind1991icewind1991 mentioned this pull request Feb 18, 2022
Merged
8 tasks
CarlSchwan
CarlSchwan reviewed Feb 18, 2022
View reviewed changes
Comment threadlib/private/Files/Mount/RootMountProvider.php
PVince81
PVince81 reviewed Feb 21, 2022
View reviewed changes
Comment threadlib/private/legacy/OC_Util.php
PVince81
PVince81 reviewed Feb 21, 2022
View reviewed changes
Comment threadlib/private/legacy/OC_Util.php
@icewind1991
icewind1991force-pushed the root-setup-mountprovider branch 4 times, most recently from c0732ab to 17e2bddCompareFebruary 23, 2022 19:36
@icewind1991
move root mount setup to mountproviders
8b7c844
Signed-off-by: Robin Appelman <robin@icewind.nl>
@icewind1991
icewind1991force-pushed the root-setup-mountprovider branch from 17e2bdd to 8b7c844CompareFebruary 24, 2022 16:21
@icewind1991
catch storage not available when deleting avatar
215fa17
Signed-off-by: Robin Appelman <robin@icewind.nl>
@icewind1991
run ci with primary s3 setup
72f9fd9
Signed-off-by: Robin Appelman <robin@icewind.nl>
@icewind1991
return dummy availability if storage is not found in cache
b0ce876
Signed-off-by: Robin Appelman <robin@icewind.nl>
@icewind1991
icewind1991force-pushed the root-setup-mountprovider branch from 4738a20 to b0ce876CompareFebruary 25, 2022 14:25
@icewind1991
skip localstorage dependend trashbin test when not using local user s…
0235764
…torage
Signed-off-by: Robin Appelman <robin@icewind.nl>
@icewind1991
make share cache test resilient against skeleton files not being there
ad10a33
Signed-off-by: Robin Appelman <robin@icewind.nl>
@icewind1991
skip localstorage dependend user test when not using local user storage
d08d0eb
Signed-off-by: Robin Appelman <robin@icewind.nl>
@icewind1991
also handle expired pre-write shared lock on dav upload when not usin…
ec15020
…g part files
Signed-off-by: Robin Appelman <robin@icewind.nl>
@icewind1991
icewind1991force-pushed the root-setup-mountprovider branch from a4387f7 to ec15020CompareFebruary 25, 2022 15:33
@icewind1991

icewind1991 commented Feb 25, 2022

Copy link
Copy Markdown
MemberAuthor

Added ci setup with objectstore (multibucket) as root storage and fixed some failures when running with objectstore

@skjnldsv
skjnldsv requested review from a team and nickvergessen and removed request for a teamMarch 1, 2022 14:24
@icewind1991icewind1991 mentioned this pull request Mar 3, 2022
Merged
1 task
CarlSchwan
CarlSchwan approved these changes Mar 4, 2022
View reviewed changes

@CarlSchwanCarlSchwan left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Looks good 👍 and tests are happy

PVince81
PVince81 reviewed Mar 4, 2022
View reviewed changes
Comment thread.github/workflows/s3-primary.yml
@@ -0,0 +1,70 @@
name: S3 primary storage

@PVince81PVince81Mar 4, 2022

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

hurrah for more tests!

@PVince81PVince81Mar 4, 2022

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

is this backportable separately?

PVince81
PVince81 approved these changes Mar 4, 2022
View reviewed changes

@PVince81PVince81 left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Code looks fine 👍

It does seem to also contain changes that perhaps could be extracted to separate PRs to make them backportable if they solve bigger issues ?

Comment threadapps/dav/lib/Connector/Sabre/File.php
// the entire operation will be safe

try {
$this->acquireLock(ILockingProvider::LOCK_EXCLUSIVE);

@PVince81PVince81Mar 4, 2022

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

is this directly related to this PR or is this a fix that we could use separately ?

Comment thread.github/workflows/s3-primary.yml
@@ -0,0 +1,70 @@
name: S3 primary storage

@PVince81PVince81Mar 4, 2022

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

is this backportable separately?

@icewind1991

icewind1991 commented Mar 4, 2022

Copy link
Copy Markdown
MemberAuthor

I'll look into backporting the primary storage ci+fixes

@icewind1991
icewind1991 merged commit 8b22a46 into masterMar 4, 2022
@icewind1991
icewind1991 deleted the root-setup-mountprovider branch March 4, 2022 13:44
@icewind1991icewind1991 mentioned this pull request Mar 4, 2022
Merged
@PVince81

PVince81 commented Mar 4, 2022

Copy link
Copy Markdown
Member

I'll look into backporting the primary storage ci+fixes

thanks!

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@PVince81PVince81PVince81 approved these changes
@CarlSchwanCarlSchwanCarlSchwan approved these changes
@nickvergessennickvergessenAwaiting requested review from nickvergessen

Assignees

No one assigned

Labels

3. to reviewWaiting for reviews

Projects

None yet

Milestone

Nextcloud 24

Development

Successfully merging this pull request may close these issues.

3 participants

@icewind1991@PVince81@CarlSchwan