Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
* Fixed checking GRPC transport error in `discovery`

## v3.118.1
* Fixed connection timeout issue in topics writer
* Supported `sql.Null*` from `database/sql` as query params in `toValue` func
Expand Down
4 changes: 3 additions & 1 deletion internal/discovery/discovery.go
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,9 @@ func Discover(

response, err = client.ListEndpoints(ctx, &request)
if err != nil {
return nil, location, xerrors.WithStackTrace(err)
return nil, location, xerrors.WithStackTrace(
xerrors.TransportError(err),
)
}

if response.GetOperation().GetStatus() != Ydb.StatusIds_SUCCESS {
Expand Down
4 changes: 3 additions & 1 deletion internal/discovery/discovery_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import (
"github.com/ydb-platform/ydb-go-sdk/v3/internal/endpoint"
"github.com/ydb-platform/ydb-go-sdk/v3/internal/xerrors"
xtest "github.com/ydb-platform/ydb-go-sdk/v3/pkg/xtest"
"github.com/ydb-platform/ydb-go-sdk/v3/retry"
)

func TestDiscover(t *testing.T) {
Expand Down Expand Up @@ -85,14 +86,15 @@ func TestDiscover(t *testing.T) {
client := NewMockDiscoveryServiceClient(ctrl)
client.EXPECT().ListEndpoints(gomock.Any(), &Ydb_Discovery.ListEndpointsRequest{
Database: "test",
}).Return(nil, xerrors.Transport(status.Error(grpcCodes.Unavailable, "")))
}).Return(nil, status.Error(grpcCodes.Unavailable, ""))
endpoints, location, err := Discover(ctx, client, config.New(
config.WithDatabase("test"),
))
require.Error(t, err)
require.Empty(t, endpoints)
require.Equal(t, "", location)
require.True(t, xerrors.IsTransportError(err, grpcCodes.Unavailable))
require.True(t, retry.Check(err).MustRetry(true), "must retry")
})
t.Run("OperationError", func(t *testing.T) {
ctx := xtest.Context(t)
Expand Down
Loading