From 5f3e0957179eddd088e82b8f8f493164cbc9ce37 Mon Sep 17 00:00:00 2001 From: kim <89579420+NyaaaWhatsUpDoc@users.noreply.github.com> Date: Tue, 25 Jul 2023 09:34:05 +0100 Subject: [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 * remove dead code Signed-off-by: kim * remove more dead code, add missing error arguments Signed-off-by: kim * update sqlite to use maxOpenConns() Signed-off-by: kim * add uncommitted changes Signed-off-by: kim * use direct calls-through for the ConnIface to make sure we don't double query hook Signed-off-by: kim * expose underlying bun.DB better Signed-off-by: kim * retry on the correct busy error Signed-off-by: kim * use longer possible maxRetries for db retry-backoff Signed-off-by: kim * remove the note regarding max-open-conns only applying to postgres Signed-off-by: kim * improved code commenting Signed-off-by: kim * remove unnecessary infof call (just use info) Signed-off-by: kim * rename DBConn to WrappedDB to better follow sql package name conventions Signed-off-by: kim * update test error string checks Signed-off-by: kim * shush linter Signed-off-by: kim * update backoff logic to be more transparent Signed-off-by: kim --------- Signed-off-by: kim --- internal/db/error.go | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) (limited to 'internal/db/error.go') diff --git a/internal/db/error.go b/internal/db/error.go index 99b8c4c61..b8e488297 100644 --- a/internal/db/error.go +++ b/internal/db/error.go @@ -17,18 +17,20 @@ package db -import "fmt" - -// Error denotes a database error. -type Error error +import ( + "database/sql" + "errors" +) var ( - // ErrNoEntries is returned when a caller expected an entry for a query, but none was found. - ErrNoEntries Error = fmt.Errorf("no entries") - // ErrMultipleEntries is returned when a caller expected ONE entry for a query, but multiples were found. - ErrMultipleEntries Error = fmt.Errorf("multiple entries") + // ErrNoEntries is a direct ptr to sql.ErrNoRows since that is returned regardless + // of DB dialect. It is returned when no rows (entries) can be found for a query. + ErrNoEntries = sql.ErrNoRows + // ErrAlreadyExists is returned when a conflict was encountered in the db when doing an insert. - ErrAlreadyExists Error = fmt.Errorf("already exists") - // ErrUnknown denotes an unknown database error. - ErrUnknown Error = fmt.Errorf("unknown error") + ErrAlreadyExists = errors.New("already exists") + + // ErrBusyTimeout is returned if the database connection indicates the connection is too busy + // to complete the supplied query. This is generally intended to be handled internally by the DB. + ErrBusyTimeout = errors.New("busy timeout") ) -- cgit v1.2.3