Skip to content

[12]Use the correct root for shared jail when the source storage is also a jail - #7323

Merged
MorrisJobke merged 2 commits into
stable12from
shared-jailed-source-root-12
Dec 8, 2017
Merged

[12]Use the correct root for shared jail when the source storage is also a jail#7323
MorrisJobke merged 2 commits into
stable12from
shared-jailed-source-root-12

Conversation

@icewind1991

@icewind1991icewind1991 commented Nov 28, 2017

Copy link
Copy Markdown
Member

Backport of #7137

@icewind1991
Use the correct root for shared jail when the source storage is also …
6d8de96
…a jail
Signed-off-by: Robin Appelman <robin@icewind.nl>
@icewind1991icewind1991 added the 3. to review Waiting for reviews label Nov 28, 2017
@icewind1991icewind1991 added this to the Nextcloud 12.0.4 milestone Nov 28, 2017
@codecov

codecovBot commented Nov 28, 2017•
edited
Loading

Copy link
Copy Markdown

Codecov Report

Merging #7323 into stable12 will increase coverage by 0.06%.
The diff coverage is 91.42%.

@@ Coverage Diff @@## stable12 #7323 +/- ##
==============================================
+ Coverage 53.86% 53.93% +0.06% - Complexity 22596 22699 +103 
==============================================
Files 1384 1384 Lines 86671 86953 +282 Branches 1329 1330 +1 ==============================================
+ Hits 46684 46894 +210 - Misses 39987 40059 +72
Impacted FilesCoverage ΔComplexity Δ
lib/private/Files/Cache/Wrapper/CacheJail.php88.37% <100%> (+0.27%)39 <1> (+1)⬆️
lib/private/Files/Storage/Wrapper/Jail.php91.15% <71.42%> (+10.01%)53 <2> (+2)⬆️
apps/files_sharing/lib/Cache.php89.23% <94.11%> (+2.19%)25 <8> (+4)⬆️
...ib/private/DB/QueryBuilder/CompositeExpression.php50% <0%> (-12.5%)6% <0%> (+3%)
lib/private/URLGenerator.php67.01% <0%> (-4.05%)64% <0%> (ø)
apps/files_external/lib/Command/ListCommand.php37.76% <0%> (-2.91%)37% <0%> (-2%)
lib/private/Group/MetaData.php68.91% <0%> (-1.86%)19% <0%> (ø)
lib/autoloader.php79.62% <0%> (-1.63%)27% <0%> (+12%)
lib/private/Diagnostics/Query.php36.84% <0%> (-1.62%)8% <0%> (+2%)
lib/private/Files/Cache/Propagator.php94.93% <0%> (-1.27%)16% <0%> (ø)
... and 39 more

@icewind1991
delay calculating the shared cache root until it's used
4144580
Signed-off-by: Robin Appelman <robin@icewind.nl>
@icewind1991

icewind1991 commented Dec 4, 2017

Copy link
Copy Markdown
MemberAuthor

Added #7385 to fix the performance regression

rullzer
rullzer approved these changes Dec 6, 2017
View reviewed changes

@rullzerrullzer 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.

Yes please

@icewind1991icewind1991 mentioned this pull request Dec 6, 2017
Closed
This was referenced Dec 8, 2017
Merged
Merged
MorrisJobke
MorrisJobke approved these changes Dec 8, 2017
View reviewed changes

@MorrisJobkeMorrisJobke 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.

Tested and works 👍

@MorrisJobke
MorrisJobke merged commit 5dd15c4 into stable12Dec 8, 2017
@MorrisJobke
MorrisJobke deleted the shared-jailed-source-root-12 branch December 8, 2017 08:03
@MorrisJobkeMorrisJobke mentioned this pull request Jan 8, 2018
Merged
13 tasks
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@rullzerrullzerrullzer approved these changes
@MorrisJobkeMorrisJobkeMorrisJobke approved these changes
@nickvergessennickvergessenAwaiting requested review from nickvergessen

Assignees

No one assigned

Labels

3. to reviewWaiting for reviews

Projects

None yet

Milestone

Nextcloud 12.0.5

Development

Successfully merging this pull request may close these issues.

3 participants

@icewind1991@rullzer@MorrisJobke