---

nithinsujir · chingor13 · commit 5601195b7676 · 2018-12-05T13:04:32.000-08:00
yaml --- r: 12567 b: refs/heads/autosynth-automl c: 90f8c98 h: refs/heads/master i: 12565: 5ac0a53 12563: a29d704 12559: ac24f77
diff --git a/[refs] b/[refs]
@@ -123,7 +123,7 @@ refs/heads/spanner: 54a5e197bfe0a004e13c190427f46c3413ab572d
 refs/tags/v0.68.0: 9cc799fcf68c82ab431d425fefa58ef615ce8e5b
 refs/tags/v0.69.0: 78f67a29e8b9c46ba01de566a2eae0fd1c03edea
 refs/heads/autosynth-asset: af3772eb76acbfc401f7c3f9310f09f2b0e17602
-refs/heads/autosynth-automl: 97b1efc4cd24639d84cab1de244bc03fb23e2a3e
+refs/heads/autosynth-automl: 90f8c98e5720186cc24e01ce1d427ee235312416
 refs/heads/autosynth-bigquerydatatransfer: 2a9f3938237f85a8919602d74011326580ff387f
 refs/heads/autosynth-bigquerystorage: 99aee05df348f39d98b6fb23c292006f1d2a6c28
 refs/heads/autosynth-bigtable: cd831a28dff2ba4d733608b871a1523a463e7380
diff --git a/branches/autosynth-automl/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/SpannerImpl.java b/branches/autosynth-automl/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/SpannerImpl.java
@@ -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)));
diff --git a/branches/autosynth-automl/google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITDMLTest.java b/branches/autosynth-automl/google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITDMLTest.java
@@ -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;
@@ -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;
@@ -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 =
@@ -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;
@@ -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");
+    }
+  }
+
   @Test
   public void partitionedDML() {
     executeUpdate(DML_COUNT, INSERT_DML);
