From e325bfe6c3e0859e7ef0236b1b9f16ab11c9f5fe Mon Sep 17 00:00:00 2001 From: Mathieu Fenniak Date: Sat, 14 Feb 2026 22:34:09 +0100 Subject: [PATCH] fix: improve SQLite "database is locked" errors by increasing default `SQLITE_TIMEOUT` (take 2) (#11292) Increase the default `SQLITE_TIMEOUT` from 500ms to 60s. In #11179 this was bumped up to 5s. But when that was backported to v14 in #11220, it failed consistently in CI through a couple increases, until it was bumped up further to 60s. This PR updates the `forgejo` branch to the same so that in the future when Forgejo 15 is released, it isn't regressed. `test-sqlite` has been failing on `forgejo` occasionally as well, so this increase is justified on this branch for this reason as well. Putting aside the tests, I think a high value for the timeout (this 60s) is generally safer for production usage than a small timeout. The worst case with a high timeout is a slow request when there is high write contention on the DB. ## 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... - [ ] 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. - **Will update** the documentation for the default value if approved. - [ ] 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. *The decision if the pull request will be shown in the release notes is up to the mergers / release team.* The content of the `release-notes/.md` file will serve as the basis for the release notes. If the file does not exist, the title of the pull request will be used instead. ## Release notes - Other changes without a feature or bug label - [PR](https://codeberg.org/forgejo/forgejo/pulls/11292): improve SQLite "database is locked" errors by increasing default `SQLITE_TIMEOUT` (take 2) Co-authored-by: forgejo-backport-action Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/11292 Reviewed-by: Michael Kriese --- modules/setting/database.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/setting/database.go b/modules/setting/database.go index 0a5661543a..4299044d1f 100644 --- a/modules/setting/database.go +++ b/modules/setting/database.go @@ -86,7 +86,7 @@ func loadDBSetting(rootCfg ConfigProvider) { Database.CharsetCollation = sec.Key("CHARSET_COLLATION").String() Database.Path = sec.Key("PATH").MustString(filepath.Join(AppDataPath, "forgejo.db")) - Database.Timeout = sec.Key("SQLITE_TIMEOUT").MustInt(5000) + Database.Timeout = sec.Key("SQLITE_TIMEOUT").MustInt(60000) Database.SQLiteJournalMode = sec.Key("SQLITE_JOURNAL_MODE").MustString("WAL") Database.MaxIdleConns = sec.Key("MAX_IDLE_CONNS").MustInt(2)