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.

Sign up for GitHub

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

Jump to bottom

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

Merged
merged 1 commit into from
Oct 16, 2020
Merged

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

merged 1 commit into from
Oct 16, 2020

Conversation

MorrisJobke
Copy link
Member

@MorrisJobke MorrisJobke commented Oct 15, 2020 •
edited
Loading

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

@MorrisJobke MorrisJobke added this to the Nextcloud 21 milestone Oct 15, 2020
juliusknorr
juliusknorr reviewed Oct 15, 2020
View reviewed changes
@MorrisJobke MorrisJobke mentioned this pull request Oct 15, 2020
Closed
@MorrisJobke MorrisJobke force-pushed the fix/21059/fix-deadlock-in-scsscacher branch from 4fd9fa0 to 0c9d6da Compare October 15, 2020 14:25
juliusknorr
juliusknorr approved these changes Oct 15, 2020
View reviewed changes
Copy link
Member

@juliusknorr juliusknorr left a comment

Choose a reason for hiding this comment

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

Makes sense as discussed 👍

@MorrisJobke MorrisJobke force-pushed the fix/21059/fix-deadlock-in-scsscacher branch from 0c9d6da to 74c5b0c Compare October 15, 2020 21:59
@MorrisJobke MorrisJobke requested a review from kesselb October 15, 2020 22:01
@MorrisJobke MorrisJobke mentioned this pull request Oct 15, 2020
Merged
@MorrisJobke
Copy link
Member Author

/backport to stable20

@MorrisJobke
Copy link
Member Author

/backport to stable19

@MorrisJobke
Copy link
Member Author

/backport to stable18

@MorrisJobke MorrisJobke mentioned this pull request Oct 15, 2020
Merged
@MorrisJobke MorrisJobke force-pushed the fix/21059/fix-deadlock-in-scsscacher branch from 74c5b0c to fc547e5 Compare October 16, 2020 08:11
@MorrisJobke
Copy link
Member Author

Rebased to fix the conflicts with #23490

@MorrisJobke MorrisJobke 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 MorrisJobke force-pushed the fix/21059/fix-deadlock-in-scsscacher branch from fc547e5 to cce716f Compare October 16, 2020 11:28
@MorrisJobke
Copy link
Member Author

Green CI.

@MorrisJobke MorrisJobke merged commit 4bf891f into master Oct 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
@juliusknorr juliusknorr mentioned this pull request Nov 19, 2020
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ChristophWurst ChristophWurst ChristophWurst approved these changes

@juliusknorr juliusknorr juliusknorr approved these changes

@skjnldsv skjnldsv skjnldsv approved these changes

@nickvergessen nickvergessen Awaiting requested review from nickvergessen

@kesselb kesselb Awaiting requested review from kesselb

Assignees
No one assigned
Labels
4. to release Ready to be released and/or waiting for tests to finish bug
Projects
None yet
Milestone
Nextcloud 21
Development

Successfully merging this pull request may close these issues.
4 participants
@MorrisJobke @ChristophWurst @juliusknorr @skjnldsv