[performance] cache domains after max retries in transport (#884)

This commit is contained in:
kim 2022-10-08 12:50:16 +01:00 committed by GitHub
parent 3bb45b7179
commit e58a6a2da3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 37 additions and 10 deletions

View file

@ -51,7 +51,8 @@ type controller struct {
fedDB federatingdb.DB fedDB federatingdb.DB
clock pub.Clock clock pub.Clock
client pub.HttpClient client pub.HttpClient
cache cache.Cache[string, *transport] trspCache cache.Cache[string, *transport]
badHosts cache.Cache[string, struct{}]
userAgent string userAgent string
} }
@ -66,13 +67,20 @@ func NewController(db db.DB, federatingDB federatingdb.DB, clock pub.Clock, clie
fedDB: federatingDB, fedDB: federatingDB,
clock: clock, clock: clock,
client: client, client: client,
cache: cache.New[string, *transport](), trspCache: cache.New[string, *transport](),
badHosts: cache.New[string, struct{}](),
userAgent: fmt.Sprintf("%s; %s (gofed/activity gotosocial-%s)", applicationName, host, version), userAgent: fmt.Sprintf("%s; %s (gofed/activity gotosocial-%s)", applicationName, host, version),
} }
// Transport cache has TTL=1hr freq=1m // Transport cache has TTL=1hr freq=1min
c.cache.SetTTL(time.Hour, false) c.trspCache.SetTTL(time.Hour, false)
if !c.cache.Start(time.Minute) { if !c.trspCache.Start(time.Minute) {
log.Panic("failed to start transport controller cache")
}
// Bad hosts cache has TTL=15min freq=1min
c.badHosts.SetTTL(15*time.Minute, false)
if !c.badHosts.Start(time.Minute) {
log.Panic("failed to start transport controller cache") log.Panic("failed to start transport controller cache")
} }
@ -89,7 +97,7 @@ func (c *controller) NewTransport(pubKeyID string, privkey *rsa.PrivateKey) (Tra
pubStr := privkeyToPublicStr(privkey) pubStr := privkeyToPublicStr(privkey)
// First check for cached transport // First check for cached transport
transp, ok := c.cache.Get(pubStr) transp, ok := c.trspCache.Get(pubStr)
if ok { if ok {
return transp, nil return transp, nil
} }
@ -102,13 +110,13 @@ func (c *controller) NewTransport(pubKeyID string, privkey *rsa.PrivateKey) (Tra
} }
// Cache this transport under pubkey // Cache this transport under pubkey
if !c.cache.Put(pubStr, transp) { if !c.trspCache.Put(pubStr, transp) {
var cached *transport var cached *transport
cached, ok = c.cache.Get(pubStr) cached, ok = c.trspCache.Get(pubStr)
if !ok { if !ok {
// Some ridiculous race cond. // Some ridiculous race cond.
c.cache.Set(pubStr, transp) c.trspCache.Set(pubStr, transp)
} else { } else {
// Use already cached // Use already cached
transp = cached transp = cached

View file

@ -88,7 +88,23 @@ func (t *transport) POST(r *http.Request, body []byte, retryOn ...int) (*http.Re
func (t *transport) do(r *http.Request, signer func(*http.Request) error, retryOn ...int) (*http.Response, error) { func (t *transport) do(r *http.Request, signer func(*http.Request) error, retryOn ...int) (*http.Response, error) {
const maxRetries = 5 const maxRetries = 5
backoff := time.Second * 2
var (
// Initial backoff duration
backoff = 2 * time.Second
// Get request hostname
host = r.URL.Hostname()
)
// Check if recently reached max retries for this host
// so we don't need to bother reattempting it. The only
// errors that are retried upon are server failure and
// domain resolution type errors, so this cached result
// indicates this server is likely having issues.
if t.controller.badHosts.Has(host) {
return nil, errors.New("too many failed attempts")
}
// Start a log entry for this request // Start a log entry for this request
l := log.WithFields(kv.Fields{ l := log.WithFields(kv.Fields{
@ -155,6 +171,9 @@ func (t *transport) do(r *http.Request, signer func(*http.Request) error, retryO
} }
} }
// Add "bad" entry for this host
t.controller.badHosts.Set(host, struct{}{})
return nil, errors.New("transport reached max retries") return nil, errors.New("transport reached max retries")
} }