commit 4ee4cd2da11bc0199ee99a40527e758d394dbc9c
parent b80be48fed03cf5f813f9e44e0bcca5861540956
Author: tobi <31960611+tsmethurst@users.noreply.github.com>
Date: Wed, 1 Feb 2023 11:55:34 +0100
[chore/performance] use only 1 sqlite db connection regardless of multiplier (#1408)
Diffstat:
3 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/docs/configuration/database.md b/docs/configuration/database.md
@@ -128,6 +128,10 @@ db-tls-ca-cert: ""
#
# If you set the multiplier to less than 1, only one open connection will be used regardless of cpu count.
#
+# PLEASE NOTE!!: This setting currently only applies for Postgres. SQLite will always use 1 connection regardless
+# of what is set here. This behavior will change in future when we implement better SQLITE_BUSY handling.
+# See https://github.com/superseriousbusiness/gotosocial/issues/1407 for more details.
+#
# Examples: [16, 8, 10, 2]
# Default: 8
db-max-open-conns-multiplier: 8
diff --git a/example/config.yaml b/example/config.yaml
@@ -184,6 +184,10 @@ db-tls-ca-cert: ""
#
# If you set the multiplier to less than 1, only one open connection will be used regardless of cpu count.
#
+# PLEASE NOTE!!: This setting currently only applies for Postgres. SQLite will always use 1 connection regardless
+# of what is set here. This behavior will change in future when we implement better SQLITE_BUSY handling.
+# See https://github.com/superseriousbusiness/gotosocial/issues/1407 for more details.
+#
# Examples: [16, 8, 10, 2]
# Default: 8
db-max-open-conns-multiplier: 8
diff --git a/internal/db/bundb/bundb.go b/internal/db/bundb/bundb.go
@@ -304,9 +304,9 @@ func sqliteConn(ctx context.Context) (*DBConn, error) {
// Tune db connections for sqlite, see:
// - https://bun.uptrace.dev/guide/running-bun-in-production.html#database-sql
// - https://www.alexedwards.net/blog/configuring-sqldb
- sqldb.SetMaxOpenConns(maxOpenConns()) // x number of conns per cpu
- sqldb.SetMaxIdleConns(1) // only keep max 1 idle connection around
- sqldb.SetConnMaxLifetime(0) // don't kill connections due to age
+ sqldb.SetMaxOpenConns(1) // only 1 connection regardless of multiplier, see https://github.com/superseriousbusiness/gotosocial/issues/1407
+ sqldb.SetMaxIdleConns(1) // only keep max 1 idle connection around
+ sqldb.SetConnMaxLifetime(0) // don't kill connections due to age
// Wrap Bun database conn in our own wrapper
conn := WrapDBConn(bun.NewDB(sqldb, sqlitedialect.New()))
