---

nithinsujir · chingor13 · commit 3f8bf42a39cb · 2018-12-05T13:04:32.000-08:00
yaml --- r: 17699 b: refs/heads/autosynth-trace c: 90f8c98 h: refs/heads/master i: 17697: d488489 17695: ae80d7a
diff --git a/[refs] b/[refs]
@@ -144,7 +144,7 @@ refs/heads/autosynth-spanner: 9bff86d057df31e04c76d72865e8e073ac5794fb
 refs/heads/autosynth-speech: 75d6c62a9d07d3a3642980502a25d07fbde0f232
 refs/heads/autosynth-tasks: b0cdb991f3f75345151a3f68db1aab273dfc069b
 refs/heads/autosynth-texttospeech: 2dcc5dc22be0f456caa1b6a8a4bcdace2641239c
-refs/heads/autosynth-trace: 97b1efc4cd24639d84cab1de244bc03fb23e2a3e
+refs/heads/autosynth-trace: 90f8c98e5720186cc24e01ce1d427ee235312416
 refs/heads/autosynth-websecurityscanner: d4febbffb6c648b74faec62fe90e20adadc9a7d3
 refs/heads/bigquerystorage: 06db74d123d7f8a3ef48755c2fcabed09faf8e64
 refs/heads/elharo-patch-1: ce159ef828d3c545991ff78e7b6e0d912a9453e9
diff --git a/branches/autosynth-trace/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/SpannerImpl.java b/branches/autosynth-trace/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-trace/google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITDMLTest.java b/branches/autosynth-trace/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);
