owen/gitocean
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: reduce deadlocks merging PRs w/ async milestone stat recalcs (#9916)

Browse Source 
Continuing the pattern from #9868, fixes another deadlock discovered in synthetic testing of #9785.  This modifies the `milestone` table to have the `num_issues`, `num_closed_issues`, and `completeness` statistics be calculated asynchronously.

An optional `updateTimestamp` field was added to the stats queue to support the conditional updating of the milestone's modification date, retaining existing functionality.

## Checklist

The [contributor guide](https://forgejo.org/docs/next/contributor/) contains information that will be helpful to first time contributors. There also are a few [conditions for merging Pull Requests in Forgejo repositories](https://codeberg.org/forgejo/governance/src/branch/main/PullRequestsAgreement.md). You are also welcome to join the [Forgejo development chatroom](https://matrix.to/#/#forgejo-development:matrix.org).

### Tests

- I added test coverage for Go changes...
  - [x] in their respective `*_test.go` for unit tests.
  - [ ] in the `tests/integration` directory if it involves interactions with a live Forgejo server.
- I added test coverage for JavaScript changes...
  - [ ] in `web_src/js/*.test.js` if it can be unit tested.
  - [ ] in `tests/e2e/*.test.e2e.js` if it requires interactions with a live Forgejo server (see also the [developer guide for JavaScript testing](https://codeberg.org/forgejo/forgejo/src/branch/forgejo/tests/e2e/README.md#end-to-end-tests)).

### Documentation

- [ ] I created a pull request [to the documentation](https://codeberg.org/forgejo/docs) to explain to Forgejo users how to use this change.
- [x] I did not document these changes and I do not expect someone else to do it.

### Release notes

- [ ] I do not want this change to show in the release notes.
- [x] I want the title to show in the release notes with a link to this pull request.
- [ ] I want the content of the `release-notes/<pull request number>.md` to be be used for the release notes instead of the title.

Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/9916
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
Co-authored-by: Mathieu Fenniak <mathieu@fenniak.net>
Co-committed-by: Mathieu Fenniak <mathieu@fenniak.net>
This commit is contained in:
Mathieu Fenniak
2025-10-31 15:53:45 +01:00
committed by Mathieu Fenniak
parent 0869e0e08a
commit 327cdc1787
14 changed files with 196 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files
services/issue/issue.go
+2 -1
View File
@@ -23,6 +23,7 @@ import (
"forgejo.org/modules/storage"
"forgejo.org/modules/timeutil"
notify_service "forgejo.org/services/notify"
"forgejo.org/services/stats"
)
// NewIssue creates new issue with labels for repository.
@@ -303,7 +304,7 @@ func deleteIssue(ctx context.Context, issue *issues_model.Issue) error {
}
}
if err := issues_model.UpdateMilestoneCounters(ctx, issue.MilestoneID); err != nil {
if err := stats.QueueRecalcMilestoneByID(issue.MilestoneID); err != nil {
return fmt.Errorf("error updating counters for milestone id %d: %w",
issue.MilestoneID, err)
}
services/issue/milestone.go
+3 -2
View File
@@ -12,6 +12,7 @@ import (
issues_model "forgejo.org/models/issues"
user_model "forgejo.org/models/user"
notify_service "forgejo.org/services/notify"
"forgejo.org/services/stats"
)
func updateMilestoneCounters(ctx context.Context, issue *issues_model.Issue, id int64) error {
@@ -29,11 +30,11 @@ func updateMilestoneCounters(ctx context.Context, issue *issues_model.Issue, id
if issue.UpdatedUnix > updatedUnix {
updatedUnix = issue.UpdatedUnix
}
if err := issues_model.UpdateMilestoneCountersWithDate(ctx, id, updatedUnix); err != nil {
if err := stats.QueueRecalcMilestoneByIDWithDate(id, updatedUnix); err != nil {
return err
}
} else {
if err := issues_model.UpdateMilestoneCounters(ctx, id); err != nil {
if err := stats.QueueRecalcMilestoneByID(id); err != nil {
return err
}
}