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/session.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/session.go')
| -rw-r--r-- | internal/db/bundb/session.go | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/internal/db/bundb/session.go b/internal/db/bundb/session.go index 9a4256de5..8d778ffa2 100644 --- a/internal/db/bundb/session.go +++ b/internal/db/bundb/session.go @@ -22,26 +22,25 @@ import ( "crypto/rand" "io" - "github.com/superseriousbusiness/gotosocial/internal/db" "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" "github.com/superseriousbusiness/gotosocial/internal/id" ) type sessionDB struct { - conn *DBConn + db *WrappedDB } -func (s *sessionDB) GetSession(ctx context.Context) (*gtsmodel.RouterSession, db.Error) { +func (s *sessionDB) GetSession(ctx context.Context) (*gtsmodel.RouterSession, error) { rss := make([]*gtsmodel.RouterSession, 0, 1) // get the first router session in the db or... - if err := s.conn. + if err := s.db. NewSelect(). Model(&rss). Limit(1). Order("router_session.id DESC"). Scan(ctx); err != nil { - return nil, s.conn.ProcessError(err) + return nil, s.db.ProcessError(err) } // ... create a new one @@ -52,7 +51,7 @@ func (s *sessionDB) GetSession(ctx context.Context) (*gtsmodel.RouterSession, db return rss[0], nil } -func (s *sessionDB) createSession(ctx context.Context) (*gtsmodel.RouterSession, db.Error) { +func (s *sessionDB) createSession(ctx context.Context) (*gtsmodel.RouterSession, error) { buf := make([]byte, 64) auth := buf[:32] crypt := buf[32:64] @@ -67,11 +66,11 @@ func (s *sessionDB) createSession(ctx context.Context) (*gtsmodel.RouterSession, Crypt: crypt, } - if _, err := s.conn. + if _, err := s.db. NewInsert(). Model(rs). Exec(ctx); err != nil { - return nil, s.conn.ProcessError(err) + return nil, s.db.ProcessError(err) } return rs, nil |