Skip to content

Conversation

@backportbot
Copy link

@backportbot backportbot bot commented May 21, 2025

Backport of #52825

Warning, This backport's changes differ from the original and might be incomplete ⚠️

Todo

  • Review and resolve any conflicts
  • Amend HEAD commit to remove the line stating to skip CI

Learn more about backports at https://docs.nextcloud.com/server/stable/go.php?to=developer-backports.

@backportbot backportbot bot requested a review from artonge May 21, 2025 08:06
@backportbot backportbot bot added enhancement 3. to review Waiting for reviews feature: trashbin php Pull requests that update Php code labels May 21, 2025
@backportbot backportbot bot added this to the Nextcloud 30.0.12 milestone May 21, 2025
@artonge artonge force-pushed the backport/52825/stable30 branch 2 times, most recently from 75b1cd1 to 6b71353 Compare May 21, 2025 08:20
@artonge artonge marked this pull request as ready for review May 21, 2025 08:21
@backportbot backportbot bot force-pushed the backport/52825/stable30 branch from 6b71353 to 0d622c9 Compare May 21, 2025 09:30
@artonge artonge force-pushed the backport/52825/stable30 branch 2 times, most recently from 75ebc60 to 1f2fc25 Compare May 21, 2025 09:42
@artonge artonge marked this pull request as draft May 22, 2025 08:26
@skjnldsv skjnldsv added the ♻️ refactor Refactor code (not a bug fix, not a feature just refactoring) label Aug 19, 2025
@AndyScherzinger
Copy link
Member

@artonge merge?

@artonge artonge marked this pull request as ready for review August 28, 2025 08:06
@artonge artonge force-pushed the backport/52825/stable30 branch 3 times, most recently from 56e4db0 to 8e8c280 Compare August 28, 2025 08:17
@artonge artonge marked this pull request as draft August 28, 2025 15:45
@backportbot backportbot bot force-pushed the backport/52825/stable30 branch from 8e8c280 to 907cc5c Compare September 9, 2025 08:27
@artonge artonge force-pushed the backport/52825/stable30 branch from 907cc5c to dddf105 Compare September 9, 2025 14:20
@artonge artonge marked this pull request as ready for review September 9, 2025 14:21

}

private function resetOffset() {

Check notice

Code scanning / Psalm

MissingReturnType Note

Method OCA\Files_Trashbin\BackgroundJob\ExpireTrash::resetOffset does not have a return type, expecting void
});
}

private function runMutexOperation($operation): mixed {

Check notice

Code scanning / Psalm

MissingParamType Note

Parameter $operation has no provided type
@nextcloud-bot nextcloud-bot mentioned this pull request Sep 10, 2025
16 tasks
@artonge artonge force-pushed the backport/52825/stable30 branch from dddf105 to 10aa280 Compare September 11, 2025 09:53
@AndyScherzinger AndyScherzinger removed this from the Nextcloud 30.0.15 milestone Sep 11, 2025
Signed-off-by: Louis Chemineau <louis@chmn.me>
…lel run

- Follow-up of #51600

The original PR introduced the possibility to continue an `ExpireTrash` job by saving the offset. This was to prevent having to start over the whole user list when the job crashed or was killed.

But on big instances, one process is not enough to go through all the users in a timely manner. Supporting parallel run allows covering more ground faster.

This PR introduced this possibility. We are now storing the offset right away to allow another parallel job to pick up the task at that point. We are arbitrarily cutting the user list in chunk of 10 to not drastically overflow the 30 minutes time limit.

Signed-off-by: Louis Chemineau <louis@chmn.me>
@artonge artonge force-pushed the backport/52825/stable30 branch from 10aa280 to 1f464b2 Compare September 11, 2025 14:10
@artonge artonge merged commit 9f7316a into stable30 Sep 15, 2025
187 of 193 checks passed
@artonge artonge deleted the backport/52825/stable30 branch September 15, 2025 07:47
@AndyScherzinger AndyScherzinger added this to the Nextcloud 30.0.16 milestone Sep 18, 2025
@nextcloud-bot nextcloud-bot mentioned this pull request Sep 25, 2025
2 tasks
@blizzz blizzz mentioned this pull request Oct 14, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

3. to review Waiting for reviews enhancement feature: trashbin php Pull requests that update Php code ♻️ refactor Refactor code (not a bug fix, not a feature just refactoring)

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants