Skip to content

Avoid locking on restore/delete and limit concurrent requests #36465

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
juliusknorr merged 3 commits into from
Feb 15, 2023
Merged

Avoid locking on restore/delete and limit concurrent requests #36465

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d925388
fix: Limit trashbin restore/delete to 2 concurrent request to avoid l…
juliusknorr Feb 1, 2023
7f913de
fix(files_trashbin): Remove unnecessary scanner logic when getting ve…
juliusknorr Feb 1, 2023
d662092
Compile assets
nextcloud-command Feb 15, 2023
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
24 changes: 0 additions & 24 deletions apps/files_trashbin/lib/Trashbin.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,13 +68,6 @@ class Trashbin {
// unit: percentage; 50% of available disk space/quota
public const DEFAULTMAXSIZE = 50;

/**
* Whether versions have already be rescanned during this PHP request
*
* @var bool
*/
private static $scannedVersions = false;

/**
* Ensure we don't need to scan the file during the move to trash
* by triggering the scan in the pre-hook
Expand Down Expand Up @@ -980,23 +973,6 @@ private static function getVersionsFromTrash($filename, $timestamp, $user) {
/** @var \OC\Files\Storage\Storage $storage */
[$storage,] = $view->resolvePath('/');

//force rescan of versions, local storage may not have updated the cache
$waitstart = time();
while (!self::$scannedVersions) {
try {
$storage->getScanner()->scan('files_trashbin/versions');
self::$scannedVersions = true;
} catch (LockedException $e) {
/* a concurrent remove/restore from trash occurred,
* retry with a maximum wait time of approx. 15 seconds
*/
if (time() - $waitstart > 15) {
throw $e;
}
usleep(50000 + rand(0, 10000));
}
}

$pattern = \OC::$server->getDatabaseConnection()->escapeLikeParameter(basename($filename));
if ($timestamp) {
// fetch for old versions
Expand Down
24 changes: 12 additions & 12 deletions apps/files_trashbin/src/filelist.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,9 @@
*
*/

// eslint-disable-next-line import/no-unresolved, node/no-missing-import
import PQueue from 'p-queue'

/* eslint-disable */
(function() {
var DELETED_REGEXP = new RegExp(/^(.+)\.d[0-9]+$/)
Expand Down Expand Up @@ -61,6 +64,7 @@
var FileList = function($el, options) {
this.client = options.client
this.initialize($el, options)
this.deleteOperationQueue = new PQueue({ concurrency: 4 })
}
FileList.prototype = _.extend({}, OCA.Files.FileList.prototype,
/** @lends OCA.Trashbin.FileList.prototype */ {
Expand Down Expand Up @@ -185,12 +189,10 @@

this.fileMultiSelectMenu.toggleLoading('restore', true)
var restorePromises = files.map(function(file) {
return self.client.move(OC.joinPaths('trash', self.getCurrentDirectory(), file), OC.joinPaths('restore', file), true)
.then(
function() {
self._removeCallback([file])
}
)
return self.deleteOperationQueue.add(async () => {
self.client.move(OC.joinPaths('trash', self.getCurrentDirectory(), file), OC.joinPaths('restore', file), true)
self._removeCallback([file])
})
})
return Promise.all(restorePromises).then(
function() {
Expand Down Expand Up @@ -226,12 +228,10 @@
} else {
this.fileMultiSelectMenu.toggleLoading('delete', true)
var deletePromises = files.map(function(file) {
return self.client.remove(OC.joinPaths('trash', self.getCurrentDirectory(), file))
.then(
function() {
self._removeCallback([file])
}
)
return self.deleteOperationQueue.add(async () => {
await self.client.remove(OC.joinPaths('trash', self.getCurrentDirectory(), file))
self._removeCallback([file])
})
})
return Promise.all(deletePromises).then(
function() {
Expand Down
Loading