fix: Stop infinite loop in ExpireTrash#55290
Merged
AndyScherzinger merged 1 commit intomasterfrom Sep 25, 2025
Merged
Conversation
Signed-off-by: Marcel Müller <marcel-mueller@gmx.de>
solracsf
approved these changes
Sep 24, 2025
Member
|
/backport to stable32 |
|
The backport to # Switch to the target branch and update it
git checkout stable32
git pull origin stable32
# Create the new backport branch
git checkout -b backport/55290/stable32
# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts, resolve them
git cherry-pick 58440bfc
# Push the cherry pick commit to the remote repository and open a pull request
git push origin backport/55290/stable32Error: Failed to push branch backport/55290/stable32: remote: {"auth_status":"auth_error","body":"Invalid username or token. Password authentication is not supported for Git operations."} Learn more about backports at https://docs.nextcloud.com/server/stable/go.php?to=developer-backports. |
Member
|
/backport to stable32 |
Member
|
Since the original PR was backported to 31 and 30, should this be backported too (to 31 at least) ? |
Contributor
Author
|
/backport to stable31 |
Contributor
Author
|
/backport to stable30 |
Contributor
Author
|
/backport to stable31 |
8 tasks
Merged
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
After updating to NC32, I noticed that cronjobs would not end anymore. Checking the DB revealed:
There seems to be no exit condition, so we loop over all users for 30 minutes. From the mysql log:
The original PR is about parallel runs, we might need a different check in that case, not totally sure.
Checklist
3. to review, feature component)stable32)