Merge pull request #1235 from mziccard/datastore-aborted

mziccard · web-flow · commit f9c2471f64b0 · 2016-09-12T19:34:20.000+02:00
Retry ABORTED Datastore commit only when NON_TRANSACTIONAL
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreException.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreException.java
@@ -34,17 +34,24 @@ public final class DatastoreException extends BaseServiceException {
 
   // see https://cloud.google.com/datastore/docs/concepts/errors#Error_Codes"
   private static final Set<Error> RETRYABLE_ERRORS = ImmutableSet.of(
-      new Error(10, "ABORTED"), new Error(4, "DEADLINE_EXCEEDED"), new Error(14, "UNAVAILABLE"));
+      new Error(10, "ABORTED", true),
+      new Error(4, "DEADLINE_EXCEEDED", false),
+      new Error(14, "UNAVAILABLE", true));
   private static final long serialVersionUID = 2663750991205874435L;
 
   public DatastoreException(int code, String message, String reason) {
-    this(code, message, reason, null);
+    this(code, message, reason, true, null);
   }
 
   public DatastoreException(int code, String message, String reason, Throwable cause) {
     super(code, message, reason, true, cause);
   }
 
+  public DatastoreException(int code, String message, String reason, boolean idempotent,
+      Throwable cause) {
+    super(code, message, reason, idempotent, cause);
+  }
+
   public DatastoreException(IOException exception) {
     super(exception, true);
   }
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/spi/DefaultDatastoreRpc.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/spi/DefaultDatastoreRpc.java
@@ -93,6 +93,11 @@ private static String removeScheme(String url) {
 
   private static DatastoreException translate(
       com.google.datastore.v1.client.DatastoreException exception) {
+    return translate(exception, true);
+  }
+
+  private static DatastoreException translate(
+      com.google.datastore.v1.client.DatastoreException exception, boolean idempotent) {
     String reason = "";
     if (exception.getCode() != null) {
       reason = exception.getCode().name();
@@ -103,15 +108,14 @@ private static DatastoreException translate(
       }
     }
     return new DatastoreException(
-        exception.getCode().getNumber(), exception.getMessage(), reason, exception);
+        exception.getCode().getNumber(), exception.getMessage(), reason, idempotent, exception);
   }
 
   @Override
   public AllocateIdsResponse allocateIds(AllocateIdsRequest request) {
     try {
       return client.allocateIds(request);
     } catch (com.google.datastore.v1.client.DatastoreException ex) {
-
       throw translate(ex);
     }
   }
@@ -130,7 +134,7 @@ public CommitResponse commit(CommitRequest request) {
     try {
       return client.commit(request);
     } catch (com.google.datastore.v1.client.DatastoreException ex) {
-      throw translate(ex);
+      throw translate(ex, request.getMode() == CommitRequest.Mode.NON_TRANSACTIONAL);
     }
   }
 

Original file line number	Diff line number	Diff line change
`@@ -93,6 +93,11 @@ private static String removeScheme(String url) {`
`93`	`93`
`94`	`94`	`private static DatastoreException translate(`
`95`	`95`	`com.google.datastore.v1.client.DatastoreException exception) {`
	`96`	`+ return translate(exception, true);`
	`97`	`+ }`
	`98`	`+`
	`99`	`+ private static DatastoreException translate(`
	`100`	`+ com.google.datastore.v1.client.DatastoreException exception, boolean idempotent) {`
`96`	`101`	`String reason = "";`
`97`	`102`	`if (exception.getCode() != null) {`
`98`	`103`	`reason = exception.getCode().name();`
`@@ -103,15 +108,14 @@ private static DatastoreException translate(`
`103`	`108`	`}`
`104`	`109`	`}`
`105`	`110`	`return new DatastoreException(`
`106`		`- exception.getCode().getNumber(), exception.getMessage(), reason, exception);`
	`111`	`+ exception.getCode().getNumber(), exception.getMessage(), reason, idempotent, exception);`
`107`	`112`	`}`
`108`	`113`
`109`	`114`	`@Override`
`110`	`115`	`public AllocateIdsResponse allocateIds(AllocateIdsRequest request) {`
`111`	`116`	`try {`
`112`	`117`	`return client.allocateIds(request);`
`113`	`118`	`} catch (com.google.datastore.v1.client.DatastoreException ex) {`
`114`		`-`
`115`	`119`	`throw translate(ex);`
`116`	`120`	`}`
`117`	`121`	`}`
`@@ -130,7 +134,7 @@ public CommitResponse commit(CommitRequest request) {`
`130`	`134`	`try {`
`131`	`135`	`return client.commit(request);`
`132`	`136`	`} catch (com.google.datastore.v1.client.DatastoreException ex) {`
`133`		`- throw translate(ex);`
	`137`	`+ throw translate(ex, request.getMode() == CommitRequest.Mode.NON_TRANSACTIONAL);`
`134`	`138`	`}`
`135`	`139`	`}`
`136`	`140`