Skip to content

Try rehydrating NamespaceNotActive from Unavailable errors #188

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
bergundy wants to merge 1 commit into from
Closed

Try rehydrating NamespaceNotActive from Unavailable errors #188

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 10 additions & 1 deletion serviceerror/convert.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,14 @@ func FromStatus(st *status.Status) error {
case codes.Canceled:
return newCanceled(st)
case codes.Unavailable:
return newUnavailable(st)
switch errDetails := errDetails.(type) {
case *errordetails.NamespaceNotActiveFailure:
// We're in the process of changing NamespaceNotActive's status code to Unavailable to ensure it
// is treated as retryable by default. Handle both Unavailable and FailedPrecondition.
return newNamespaceNotActive(st, errDetails)
default:
return newUnavailable(st)
}
case codes.Unimplemented:
return newUnimplemented(st)
case codes.Unknown:
Expand Down Expand Up @@ -157,6 +164,8 @@ func FromStatus(st *status.Status) error {
case codes.FailedPrecondition:
switch errDetails := errDetails.(type) {
case *errordetails.NamespaceNotActiveFailure:
// We're in the process of changing NamespaceNotActive's status code to Unavailable to ensure it
// is treated as retryable by default. Handle both Unavailable and FailedPrecondition.
return newNamespaceNotActive(st, errDetails)
case *errordetails.NamespaceInvalidStateFailure:
return newNamespaceInvalidState(st, errDetails)
Expand Down
16 changes: 16 additions & 0 deletions serviceerror/convert_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,3 +183,19 @@ func TestFromWrapped(t *testing.T) {
&errordetails.PermissionDeniedFailure{Reason: "arbitrary reason"},
s.Details()[0].(*errordetails.PermissionDeniedFailure)))
}

func TestFromStatus_NamespaceNotActive_ConvertableFromFailedPreconditionAndUnavailable(t *testing.T) {
failedPreconditionSt, err := status.New(codes.FailedPrecondition, "some message").WithDetails(&errordetails.NamespaceNotActiveFailure{
Namespace: "test-ns",
})
require.NoError(t, err)
convertedErr := serviceerror.FromStatus(failedPreconditionSt)
require.IsType(t, &serviceerror.NamespaceNotActive{}, convertedErr)

unavailableSt, err := status.New(codes.Unavailable, "some message").WithDetails(&errordetails.NamespaceNotActiveFailure{
Namespace: "test-ns",
})
require.NoError(t, err)
convertedErr = serviceerror.FromStatus(unavailableSt)
require.IsType(t, &serviceerror.NamespaceNotActive{}, convertedErr)
}
1 change: 1 addition & 0 deletions serviceerror/namespace_not_active.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ func (e *NamespaceNotActive) Status() *status.Status {
return e.st
}

// TODO(bergundy): Change to Unavailable after server 1.26 is released.
st := status.New(codes.FailedPrecondition, e.Message)
st, _ = st.WithDetails(
&errordetails.NamespaceNotActiveFailure{
Expand Down
Loading