gitforge/cmd
Mathieu Fenniak 958cface13 fix: terminate git (& other) subcommands gracefully on context timeout/cancellation (#13263)
By default, when you create an `exec.CommandContext` in Go, when the context is cancelled or timed out, Go will SIGKILL the subprocess which does not allow the subprocess to perform any cleanup work.  As some git operations in Forgejo will be linked to the current HTTP context, and the current HTTP context will be closed when the HTTP client disconnects, this can theoretically cause SIGKILLs when locks are being held.

This PR contains two fixes:
- Change the behaviour of all subprocesses that Forgejo creates to use a graceful termination, SIGTERM'ing the process, and then SIGKILL'ing it after a timeout.
- Fixes a bug where previously all subprocesses are setup in a process group (by 1d04e8641d), but they were never *killed* in a process group, preventing child processes from receiving these termination signals.  Both SIGTERM and SIGKILL are sent to the process group.

Introduces new configuration setting which controls subcommand graceful timeouts.  If a subprocess does not shutdown from SIGTERM within `[server].SUBPROCESS_TERMINATE_GRACE` (default 5 seconds), then an error will be logged, and the process will be SIGKILL'd.  The error is:
```
2026/07/01 08:31:20 modules/log/init.go:38:func2() [E] Subprocess pid=3790963 (/nix/store/c0277k5giric1mn9dklllavbzvxl6hzb-git-2.53.0/bin/git blame --porcelain 8ee7e7c32b -- options/locale/locale_en-US.ini) failed to terminate from SIGTERM after grace period 0s, and was sent SIGKILL. The subprocess termination may leave incomplete state on the server, such as lock files. `[server].SUBPROCESS_TERMINATE_GRACE` can be changed to give subprocesses more time to cleanly exit.
```

(This was produced on a live server by setting SUBPROCESS_TERMINATE_GRACE to zero seconds, loading a page that does a `git blame`, and hitting escape in the browser quickly.)

### Tests for Go changes

- 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 ran...
  - [x] `make pr-go` before pushing

### Documentation

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

### Release notes

- [x] This change will be noticed by a Forgejo user or admin (feature, bug fix, performance, etc.). I suggest to include a release note for this change.
- [ ] This change is not visible to a Forgejo user or admin (refactor, dependency upgrade, etc.). I think there is no need to add a release note for this change.

Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/13263
Reviewed-by: Andreas Ahlenstorf <aahlenst@noreply.codeberg.org>
2026-07-01 20:26:02 +02:00
..
forgejo chore(cmd): re-enable nilnil lint (#12489) 2026-05-21 21:45:13 +02:00
actions.go fix!: detect extra cmdline args and emit errors (#9458) 2025-10-08 18:20:28 +02:00
admin.go feat: replace repo based server-side hooks with centralised hooks (#10397) 2026-04-27 22:34:46 +02:00
admin_auth.go fix!: detect extra cmdline args and emit errors (#9458) 2025-10-08 18:20:28 +02:00
admin_auth_ldap.go fix!: detect extra cmdline args and emit errors (#9458) 2025-10-08 18:20:28 +02:00
admin_auth_ldap_test.go chore(upgrade): urfave/cli from v2 to v3 (#8035) 2025-06-01 22:16:37 +02:00
admin_auth_oauth.go feat: add dynamic group mappings for OIDC (#11656) 2026-05-22 12:38:20 +02:00
admin_auth_oauth_test.go feat: add dynamic group mappings for OIDC (#11656) 2026-05-22 12:38:20 +02:00
admin_auth_pam.go feat: allow to add pam source from command line (#10388) 2025-12-19 15:20:52 +01:00
admin_auth_pam_test.go feat: allow to add pam source from command line (#10388) 2025-12-19 15:20:52 +01:00
admin_auth_smtp.go fix: rename a file with typo STMP -> SMTP (#10389) 2025-12-10 14:20:05 +01:00
admin_regenerate.go feat: replace repo based server-side hooks with centralised hooks (#10397) 2026-04-27 22:34:46 +02:00
admin_user.go feat: add CLI command 'admin user create-authorized-integration' (#12299) 2026-04-28 21:32:45 +02:00
admin_user_change_password.go fix!: detect extra cmdline args and emit errors (#9458) 2025-10-08 18:20:28 +02:00
admin_user_create.go feat: backend DB model for fine-grained repo access tokens 2026-02-27 17:17:29 +01:00
admin_user_delete.go fix!: detect extra cmdline args and emit errors (#9458) 2025-10-08 18:20:28 +02:00
admin_user_generate_access_token.go feat: backend DB model for fine-grained repo access tokens 2026-02-27 17:17:29 +01:00
admin_user_generate_authorized_integration.go feat: ability to edit authorized integration in web UI (#12601) 2026-05-17 18:33:39 +02:00
admin_user_list.go fix!: detect extra cmdline args and emit errors (#9458) 2025-10-08 18:20:28 +02:00
admin_user_must_change_password.go chore(upgrade): urfave/cli from v2 to v3 (#8035) 2025-06-01 22:16:37 +02:00
admin_user_reset_mfa.go fix!: detect extra cmdline args and emit errors (#9458) 2025-10-08 18:20:28 +02:00
cert.go chore: add modernizer linter (#11936) 2026-04-02 03:29:37 +02:00
cmd.go chore(cmd): re-enable nilnil lint (#12489) 2026-05-21 21:45:13 +02:00
cmd_test.go chore: use signal.NotifyContext over custom implementation (#10311) 2026-03-04 00:45:38 +01:00
doctor.go chore: remove EXIF stripping capability due to usage of AGPL licensed exif-terminator library (#13105) 2026-06-17 16:16:35 +02:00
doctor_convert.go fix!: detect extra cmdline args and emit errors (#9458) 2025-10-08 18:20:28 +02:00
doctor_test.go chore(upgrade): urfave/cli from v2 to v3 (#8035) 2025-06-01 22:16:37 +02:00
dump.go feat: enable compression on zip dump (#12296) 2026-04-28 02:11:26 +02:00
dump_repo.go chore: add modernizer linter (#11936) 2026-04-02 03:29:37 +02:00
dump_test.go feat: Replace mholt/archiver/v3 with mholt/archives (#7025) 2025-08-08 06:53:20 +02:00
embedded.go chore(upgrade): urfave/cli from v2 to v3 (#8035) 2025-06-01 22:16:37 +02:00
generate.go chore: unify the usage of CryptoRandomString (#10110) 2025-11-15 13:24:53 +01:00
hook.go chore: fix typos throughout the codebase (#10753) 2026-01-26 22:57:33 +01:00
hook_test.go fix: incorrect whitespace handling on pre&post receive hooks 2026-01-06 09:58:20 -07:00
keys.go fix!: detect extra cmdline args and emit errors (#9458) 2025-10-08 18:20:28 +02:00
mailer.go chore: fix typos throughout the codebase (#10753) 2026-01-26 22:57:33 +01:00
main.go Update module github.com/urfave/cli/v3 to v3.7.0 (forgejo) (#11713) 2026-03-18 20:23:38 +01:00
main_test.go feat: replace repo based server-side hooks with centralised hooks (#10397) 2026-04-27 22:34:46 +02:00
manager.go fix!: detect extra cmdline args and emit errors (#9458) 2025-10-08 18:20:28 +02:00
manager_logging.go fix!: detect extra cmdline args and emit errors (#9458) 2025-10-08 18:20:28 +02:00
migrate.go chore: rename 'migrations' to 'gitea_migrations' 2025-10-14 14:40:49 -06:00
migrate_storage.go chore: upgrade to https://code.forgejo.org/xorm/xorm v1.4.0 (#12639) 2026-05-20 20:20:08 +02:00
migrate_storage_test.go Update module github.com/golangci/golangci-lint/cmd/golangci-lint to v2 (forgejo) (#7367) 2025-03-28 22:22:21 +00:00
restore_repo.go fix!: detect extra cmdline args and emit errors (#9458) 2025-10-08 18:20:28 +02:00
serv.go fix: terminate git (& other) subcommands gracefully on context timeout/cancellation (#13263) 2026-07-01 20:26:02 +02:00
web.go chore: don't load settings twice for running web (#12111) 2026-04-14 07:25:05 +02:00
web_acme.go fix: use correct ACME default (#8550) 2025-07-17 20:40:09 +02:00
web_graceful.go chore: branding import path (#7337) 2025-03-27 19:40:14 +00:00
web_https.go chore: branding import path (#7337) 2025-03-27 19:40:14 +00:00