Skip to content

fix: Stop trash expiry once a folder is back under its quota #5055

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

Open
solracsf wants to merge 1 commit into
base: master
Choose a base branch
from
+29 −3
Open

fix: Stop trash expiry once a folder is back under its quota #5055

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions lib/Trash/TrashBackend.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -656,7 +656,7 @@ public function expire(Expiration $expiration): array {
$sizeInTrash += $node->getSize();
}

$size = $folder->rootCacheEntry->getSize();
$folderSize = $folder->rootCacheEntry->getSize();

foreach ($trashItems as $groupTrashItem) {
$nodeName = $groupTrashItem['name'] . '.d' . $groupTrashItem['deleted_time'];
Expand All @@ -666,7 +666,7 @@ public function expire(Expiration $expiration): array {

$node = $nodes[$nodeName];

if ($expiration->isExpired($groupTrashItem['deleted_time'], $folder->quota > 0 && $folder->quota < ($size + $sizeInTrash))) {
if ($expiration->isExpired($groupTrashItem['deleted_time'], $folder->quota > 0 && $folder->quota < ($folderSize + $sizeInTrash))) {
$this->logger->debug('expiring ' . $node->getPath());
if (!$this->unlinkTrashNode($node)) {
$this->logger->error('Failed to remove item from trashbin: ' . $node->getPath());
Expand All @@ -676,7 +676,7 @@ public function expire(Expiration $expiration): array {
// only count up after checking if removal is possible
$count += 1;
$size += $node->getSize();
$size -= $node->getSize();
$sizeInTrash -= $node->getSize();
$node->getStorage()->getCache()->remove($node->getInternalPath());
$this->trashManager->removeItem($folderId, $groupTrashItem['name'], $groupTrashItem['deleted_time']);
if (!is_null($groupTrashItem['file_id']) && !is_null($this->versionsBackend)) {
Expand Down
26 changes: 26 additions & 0 deletions tests/Trash/TrashBackendTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -485,4 +485,30 @@ public function testRemoveItemWithMissingTrashFile(): void {

$this->logout();
}

public function testExpireStopsOnceBackUnderQuota(): void {
$this->loginAsUser('manager');

foreach (['a.txt', 'b.txt', 'c.txt'] as $name) {
$file = $this->managerUserFolder->newFile("{$this->folderName}/$name", str_repeat('x', 100));
$this->trashBackend->moveToTrash($file->getStorage(), $file->getInternalPath());
}

$this->assertCount(3, $this->trashManager->listTrashForFolders([$this->folderId]));

// over quota by less than one trash item, so expiring a single item is enough
$folderSize = $this->folderManager->getAllFoldersWithSize()[$this->folderId]->rootCacheEntry->getSize();
$this->folderManager->setFolderQuota($this->folderId, (int)$folderSize + 250);

$expiration = $this->createMock(Expiration::class);
$expiration->method('isExpired')->willReturnCallback(fn (int $timestamp, bool $quotaExceeded): bool => $quotaExceeded);

[$count, $size] = $this->trashBackend->expire($expiration);

$this->assertSame(1, $count);
$this->assertSame(100, $size);
$this->assertCount(2, $this->trashManager->listTrashForFolders([$this->folderId]));

$this->logout();
}
}
Loading