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

fix: fix aborted handling of batchUpdateAsync #421

Merged
merged 1 commit into from
Sep 11, 2020
Merged

fix: fix aborted handling of batchUpdateAsync #421

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
25 changes: 15 additions & 10 deletions google-cloud-spanner/src/main/java/com/google/cloud/spanner/TransactionRunnerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -540,7 +540,7 @@ public ApiFuture<long[]> batchUpdateAsync(Iterable<Statement> statements) {
decreaseAsyncOperations();
throw t;
}
final ApiFuture<long[]> updateCounts =
ApiFuture<long[]> updateCounts =
ApiFutures.transform(
response,
new ApiFunction<ExecuteBatchDmlResponse, long[]>() {
Expand All @@ -565,19 +565,24 @@ public long[] apply(ExecuteBatchDmlResponse input) {
}
},
MoreExecutors.directExecutor());
updateCounts =
ApiFutures.catching(
updateCounts,
Throwable.class,
new ApiFunction<Throwable, long[]>() {
@Override
public long[] apply(Throwable input) {
SpannerException e = SpannerExceptionFactory.newSpannerException(input);
onError(e);
throw e;
}
},
MoreExecutors.directExecutor());
updateCounts.addListener(
new Runnable() {
@Override
public void run() {
try {
updateCounts.get();
} catch (ExecutionException e) {
onError(SpannerExceptionFactory.newSpannerException(e.getCause()));
} catch (InterruptedException e) {
onError(SpannerExceptionFactory.propagateInterrupt(e));
} finally {
decreaseAsyncOperations();
}
decreaseAsyncOperations();
}
},
MoreExecutors.directExecutor());
Expand Down
41 changes: 41 additions & 0 deletions google-cloud-spanner/src/test/java/com/google/cloud/spanner/AsyncTransactionManagerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -733,6 +733,47 @@ public ApiFuture<long[]> apply(TransactionContext txn, Void input)
CommitRequest.class);
}

@Test
public void asyncTransactionManagerBatchUpdateAbortedBeforeFirstStatement() throws Exception {
final AtomicInteger attempt = new AtomicInteger();
try (AsyncTransactionManager mgr = clientWithEmptySessionPool().transactionManagerAsync()) {
TransactionContextFuture txn = mgr.beginAsync();
while (true) {
try {
txn.then(
new AsyncTransactionFunction<Void, long[]>() {
@Override
public ApiFuture<long[]> apply(TransactionContext txn, Void input)
throws Exception {
if (attempt.incrementAndGet() == 1) {
mockSpanner.abortTransaction(txn);
}
return txn.batchUpdateAsync(
ImmutableList.of(UPDATE_STATEMENT, UPDATE_STATEMENT));
}
},
executor)
.commitAsync()
.get();
break;
} catch (AbortedException e) {
txn = mgr.resetForRetryAsync();
}
}
}
assertThat(attempt.get()).isEqualTo(2);
// There should only be 1 CommitRequest, as the first attempt should abort already after the
// ExecuteBatchDmlRequest.
assertThat(mockSpanner.getRequestTypes())
.containsExactly(
BatchCreateSessionsRequest.class,
BeginTransactionRequest.class,
ExecuteBatchDmlRequest.class,
BeginTransactionRequest.class,
ExecuteBatchDmlRequest.class,
CommitRequest.class);
}

@Test
public void asyncTransactionManagerWithBatchUpdateCommitAborted() throws Exception {
try (AsyncTransactionManager mgr = clientWithEmptySessionPool().transactionManagerAsync()) {
Expand Down