mirror of
https://github.com/lightningnetwork/lnd.git
synced 2025-11-10 06:07:16 +01:00
kvdb+sqldb: update SQL error parsing to account for non wrapped errs
Some sub-systems like btcwallet will return an error from the database, but they won't properly wrap it. As a result, we were unable to actually catch the serialization errors in the first place. To work around this, we'll now attempt to parse the error string directly.
This commit is contained in:
committed by
Andras Banki-Horvath
parent
43f4b14c28
commit
329fcc6498
@@ -5,6 +5,7 @@ package sqlbase
|
||||
import (
|
||||
"errors"
|
||||
"fmt"
|
||||
"strings"
|
||||
|
||||
"github.com/jackc/pgconn"
|
||||
"github.com/jackc/pgerrcode"
|
||||
@@ -13,6 +14,19 @@ import (
|
||||
// parsePostgresError attempts to parse a postgres error as a database agnostic
|
||||
// SQL error.
|
||||
func parsePostgresError(err error) error {
|
||||
if err == nil {
|
||||
return nil
|
||||
}
|
||||
|
||||
// Sometimes the error won't be properly wrapped, so we'll need to
|
||||
// inspect raw error itself to detect something we can wrap properly.
|
||||
const postgresErrMsg = "could not serialize access"
|
||||
if strings.Contains(err.Error(), postgresErrMsg) {
|
||||
return &ErrSerializationError{
|
||||
DBError: err,
|
||||
}
|
||||
}
|
||||
|
||||
var pqErr *pgconn.PgError
|
||||
if !errors.As(err, &pqErr) {
|
||||
return nil
|
||||
|
||||
@@ -5,6 +5,7 @@ package sqlbase
|
||||
import (
|
||||
"errors"
|
||||
"fmt"
|
||||
"strings"
|
||||
|
||||
"modernc.org/sqlite"
|
||||
sqlite3 "modernc.org/sqlite/lib"
|
||||
@@ -13,6 +14,21 @@ import (
|
||||
// parseSqliteError attempts to parse a sqlite error as a database agnostic
|
||||
// SQL error.
|
||||
func parseSqliteError(err error) error {
|
||||
if err == nil {
|
||||
return nil
|
||||
}
|
||||
|
||||
// If the error isn't wrapped properly, the errors.As call with fail,
|
||||
// so we'll also try to check the expected error message directly.
|
||||
// This is taken from:
|
||||
// https://gitlab.com/cznic/sqlite/-/blob/v1.25.0/sqlite.go#L75.
|
||||
const sqliteErrMsg = "SQLITE_BUSY"
|
||||
if strings.Contains(err.Error(), sqliteErrMsg) {
|
||||
return &ErrSerializationError{
|
||||
DBError: err,
|
||||
}
|
||||
}
|
||||
|
||||
var sqliteErr *sqlite.Error
|
||||
if !errors.As(err, &sqliteErr) {
|
||||
return nil
|
||||
|
||||
Reference in New Issue
Block a user