Skip to content
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

Auth: Make IOException non retriable #5203

Closed
wants to merge 4 commits into from
Closed

Auth: Make IOException non retriable #5203

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
71e103e
Make IOException non retriable
ajaaym Jan 2, 2019
5dcdf68
fix comment
ajaaym Jan 2, 2019
9aa6695
fix test case
ajaaym Jan 2, 2019
af5181d
fix checkstyle
ajaaym Jan 2, 2019
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
17 changes: 6 additions & 11 deletions auth/src/main/java/io/grpc/auth/GoogleAuthLibraryCallCredentials.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
import io.grpc.SecurityLevel;
import io.grpc.Status;
import io.grpc.StatusException;
import java.io.IOException;
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
Expand Down Expand Up @@ -135,16 +134,12 @@ public void onSuccess(Map<String, List<String>> metadata) {

@Override
public void onFailure(Throwable e) {
if (e instanceof IOException) {
// Since it's an I/O failure, let the call be retried with UNAVAILABLE.
applier.fail(Status.UNAVAILABLE
.withDescription("Credentials failed to obtain metadata")
.withCause(e));
} else {
applier.fail(Status.UNAUTHENTICATED
.withDescription("Failed computing credential metadata")
.withCause(e));
}
// There are so many IOException that are not retriable. Also most of the network based
// operations are retried in their respective library, others are mostly not retriable.
// Also retrying IOException causes more undeterministic behaviour in rpc with retries and
// higher total timeout.
applier.fail(Status.UNAUTHENTICATED.withDescription("Failed computing credential metadata")
.withCause(e));
}
});
}
Expand Down
2 changes: 1 addition & 1 deletion auth/src/test/java/io/grpc/auth/GoogleAuthLibraryCallCredentialsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ public void credentialsFailsWithIoException() throws Exception {
verify(credentials).getRequestMetadata(eq(expectedUri));
verify(applier).fail(statusCaptor.capture());
Status status = statusCaptor.getValue();
assertEquals(Status.Code.UNAVAILABLE, status.getCode());
assertEquals(Status.Code.UNAUTHENTICATED, status.getCode());
assertEquals(exception, status.getCause());
}

Expand Down