Skip to content

Commit

Permalink
fix
Browse files Browse the repository at this point in the history
  • Loading branch information
@asmyasnikov
asmyasnikov committed Feb 4, 2025
1 parent 55aa1c0 commit da9f66b
Show file tree
Hide file tree
Showing 5 changed files with 48 additions and 38 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
* Added nodeID and address to operation and transport errors

## v3.99.4
* Fixed bug with wrong context on session closing
* Fixed goroutine leak on closing `database/sql` driver
Expand Down
29 changes: 1 addition & 28 deletions internal/conn/errors.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,33 +39,6 @@ func IsBadConn(err error, goodConnCodes ...grpcCodes.Code) bool {
return true
}

type grpcError struct {
err error

nodeID uint32
address string
}

func (e *grpcError) Error() string {
return e.err.Error()
}

func (e *grpcError) As(target any) bool {
return xerrors.As(e.err, target)
}

func (e *grpcError) NodeID() uint32 {
return e.nodeID
}

func (e *grpcError) Address() string {
return e.address
}

func withConnInfo(err error, nodeID uint32, address string) error {
return &grpcError{
err: err,
nodeID: nodeID,
address: address,
}
return xerrors.Transport(err, xerrors.WithNodeID(nodeID), xerrors.WithAddress(address))
}
10 changes: 5 additions & 5 deletions internal/conn/errors_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,19 +109,19 @@ func TestIsBadConn(t *testing.T) {
}
}

