Skip to content

Clear cached app config while waiting for the SCSSCache lock to return - #23478

Merged
MorrisJobke merged 1 commit into
masterfrom
fix/21059/fix-deadlock-in-scsscacher
Oct 16, 2020
Merged

Clear cached app config while waiting for the SCSSCache lock to return#23478
MorrisJobke merged 1 commit into
masterfrom
fix/21059/fix-deadlock-in-scsscacher

Conversation

@MorrisJobke

@MorrisJobkeMorrisJobke commented Oct 15, 2020•
edited
Loading

Copy link
Copy Markdown
Member

This should fix the issue described in #15794 (comment) and shown by @kesselb in #21059 (comment)

If this is not cleared then the while loop in

server/lib/private/Template/SCSSCacher.php

Line 167 in 4fd9fa0

if (!$this->variablesChanged() && $this->isCached($fileNameCSS, $app)) {
will never evaluate to true and thus is the same as before the lock got released.

Part of the series around the SCSSCache: #23488#23490

@MorrisJobkeMorrisJobke added this to the Nextcloud 21 milestone Oct 15, 2020
juliusknorr
juliusknorr reviewed Oct 15, 2020
View reviewed changes
Comment threadlib/private/Template/SCSSCacher.php Outdated
juliusknorr
juliusknorr reviewed Oct 15, 2020
View reviewed changes
Comment threadlib/public/IConfig.php Outdated
@MorrisJobkeMorrisJobke mentioned this pull request Oct 15, 2020
Closed
@MorrisJobke
MorrisJobkeforce-pushed the fix/21059/fix-deadlock-in-scsscacher branch from 4fd9fa0 to 0c9d6daCompareOctober 15, 2020 14:25
juliusknorr
juliusknorr approved these changes Oct 15, 2020
View reviewed changes

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

Makes sense as discussed 👍

ChristophWurst
ChristophWurst reviewed Oct 15, 2020
View reviewed changes
Comment threadlib/private/Template/SCSSCacher.php Outdated
@MorrisJobke
MorrisJobkeforce-pushed the fix/21059/fix-deadlock-in-scsscacher branch from 0c9d6da to 74c5b0cCompareOctober 15, 2020 21:59
@MorrisJobkeMorrisJobke mentioned this pull request Oct 15, 2020
Merged
@MorrisJobke

MorrisJobke commented Oct 15, 2020

Copy link
Copy Markdown
MemberAuthor

/backport to stable20

@MorrisJobke

MorrisJobke commented Oct 15, 2020

Copy link
Copy Markdown
MemberAuthor

/backport to stable19

@MorrisJobke

MorrisJobke commented Oct 15, 2020

Copy link
Copy Markdown
MemberAuthor

/backport to stable18

@MorrisJobkeMorrisJobke mentioned this pull request Oct 15, 2020
Merged
@MorrisJobke
MorrisJobkeforce-pushed the fix/21059/fix-deadlock-in-scsscacher branch from 74c5b0c to fc547e5CompareOctober 16, 2020 08:11
@MorrisJobke

MorrisJobke commented Oct 16, 2020

Copy link
Copy Markdown
MemberAuthor

Rebased to fix the conflicts with #23490

@MorrisJobkeMorrisJobke added 4. to release Ready to be released and/or waiting for tests to finish and removed 3. to review Waiting for reviews labels Oct 16, 2020
@MorrisJobke
Clear cached app config while waiting for the SCSSCache to finish pro…
cce716f
…cessing the file
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
@MorrisJobke
MorrisJobkeforce-pushed the fix/21059/fix-deadlock-in-scsscacher branch from fc547e5 to cce716fCompareOctober 16, 2020 11:28
@MorrisJobke

MorrisJobke commented Oct 16, 2020

Copy link
Copy Markdown
MemberAuthor

Green CI.

@MorrisJobke
MorrisJobke merged commit 4bf891f into masterOct 16, 2020
@MorrisJobke
MorrisJobke deleted the fix/21059/fix-deadlock-in-scsscacher branch October 16, 2020 12:56
This was referenced Oct 16, 2020
Merged
Merged
Merged
@juliusknorrjuliusknorr mentioned this pull request Nov 19, 2020
Closed
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@ChristophWurstChristophWurstChristophWurst approved these changes
@juliusknorrjuliusknorrjuliusknorr approved these changes
@skjnldsvskjnldsvskjnldsv approved these changes
@nickvergessennickvergessenAwaiting requested review from nickvergessen
@kesselbkesselbAwaiting requested review from kesselb

Assignees

No one assigned

Labels

4. to releaseReady to be released and/or waiting for tests to finishbug

Projects

None yet

Milestone

Nextcloud 21

Development

Successfully merging this pull request may close these issues.

4 participants

@MorrisJobke@ChristophWurst@juliusknorr@skjnldsv