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/federation/dereferencing/account_test.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'internal/federation') diff --git a/internal/federation/dereferencing/account_test.go b/internal/federation/dereferencing/account_test.go index 71028e342..3b6994f08 100644 --- a/internal/federation/dereferencing/account_test.go +++ b/internal/federation/dereferencing/account_test.go @@ -25,6 +25,7 @@ import ( "github.com/stretchr/testify/suite" "github.com/superseriousbusiness/gotosocial/internal/ap" "github.com/superseriousbusiness/gotosocial/internal/config" + "github.com/superseriousbusiness/gotosocial/internal/db" "github.com/superseriousbusiness/gotosocial/internal/gtserror" "github.com/superseriousbusiness/gotosocial/testrig" ) @@ -175,7 +176,7 @@ func (suite *AccountTestSuite) TestDereferenceLocalAccountWithUnknownUsername() config.GetHost(), ) suite.True(gtserror.Unretrievable(err)) - suite.EqualError(err, "no entries") + suite.EqualError(err, db.ErrNoEntries.Error()) suite.Nil(fetchedAccount) } @@ -189,7 +190,7 @@ func (suite *AccountTestSuite) TestDereferenceLocalAccountWithUnknownUsernameDom "localhost:8080", ) suite.True(gtserror.Unretrievable(err)) - suite.EqualError(err, "no entries") + suite.EqualError(err, db.ErrNoEntries.Error()) suite.Nil(fetchedAccount) } @@ -202,7 +203,7 @@ func (suite *AccountTestSuite) TestDereferenceLocalAccountWithUnknownUserURI() { testrig.URLMustParse("http://localhost:8080/users/thisaccountdoesnotexist"), ) suite.True(gtserror.Unretrievable(err)) - suite.EqualError(err, "no entries") + suite.EqualError(err, db.ErrNoEntries.Error()) suite.Nil(fetchedAccount) } -- cgit v1.3