[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>

1 files changed, 11 insertions, 11 deletions

diff --git a/internal/db/bundb/tombstone.go b/internal/db/bundb/tombstone.go
index 668bde1af..0050e6531 100644
--- a/internal/db/bundb/tombstone.go
+++ b/internal/db/bundb/tombstone.go
@@ -27,28 +27,28 @@ import (
 )
 
 type tombstoneDB struct {
-	conn  *DBConn
+	db    *WrappedDB
 	state *state.State
 }
 
-func (t *tombstoneDB) GetTombstoneByURI(ctx context.Context, uri string) (*gtsmodel.Tombstone, db.Error) {
+func (t *tombstoneDB) GetTombstoneByURI(ctx context.Context, uri string) (*gtsmodel.Tombstone, error) {
 	return t.state.Caches.GTS.Tombstone().Load("URI", func() (*gtsmodel.Tombstone, error) {
 		var tomb gtsmodel.Tombstone
 
-		q := t.conn.
+		q := t.db.
 			NewSelect().
 			Model(&tomb).
 			Where("? = ?", bun.Ident("tombstone.uri"), uri)
 
 		if err := q.Scan(ctx); err != nil {
-			return nil, t.conn.ProcessError(err)
+			return nil, t.db.ProcessError(err)
 		}
 
 		return &tomb, nil
 	}, uri)
 }
 
-func (t *tombstoneDB) TombstoneExistsWithURI(ctx context.Context, uri string) (bool, db.Error) {
+func (t *tombstoneDB) TombstoneExistsWithURI(ctx context.Context, uri string) (bool, error) {
 	tomb, err := t.GetTombstoneByURI(ctx, uri)
 	if err == db.ErrNoEntries {
 		err = nil
@@ -56,23 +56,23 @@ func (t *tombstoneDB) TombstoneExistsWithURI(ctx context.Context, uri string) (b
 	return (tomb != nil), err
 }
 
-func (t *tombstoneDB) PutTombstone(ctx context.Context, tombstone *gtsmodel.Tombstone) db.Error {
+func (t *tombstoneDB) PutTombstone(ctx context.Context, tombstone *gtsmodel.Tombstone) error {
 	return t.state.Caches.GTS.Tombstone().Store(tombstone, func() error {
-		_, err := t.conn.
+		_, err := t.db.
 			NewInsert().
 			Model(tombstone).
 			Exec(ctx)
-		return t.conn.ProcessError(err)
+		return t.db.ProcessError(err)
 	})
 }
 
-func (t *tombstoneDB) DeleteTombstone(ctx context.Context, id string) db.Error {
+func (t *tombstoneDB) DeleteTombstone(ctx context.Context, id string) error {
 	defer t.state.Caches.GTS.Tombstone().Invalidate("ID", id)
 
 	// Delete tombstone from DB.
-	_, err := t.conn.NewDelete().
+	_, err := t.db.NewDelete().
 		TableExpr("? AS ?", bun.Ident("tombstones"), bun.Ident("tombstone")).
 		Where("? = ?", bun.Ident("tombstone.id"), id).
 		Exec(ctx)
-	return t.conn.ProcessError(err)
+	return t.db.ProcessError(err)
 }