Skip to content

[stable25] Fix: Prevent deadlocks during mtime/size/etag propagation #34405

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

Merged
blizzz merged 2 commits into from
Oct 5, 2022
Merged

[stable25] Fix: Prevent deadlocks during mtime/size/etag propagation #34405

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
380aaef
Fix: Prevent deadlocks during mtime/size/etag propagation
Raudius Sep 29, 2022
7ed5679
Fix unencrypted size calculation for files created before the Encrypt…
Raudius Oct 3, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Fix unencrypted size calculation for files created before the Encrypt… 
…ion storage is enabled

Signed-off-by: raul <[email protected]>
  • Loading branch information
@Raudius @backportbot-nextcloud
Raudius authored and backportbot-nextcloud[bot] committed Oct 3, 2022
commit 7ed5679f2c015ea4f1bb5cd9668cee3e145a10c8
2 changes: 1 addition & 1 deletion lib/private/Files/Cache/Propagator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ public function propagateChange($internalPath, $time, $sizeDifference = 0) {
$unencryptedSizeColumn = $builder->getColumnName('unencrypted_size');
$newUnencryptedSize = $builder->func()->greatest(
$builder->func()->add(
$builder->createFunction("CASE WHEN $hasUnencryptedSize THEN $sizeColumn ELSE $unencryptedSizeColumn END"),
$builder->createFunction("CASE WHEN $hasUnencryptedSize THEN $unencryptedSizeColumn ELSE $sizeColumn END"),
$builder->createNamedParameter($sizeDifference)
),
$builder->createNamedParameter(-1, IQueryBuilder::PARAM_INT)
Expand Down