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/instance.go | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'internal/db/instance.go') diff --git a/internal/db/instance.go b/internal/db/instance.go index ab40c7a82..408522b65 100644 --- a/internal/db/instance.go +++ b/internal/db/instance.go @@ -26,16 +26,16 @@ import ( // Instance contains functions for instance-level actions (counting instance users etc.). type Instance interface { // CountInstanceUsers returns the number of known accounts registered with the given domain. - CountInstanceUsers(ctx context.Context, domain string) (int, Error) + CountInstanceUsers(ctx context.Context, domain string) (int, error) // CountInstanceStatuses returns the number of known statuses posted from the given domain. - CountInstanceStatuses(ctx context.Context, domain string) (int, Error) + CountInstanceStatuses(ctx context.Context, domain string) (int, error) // CountInstanceDomains returns the number of known instances known that the given domain federates with. - CountInstanceDomains(ctx context.Context, domain string) (int, Error) + CountInstanceDomains(ctx context.Context, domain string) (int, error) // GetInstance returns the instance entry for the given domain, if it exists. - GetInstance(ctx context.Context, domain string) (*gtsmodel.Instance, Error) + GetInstance(ctx context.Context, domain string) (*gtsmodel.Instance, error) // GetInstanceByID returns the instance entry corresponding to the given id, if it exists. GetInstanceByID(ctx context.Context, id string) (*gtsmodel.Instance, error) @@ -47,12 +47,12 @@ type Instance interface { UpdateInstance(ctx context.Context, instance *gtsmodel.Instance, columns ...string) error // GetInstanceAccounts returns a slice of accounts from the given instance, arranged by ID. - GetInstanceAccounts(ctx context.Context, domain string, maxID string, limit int) ([]*gtsmodel.Account, Error) + GetInstanceAccounts(ctx context.Context, domain string, maxID string, limit int) ([]*gtsmodel.Account, error) // GetInstancePeers returns a slice of instances that the host instance knows about. - GetInstancePeers(ctx context.Context, includeSuspended bool) ([]*gtsmodel.Instance, Error) + GetInstancePeers(ctx context.Context, includeSuspended bool) ([]*gtsmodel.Instance, error) // GetInstanceModeratorAddresses returns a slice of email addresses belonging to active // (as in, not suspended) moderators + admins on this instance. - GetInstanceModeratorAddresses(ctx context.Context) ([]string, Error) + GetInstanceModeratorAddresses(ctx context.Context) ([]string, error) } -- cgit v1.2.3