---

nithinsujir · chingor13 · commit 50236318f5dc · 2018-12-05T13:04:32.000-08:00
yaml --- r: 15743 b: refs/heads/autosynth-dialogflow c: 90f8c98 h: refs/heads/master i: 15741: 9f31124 15739: 1c6811a 15735: 861fdd7 15727: 8a6d600 15711: 47ebf6d 15679: 0c4fd23 15615: 20d461f
diff --git a/[refs] b/[refs]
@@ -130,7 +130,7 @@ refs/heads/autosynth-bigtable: 2fbcb15847e0e89e79d6dc07420e28d7dfcea894
 refs/heads/autosynth-bigtable-admin: 6379a2bc712f2736c83de0e009b4d26da4fa82ca
 refs/heads/autosynth-containeranalysis: 039ca5b8db725c76c16a965ff26b2774322b8ef8
 refs/heads/autosynth-datastore: 9acd400b484d6691a080c9152a331d88d24fefc1
-refs/heads/autosynth-dialogflow: 97b1efc4cd24639d84cab1de244bc03fb23e2a3e
+refs/heads/autosynth-dialogflow: 90f8c98e5720186cc24e01ce1d427ee235312416
 refs/heads/autosynth-errorreporting: 3d0566d6bebcc187f148bbed463b5a8e75b1edf6
 refs/heads/autosynth-firestore: 92b27fbc8855c9902168695abb0a8f1f433b750b
 refs/heads/autosynth-iot: 9d732be07d99843d8cb53d34ec0837328a807fce
diff --git a/branches/autosynth-dialogflow/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/SpannerImpl.java b/branches/autosynth-dialogflow/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-dialogflow/google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITDMLTest.java b/branches/autosynth-dialogflow/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);
