Skip to content

Retry on resource exhausted. #2179

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
mairbek wants to merge 1 commit into from
Closed

Retry on resource exhausted. #2179

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
2 changes: 2 additions & 0 deletions google-cloud-spanner/src/main/java/com/google/cloud/spanner/SpannerExceptionFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,8 @@ private static boolean isRetryable(ErrorCode code, @Nullable Throwable cause) {
return hasCauseMatching(cause, Matchers.isRetryableInternalError);
case UNAVAILABLE:
return true;
case RESOURCE_EXHAUSTED:
return true;
default:
return false;
}
Expand Down
3 changes: 2 additions & 1 deletion google-cloud-spanner/src/main/java/com/google/cloud/spanner/SpannerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1284,7 +1284,8 @@ TransactionSelector getTransactionSelector() {

@Override
public void onError(SpannerException e) {
if (e.getErrorCode() == ErrorCode.ABORTED) {
if (e.getErrorCode() == ErrorCode.ABORTED
|| e.getErrorCode() == ErrorCode.RESOURCE_EXHAUSTED) {
long delay = -1L;
if (e instanceof AbortedException) {
delay = ((AbortedException) e).getRetryDelayInMillis();
Expand Down
8 changes: 8 additions & 0 deletions google-cloud-spanner/src/test/java/com/google/cloud/spanner/TransactionRunnerImplTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,14 @@ public void runAbortNoRetryInfo() {
assertThat(backoffMillis.getValue()).isGreaterThan(0L);
}

@Test
public void runResourceExhausted() {
runTransaction(new StatusRuntimeException(Status.fromCodeValue(Status.Code.RESOURCE_EXHAUSTED.value())));
ArgumentCaptor<Long> backoffMillis = ArgumentCaptor.forClass(Long.class);
verify(sleeper, times(1)).backoffSleep(Mockito.<Context>any(), backoffMillis.capture());
assertThat(backoffMillis.getValue()).isGreaterThan(0L);
}

@Test
public void commitAbort() {
final SpannerException error =
Expand Down