func TestGrpcError(t *testing.T) {
err := withConnInfo(grpcStatus.Error(grpcCodes.Unavailable, "test"), 123, "test:123")
require.Equal(t, `rpc error: code = Unavailable desc = test`, err.Error())
func TestWithConnInfo(t *testing.T) {
err := withConnInfo(grpcStatus.Error(grpcCodes.Unavailable, "test"), 100500, "example.com:2135")
require.ErrorIs(t, err, grpcStatus.Error(grpcCodes.Unavailable, "test"))
var nodeID interface {
NodeID() uint32
}
require.ErrorAs(t, err, &nodeID)
require.Equal(t, uint32(123), nodeID.NodeID())
require.Equal(t, uint32(100500), nodeID.NodeID())
var address interface {
Address() string
}
require.ErrorAs(t, err, &address)
require.Equal(t, "test:123", address.Address())
require.Equal(t, "example.com:2135", address.Address())
s, has := grpcStatus.FromError(err)
require.True(t, has)
require.Equal(t, grpcCodes.Unavailable, s.Code())
Expand Down
33 changes: 30 additions & 3 deletions internal/xerrors/operation_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,24 +7,30 @@ import (
"github.com/stretchr/testify/require"
"github.com/ydb-platform/ydb-go-genproto/protos/Ydb"
"github.com/ydb-platform/ydb-go-genproto/protos/Ydb_Issue"

"github.com/ydb-platform/ydb-go-sdk/v3/internal/xtest"
)

func TestIsOperationError(t *testing.T) {
for _, tt := range []struct {
name string
err error
codes []Ydb.StatusIds_StatusCode
match bool
}{
// check only operation error with any ydb status code
{
name: xtest.CurrentFileLine(),
err: &operationError{code: Ydb.StatusIds_BAD_REQUEST},
match: true,
},
{
name: xtest.CurrentFileLine(),
err: fmt.Errorf("wrapped: %w", &operationError{code: Ydb.StatusIds_BAD_REQUEST}),
match: true,
},
{
name: xtest.CurrentFileLine(),
err: Join(
fmt.Errorf("test"),
&operationError{code: Ydb.StatusIds_BAD_REQUEST},
Expand All @@ -34,16 +40,19 @@ func TestIsOperationError(t *testing.T) {
},
// match ydb status code
{
name: xtest.CurrentFileLine(),
err: &operationError{code: Ydb.StatusIds_BAD_REQUEST},
codes: []Ydb.StatusIds_StatusCode{Ydb.StatusIds_BAD_REQUEST},
match: true,
},
{
name: xtest.CurrentFileLine(),
err: fmt.Errorf("wrapped: %w", &operationError{code: Ydb.StatusIds_BAD_REQUEST}),
codes: []Ydb.StatusIds_StatusCode{Ydb.StatusIds_BAD_REQUEST},
match: true,
},
{
name: xtest.CurrentFileLine(),
err: Join(
fmt.Errorf("test"),
&operationError{code: Ydb.StatusIds_BAD_REQUEST},
Expand All @@ -54,16 +63,19 @@ func TestIsOperationError(t *testing.T) {
},
// no match ydb status code
{
name: xtest.CurrentFileLine(),
err: &operationError{code: Ydb.StatusIds_BAD_REQUEST},
codes: []Ydb.StatusIds_StatusCode{Ydb.StatusIds_ABORTED},
match: false,
},
{
name: xtest.CurrentFileLine(),
err: fmt.Errorf("wrapped: %w", &operationError{code: Ydb.StatusIds_BAD_REQUEST}),
codes: []Ydb.StatusIds_StatusCode{Ydb.StatusIds_ABORTED},
match: false,
},
{
name: xtest.CurrentFileLine(),
err: Join(
fmt.Errorf("test"),
&operationError{code: Ydb.StatusIds_BAD_REQUEST},
Expand All @@ -73,18 +85,20 @@ func TestIsOperationError(t *testing.T) {
match: false,
},
} {
t.Run("", func(t *testing.T) {
t.Run(tt.name, func(t *testing.T) {
require.Equal(t, tt.match, IsOperationError(tt.err, tt.codes...))
})
}
}

func TestIsOperationErrorTransactionLocksInvalidated(t *testing.T) {
for _, tt := range [...]struct {
name string
err error
isTLI bool
}{
{
name: xtest.CurrentFileLine(),
err: Operation(
WithStatusCode(Ydb.StatusIds_ABORTED),
WithIssues([]*Ydb_Issue.IssueMessage{{
Expand All @@ -94,6 +108,7 @@ func TestIsOperationErrorTransactionLocksInvalidated(t *testing.T) {
isTLI: true,
},
{
name: xtest.CurrentFileLine(),
err: Operation(
WithStatusCode(Ydb.StatusIds_OVERLOADED),
WithIssues([]*Ydb_Issue.IssueMessage{{
Expand All @@ -103,12 +118,14 @@ func TestIsOperationErrorTransactionLocksInvalidated(t *testing.T) {
isTLI: false,
},
{
name: xtest.CurrentFileLine(),
err: Operation(
WithStatusCode(Ydb.StatusIds_ABORTED),
),
isTLI: false,
},
{
name: xtest.CurrentFileLine(),
err: Operation(
WithStatusCode(Ydb.StatusIds_ABORTED),
WithIssues([]*Ydb_Issue.IssueMessage{{
Expand All @@ -120,30 +137,40 @@ func TestIsOperationErrorTransactionLocksInvalidated(t *testing.T) {
isTLI: true,
},
} {
t.Run("", func(t *testing.T) {
t.Run(tt.name, func(t *testing.T) {
require.Equal(t, tt.isTLI, IsOperationErrorTransactionLocksInvalidated(tt.err))
})
}
}

func Test_operationError_Error(t *testing.T) {
for _, tt := range []struct {
name string
err error
text string
}{
{
name: xtest.CurrentFileLine(),
err: Operation(WithStatusCode(Ydb.StatusIds_BAD_REQUEST), WithAddress("localhost")),
text: "operation/BAD_REQUEST (code = 400010, address = localhost)",
},
{
name: xtest.CurrentFileLine(),
err: Operation(WithStatusCode(Ydb.StatusIds_BAD_REQUEST), WithNodeID(100500)),
text: "operation/BAD_REQUEST (code = 400010, nodeID = 100500)",
},
{
name: xtest.CurrentFileLine(),
err: Operation(WithStatusCode(Ydb.StatusIds_BAD_REQUEST)),
text: "operation/BAD_REQUEST (code = 400010)",
},
{
name: xtest.CurrentFileLine(),
err: Operation(WithStatusCode(Ydb.StatusIds_BAD_SESSION)),
text: "operation/BAD_SESSION (code = 400100)",
},
{
name: xtest.CurrentFileLine(),
err: Operation(WithStatusCode(Ydb.StatusIds_PRECONDITION_FAILED), WithIssues([]*Ydb_Issue.IssueMessage{
{
Message: "issue one",
Expand Down Expand Up @@ -177,7 +204,7 @@ func Test_operationError_Error(t *testing.T) {
text: "operation/PRECONDITION_FAILED (code = 400120, issues = [{15:3 => #1 'issue one'},{#2 'issue two' [{test.yql:16:4 => #3 'issue three'},{#4 'issue four'}]}])", //nolint:lll
},
} {
t.Run("", func(t *testing.T) {
t.Run(tt.name, func(t *testing.T) {
require.Equal(t, tt.text, tt.err.Error())
})
}
Expand Down
12 changes: 10 additions & 2 deletions internal/xerrors/transport_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -145,19 +145,27 @@ func TestGrpcError(t *testing.T) {

func TestTransportErrorString(t *testing.T) {
for _, tt := range []struct {
name string
err error
text string
}{
{
name: xtest.CurrentFileLine(),
err: Transport(grpcStatus.Error(grpcCodes.FailedPrecondition, "")),
text: "transport/FailedPrecondition (code = 9, source error = \"rpc error: code = FailedPrecondition desc = \")",
},
{
name: xtest.CurrentFileLine(),
err: Transport(grpcStatus.Error(grpcCodes.Unavailable, ""), WithAddress("localhost:2135")),
text: "transport/Unavailable (code = 14, source error = \"rpc error: code = Unavailable desc = \", address: \"localhost:2135\")", //nolint:lll
},
{
name: xtest.CurrentFileLine(),
err: Transport(grpcStatus.Error(grpcCodes.Unavailable, ""), WithNodeID(100500)),
text: "transport/Unavailable (code = 14, source error = \"rpc error: code = Unavailable desc = \", nodeID = 100500)", //nolint:lll
},
} {
t.Run("", func(t *testing.T) {
t.Run(tt.name, func(t *testing.T) {
require.Equal(t, tt.text, tt.err.Error())
})
}
Expand Down Expand Up @@ -189,7 +197,7 @@ func TestTransportErrorName(t *testing.T) {
name: "transport/Aborted",
},
} {
t.Run("", func(t *testing.T) {
t.Run(tt.name, func(t *testing.T) {
if tt.err == nil {
require.Nil(t, TransportError(tt.err)) //nolint:testifylint
} else {
Expand Down

0 comments on commit da9f66b

Please sign in to comment.