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

Jump to bottom

Spanner: Handle AbortedExceptions that occur before commit #4181

Merged
merged 3 commits into from
Dec 5, 2018
Merged

Spanner: Handle AbortedExceptions that occur before commit #4181

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4f59e28
spanner: Handle AbortedExceptions that occur before commit
nithinsujir Dec 5, 2018
51d8eed
throw before executeUpdate, verify flag is false after test
nithinsujir Dec 5, 2018
09b6bba
Update google-cloud-clients/google-cloud-spanner/src/test/java/com/go…
chingor13 Dec 5, 2018
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: 1 addition & 1 deletion ...loud-clients/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 @@ -1319,7 +1319,7 @@ private <T> T runInternal(TransactionCallable<T> callable) {
shouldRollback = false;
} catch (Exception e) {
txnLogger.log(Level.FINE, "User-provided TransactionCallable raised exception", e);
if (txn.isAborted()) {
if (txn.isAborted() || (e instanceof AbortedException)) {
span.addAnnotation(
"Transaction Attempt Aborted in user operation. Retrying",
ImmutableMap.of("Attempt", AttributeValue.longAttributeValue(attempt)));
Expand Down
21 changes: 21 additions & 0 deletions ...oud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITDMLTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
import static com.google.common.truth.Truth.assertThat;
import static org.junit.Assert.fail;

import com.google.cloud.spanner.AbortedException;
import com.google.cloud.spanner.Database;
import com.google.cloud.spanner.DatabaseClient;
import com.google.cloud.spanner.ErrorCode;
Expand All @@ -30,6 +31,7 @@
import com.google.cloud.spanner.Mutation;
import com.google.cloud.spanner.ResultSet;
import com.google.cloud.spanner.SpannerException;
import com.google.cloud.spanner.SpannerExceptionFactory;
import com.google.cloud.spanner.Statement;
import com.google.cloud.spanner.TimestampBound;
import com.google.cloud.spanner.TransactionContext;
Expand Down Expand Up @@ -59,6 +61,8 @@ public final class ITDMLTest {
private static final String DELETE_DML = "DELETE FROM T WHERE T.K like 'boo%';";
private static final long DML_COUNT = 4;

private static boolean throwAbortOnce = false;

@BeforeClass
public static void setUpDatabase() {
db =
Expand All @@ -82,6 +86,12 @@ private void executeUpdate(long expectedCount, final String... stmts) {
public Long run(TransactionContext transaction) {
long rowCount = 0;
for (String stmt : stmts) {
if (throwAbortOnce) {
throwAbortOnce = false;
throw SpannerExceptionFactory.newSpannerException(
ErrorCode.ABORTED, "Abort in test");
}

rowCount += transaction.executeUpdate(Statement.of(stmt));
}
return rowCount;
Expand All @@ -92,6 +102,17 @@ public Long run(TransactionContext transaction) {
assertThat(rowCount).isEqualTo(expectedCount);
}

@Test
public void abortOnceShouldSucceedAfterRetry() {
try {
throwAbortOnce = true;
executeUpdate(DML_COUNT, INSERT_DML);
assertThat(throwAbortOnce).isFalse();
} catch (AbortedException e) {
fail("Abort Exception not caught and retried");
}
nithinsujir marked this conversation as resolved.
Show resolved Hide resolved
}

@Test
public void partitionedDML() {
executeUpdate(DML_COUNT, INSERT_DML);
Expand Down