diff options
| author |  kim <89579420+NyaaaWhatsUpDoc@users.noreply.github.com> | 2023-07-25 09:34:05 +0100 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2023-07-25 10:34:05 +0200 |
| commit | 5f3e0957179eddd088e82b8f8f493164cbc9ce37 (patch) | |
| tree | b169630ef1ac269dc96d74b533f6663dc0f1e6fc /internal/db/bundb/errors.go | |
| parent | [feature/performance] support uncaching remote emoji + scheduled cleanup func... (diff) | |
| download | gotosocial-5f3e0957179eddd088e82b8f8f493164cbc9ce37.tar.xz | |
[performance] retry db queries on busy errors (#2025)
* catch SQLITE_BUSY errors, wrap bun.DB to use our own busy retrier, remove unnecessary db.Error type
Signed-off-by: kim <grufwub@gmail.com>
* remove dead code
Signed-off-by: kim <grufwub@gmail.com>
* remove more dead code, add missing error arguments
Signed-off-by: kim <grufwub@gmail.com>
* update sqlite to use maxOpenConns()
Signed-off-by: kim <grufwub@gmail.com>
* add uncommitted changes
Signed-off-by: kim <grufwub@gmail.com>
* use direct calls-through for the ConnIface to make sure we don't double query hook
Signed-off-by: kim <grufwub@gmail.com>
* expose underlying bun.DB better
Signed-off-by: kim <grufwub@gmail.com>
* retry on the correct busy error
Signed-off-by: kim <grufwub@gmail.com>
* use longer possible maxRetries for db retry-backoff
Signed-off-by: kim <grufwub@gmail.com>
* remove the note regarding max-open-conns only applying to postgres
Signed-off-by: kim <grufwub@gmail.com>
* improved code commenting
Signed-off-by: kim <grufwub@gmail.com>
* remove unnecessary infof call (just use info)
Signed-off-by: kim <grufwub@gmail.com>
* rename DBConn to WrappedDB to better follow sql package name conventions
Signed-off-by: kim <grufwub@gmail.com>
* update test error string checks
Signed-off-by: kim <grufwub@gmail.com>
* shush linter
Signed-off-by: kim <grufwub@gmail.com>
* update backoff logic to be more transparent
Signed-off-by: kim <grufwub@gmail.com>
---------
Signed-off-by: kim <grufwub@gmail.com>
Diffstat (limited to 'internal/db/bundb/errors.go')
| -rw-r--r-- | internal/db/bundb/errors.go | 24 |
1 files changed, 17 insertions, 7 deletions
diff --git a/internal/db/bundb/errors.go b/internal/db/bundb/errors.go index 6236b82d8..6bec8edae 100644 --- a/internal/db/bundb/errors.go +++ b/internal/db/bundb/errors.go @@ -18,14 +18,20 @@ package bundb import ( + "errors" + "github.com/jackc/pgconn" "github.com/superseriousbusiness/gotosocial/internal/db" "modernc.org/sqlite" sqlite3 "modernc.org/sqlite/lib" ) +// errBusy is a sentinel error indicating +// busy database (e.g. retry needed). +var errBusy = errors.New("busy") + // processPostgresError processes an error, replacing any postgres specific errors with our own error type -func processPostgresError(err error) db.Error { +func processPostgresError(err error) error { // Attempt to cast as postgres pgErr, ok := err.(*pgconn.PgError) if !ok { @@ -34,16 +40,16 @@ func processPostgresError(err error) db.Error { // Handle supplied error code: // (https://www.postgresql.org/docs/10/errcodes-appendix.html) - switch pgErr.Code { + switch pgErr.Code { //nolint case "23505" /* unique_violation */ : return db.ErrAlreadyExists - default: - return err } + + return err } // processSQLiteError processes an error, replacing any sqlite specific errors with our own error type -func processSQLiteError(err error) db.Error { +func processSQLiteError(err error) error { // Attempt to cast as sqlite sqliteErr, ok := err.(*sqlite.Error) if !ok { @@ -55,7 +61,11 @@ func processSQLiteError(err error) db.Error { case sqlite3.SQLITE_CONSTRAINT_UNIQUE, sqlite3.SQLITE_CONSTRAINT_PRIMARYKEY: return db.ErrAlreadyExists - default: - return err + case sqlite3.SQLITE_BUSY: + return errBusy + case sqlite3.SQLITE_BUSY_TIMEOUT: + return db.ErrBusyTimeout } + + return err } |