crdb: better max retry errors (especially with retries disabled)

authzed · Sep 18, 2023 · 8ba5930 · 8ba5930
1 parent f8cda78
commit 8ba5930
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/internal/datastore/crdb/pool/pool.go b/internal/datastore/crdb/pool/pool.go
@@ -309,7 +309,7 @@ func (p *RetryPool) withRetries(ctx context.Context, fn func(conn *pgxpool.Conn)
 		log.Ctx(ctx).Warn().Err(err).Uint8("retries", retries).Msg("error is not resettable or retryable")
 		return err
 	}
-	return &MaxRetryError{MaxRetries: p.maxRetries, LastErr: err}
+	return &MaxRetryError{MaxRetries: maxRetries, LastErr: err}
 }
 
 // GC marks a connection for destruction on the next Acquire.

diff --git a/internal/datastore/crdb/pool/slqerrors.go b/internal/datastore/crdb/pool/slqerrors.go
@@ -2,7 +2,7 @@ package pool
 
 import (
 	"errors"
-	"strconv"
+	"fmt"
 
 	"github.com/jackc/pgx/v5/pgconn"
 )
@@ -27,8 +27,12 @@ type MaxRetryError struct {
 }
 
 func (e *MaxRetryError) Error() string {
-	return strconv.Itoa(int(e.MaxRetries)) + "max retries reached" + ": " + e.LastErr.Error()
+	if e.MaxRetries == 0 {
+		return "retries disabled: " + e.LastErr.Error()
+	}
+	return fmt.Sprintf("max retries reached (%d): %s", e.MaxRetries, e.LastErr.Error())
 }
+
 func (e *MaxRetryError) Unwrap() error { return e.LastErr }
 
 // ResettableError is an error that we think may succeed if retried against a new connection.