JakeHillion/storj
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

satellite/dbx: only retry with cockroach

Browse Source 
Change-Id: Id3630c26dbfda36dcbece2849e2353d5ab2882af
This commit is contained in:
JT Olio 2020-11-29 16:03:26 -07:00
parent bd23d12bb9
commit 71e11b27f3
3 changed files with 26 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
satellite/satellitedb/dbx/gen.go
View File

@ -31,7 +31,12 @@ func init() {
}
return class.Wrap(e)
}
ShouldRetry = cockroachutil.NeedsRetry
ShouldRetry = func(driver string, err error) bool {
if driver == "pgxcockroach" || driver == "cockroach" {
return cockroachutil.NeedsRetry(err)
}
return false
}
}
// Unwrap returns the underlying error.

14
satellite/satellitedb/dbx/satellitedb.dbx.go
View File

@ -32,7 +32,7 @@ var _ sync.Mutex
var (
WrapErr = func(err *Error) error { return err }
Logger func(format string, args ...interface{})
ShouldRetry func(err error) bool
ShouldRetry func(driver string, err error) bool
errTooManyRows = errors.New("too many rows")
errUnsupportedDriver = errors.New("unsupported driver")
@ -90,11 +90,11 @@ func makeErr(err error) error {
return wrapErr(e)
}
func shouldRetry(err error) bool {
func shouldRetry(driver string, err error) bool {
if ShouldRetry == nil {
return false
}
return ShouldRetry(err)
return ShouldRetry(driver, err)
}
func unsupportedDriver(driver string) error {
@ -146,6 +146,8 @@ type DB struct {
Hooks struct {
Now func() time.Time
}
driver string
}
func Open(driver, source string) (db *DB, err error) {
@ -173,6 +175,8 @@ func Open(driver, source string) (db *DB, err error) {
db = &DB{
DB: tagsql.Wrap(sql_db),
driver: driver,
}
db.Hooks.Now = time.Now
@ -267,7 +271,7 @@ func (obj *pgxImpl) makeErr(err error) error {
}
func (obj *pgxImpl) shouldRetry(err error) bool {
return !obj.txn && shouldRetry(err)
return !obj.txn && shouldRetry(obj.db.driver, err)
}
type pgxImpl_retryingRow struct {
@ -825,7 +829,7 @@ func (obj *pgxcockroachImpl) makeErr(err error) error {
}
func (obj *pgxcockroachImpl) shouldRetry(err error) bool {
return !obj.txn && shouldRetry(err)
return !obj.txn && shouldRetry(obj.db.driver, err)
}
type pgxcockroachImpl_retryingRow struct {

16
satellite/satellitedb/dbx/templates/golang.header.tmpl
View File

@ -32,7 +32,7 @@ var _ sync.Mutex
var (
WrapErr = func(err *Error) error {return err}
Logger func(format string, args ...interface{})
ShouldRetry func(err error) bool
ShouldRetry func(driver string, err error) bool
errTooManyRows = errors.New("too many rows")
errUnsupportedDriver = errors.New("unsupported driver")
@ -90,9 +90,11 @@ func makeErr(err error) error {
return wrapErr(e)
}
func shouldRetry(err error) bool {
if ShouldRetry == nil { return false }
return ShouldRetry(err)
func shouldRetry(driver string, err error) bool {
if ShouldRetry == nil {
return false
}
return ShouldRetry(driver, err)
}
func unsupportedDriver(driver string) error {
@ -144,6 +146,8 @@ type DB struct {
Hooks struct {
Now func() time.Time
}
driver string
}
func Open(driver, source string) (db *DB, err error) {
@ -171,6 +175,8 @@ func Open(driver, source string) (db *DB, err error) {
db = &DB{
DB: sql_db,
driver: driver,
}
db.Hooks.Now = time.Now
@ -271,7 +277,7 @@ func (obj *{{ $impltype }}) makeErr(err error) error {
}
func (obj *{{ $impltype }}) shouldRetry(err error) bool {
return !obj.txn && shouldRetry(err)
return !obj.txn && shouldRetry(obj.db.driver, err)
}
type {{ $impltype }}_retryingRow struct {