Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Spanner - Respect RetryInfo returned by server error #5558

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

Merged
kolea2 merged 1 commit into from
Jun 25, 2019
Merged

Spanner - Respect RetryInfo returned by server error #5558

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
9 changes: 9 additions & 0 deletions ...ients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/SpannerRetryHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,15 @@ private static class TxRetryAlgorithm<T> implements ResultRetryAlgorithm<T> {
@Override
public TimedAttemptSettings createNextAttempt(
Throwable prevThrowable, T prevResponse, TimedAttemptSettings prevSettings) {
if (prevThrowable != null) {
long retryDelay = SpannerException.extractRetryDelay(prevThrowable);
if (retryDelay > -1L) {
return prevSettings
.toBuilder()
.setRandomizedRetryDelay(Duration.ofMillis(retryDelay))
.build();
}
}
return null;
}

Expand Down
38 changes: 38 additions & 0 deletions ...s/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SpannerRetryHelperTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,16 @@
import static org.junit.Assert.assertThat;
import static org.junit.Assert.fail;

import com.google.common.base.Stopwatch;
import com.google.protobuf.Duration;
import com.google.rpc.RetryInfo;
import io.grpc.Context;
import io.grpc.Context.CancellableContext;
import io.grpc.Deadline;
import io.grpc.Metadata;
import io.grpc.Status;
import io.grpc.StatusRuntimeException;
import io.grpc.protobuf.ProtoUtils;
import java.util.concurrent.Callable;
import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
Expand Down Expand Up @@ -178,4 +185,35 @@ public Integer call() throws Exception {
};
SpannerRetryHelper.runTxWithRetriesOnAborted(callable);
}

@Test
public void testExceptionWithRetryInfo() {
Metadata.Key<RetryInfo> key = ProtoUtils.keyForProto(RetryInfo.getDefaultInstance());
Status status = Status.fromCodeValue(Status.Code.ABORTED.value());
Metadata trailers = new Metadata();
RetryInfo retryInfo =
RetryInfo.newBuilder()
.setRetryDelay(Duration.newBuilder().setNanos(100000000).build())
.build();
trailers.put(key, retryInfo);
final SpannerException e =
SpannerExceptionFactory.newSpannerException(new StatusRuntimeException(status, trailers));
final AtomicInteger attempts = new AtomicInteger();
Callable<Integer> callable =
new Callable<Integer>() {
@Override
public Integer call() throws Exception {
if (attempts.getAndIncrement() == 0) {
throw e;
}
return 1 + 1;
}
};
// The following call should take at least 100ms, as that is the retry delay specified in the
// retry info of the exception.
Stopwatch watch = Stopwatch.createStarted();
assertThat(SpannerRetryHelper.runTxWithRetriesOnAborted(callable), is(equalTo(2)));
long elapsed = watch.elapsed(TimeUnit.MILLISECONDS);
assertThat(elapsed >= 100L, is(true));
}
}