Skip to content

Commit dfdaa4c

Browse files
neozwuneozwu
authored
---
yaml --- r: 8001 b: refs/heads/tswast-patch-1 c: b355f4d h: refs/heads/master i: 7999: df4b61b
1 parent d310e82 commit dfdaa4c

6 files changed

Lines changed: 189 additions & 6 deletions

File tree

‎[refs]‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,5 +57,5 @@ refs/tags/v0.18.0: 9d193c4c4b9d1c6f21515dd8e50836b9194ec9bb
5757
refs/tags/v0.19.0: e67b56e4d8dad5f9a7b38c9b2107c23c828f2ed5
5858
refs/tags/v0.20.0: 839f7fb7156535146aa1cb2c5aadd8d375d854e8
5959
refs/tags/v0.20.1: 370471f437f1f4f68a11e068df5cd6bf39edb1fa
60-
refs/heads/tswast-patch-1: cc8dc45a7fa1874b1dc177986b2749770161eac3
60+
refs/heads/tswast-patch-1: b355f4db156d70107d0e122e2ee7d774fd660600
6161
refs/heads/pubsub-streaming-pull: 19262b752ee874eb2ca3b950eb2aef44d5a5267b

‎branches/tswast-patch-1/google-cloud-core/src/main/java/com/google/cloud/BaseService.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public RetryResult afterEval(Exception exception, RetryResult retryResult) {
3939
public RetryResult beforeEval(Exception exception) {
4040
if (exception instanceof BaseServiceException) {
4141
boolean retriable = ((BaseServiceException) exception).isRetryable();
42-
return retriable ? Interceptor.RetryResult.RETRY : Interceptor.RetryResult.NO_RETRY;
42+
return retriable ? Interceptor.RetryResult.RETRY : Interceptor.RetryResult.CONTINUE_EVALUATION;
4343
}
4444
return Interceptor.RetryResult.CONTINUE_EVALUATION;
4545
}

‎branches/tswast-patch-1/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreImpl.java‎

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,11 @@
1616

1717
package com.google.cloud.datastore;
1818

19+
import com.google.api.gax.core.RetrySettings;
1920
import com.google.cloud.BaseService;
21+
import com.google.cloud.ExceptionHandler;
2022
import com.google.cloud.RetryHelper;
2123
import com.google.cloud.RetryHelper.RetryHelperException;
22-
import com.google.api.gax.core.RetrySettings;
2324
import com.google.cloud.ServiceOptions;
2425
import com.google.cloud.datastore.ReadOption.EventualConsistency;
2526
import com.google.cloud.datastore.spi.v1.DatastoreRpc;
@@ -31,7 +32,6 @@
3132
import com.google.common.collect.Sets;
3233
import com.google.datastore.v1.ReadOptions.ReadConsistency;
3334
import com.google.protobuf.ByteString;
34-
3535
import java.util.ArrayList;
3636
import java.util.Arrays;
3737
import java.util.Collections;
@@ -47,6 +47,8 @@ final class DatastoreImpl extends BaseService<DatastoreOptions> implements Datas
4747

4848
private final DatastoreRpc datastoreRpc;
4949
private final RetrySettings retrySettings;
50+
private static final ExceptionHandler TRANSACTION_EXCEPTION_HANDLER =
51+
TransactionExceptionHandler.build();
5052

5153
DatastoreImpl(DatastoreOptions options) {
5254
super(options);
@@ -66,8 +68,22 @@ public Transaction newTransaction() {
6668
}
6769

6870
@Override
69-
public <T> T runInTransaction(TransactionCallable<T> callable) {
70-
return DatastoreHelper.runInTransaction(this, callable);
71+
public <T> T runInTransaction(final TransactionCallable<T> callable) {
72+
final DatastoreImpl self = this;
73+
try {
74+
return RetryHelper.runWithRetries(
75+
new Callable<T>() {
76+
@Override
77+
public T call() throws DatastoreException {
78+
return DatastoreHelper.runInTransaction(self, callable);
79+
}
80+
},
81+
retrySettings,
82+
TRANSACTION_EXCEPTION_HANDLER,
83+
getOptions().getClock());
84+
} catch (RetryHelperException e) {
85+
throw DatastoreException.translateAndThrow(e);
86+
}
7187
}
7288

7389
@Override

‎branches/tswast-patch-1/google-cloud-datastore/src/main/java/com/google/cloud/datastore/TransactionExceptionHandler.java‎

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
/*
2+
* Copyright 2017 Google Inc. All Rights Reserved.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
17+
package com.google.cloud.datastore;
18+
19+
import com.google.cloud.ExceptionHandler;
20+
import com.google.cloud.ExceptionHandler.Interceptor;
21+
22+
public class TransactionExceptionHandler {
23+
public static final Interceptor TRANSACTION_EXCEPTION_HANDLER_INTERCEPTOR =
24+
new Interceptor() {
25+
26+
private static final long serialVersionUID = -1240723093072535978L;
27+
28+
private static final int ABORTED_CODE = 10;
29+
30+
@Override
31+
public RetryResult beforeEval(Exception exception) {
32+
if (exception instanceof DatastoreException) {
33+
DatastoreException e = getInnerException((DatastoreException) exception);
34+
if (e.getCode() == ABORTED_CODE || e.getReason().equals("ABORTED")) {
35+
return Interceptor.RetryResult.RETRY;
36+
}
37+
}
38+
return Interceptor.RetryResult.CONTINUE_EVALUATION;
39+
}
40+
41+
@Override
42+
public RetryResult afterEval(Exception exception, RetryResult retryResult) {
43+
return Interceptor.RetryResult.CONTINUE_EVALUATION;
44+
}
45+
46+
private DatastoreException getInnerException(DatastoreException exception) {
47+
while (exception.getCause() instanceof DatastoreException) {
48+
exception = (DatastoreException) exception.getCause();
49+
}
50+
return exception;
51+
}
52+
};
53+
54+
public static ExceptionHandler build() {
55+
return ExceptionHandler.newBuilder()
56+
.abortOn(RuntimeException.class)
57+
.addInterceptors(
58+
DatastoreImpl.EXCEPTION_HANDLER_INTERCEPTOR, TRANSACTION_EXCEPTION_HANDLER_INTERCEPTOR)
59+
.build();
60+
}
61+
62+
/** Intentionally private empty constructor to disable instantiation of this class. */
63+
private TransactionExceptionHandler() {}
64+
}

‎branches/tswast-patch-1/google-cloud-datastore/src/test/java/com/google/cloud/datastore/TransactionExceptionHandlerTest.java‎

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
/*
2+
* Copyright 2017 Google Inc. All Rights Reserved.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
17+
package com.google.cloud.datastore;
18+
19+
import static junit.framework.TestCase.assertFalse;
20+
import static junit.framework.TestCase.assertTrue;
21+
22+
import com.google.cloud.BaseServiceException;
23+
import com.google.cloud.ExceptionHandler;
24+
import org.junit.Rule;
25+
import org.junit.Test;
26+
import org.junit.rules.ExpectedException;
27+
28+
/** Tests for {@link TransactionExceptionHandler}. */
29+
public class TransactionExceptionHandlerTest {
30+
31+
@Rule public ExpectedException thrown = ExpectedException.none();
32+
33+
@Test
34+
public void testShouldTry() {
35+
ExceptionHandler handler =
36+
ExceptionHandler.newBuilder()
37+
.abortOn(RuntimeException.class)
38+
.addInterceptors(DatastoreImpl.EXCEPTION_HANDLER_INTERCEPTOR)
39+
.build();
40+
ExceptionHandler transactionHandler = TransactionExceptionHandler.build();
41+
42+
assertFalse(handler.accept(new DatastoreException(10, "", "ABORTED", false, null)));
43+
assertFalse(handler.accept(new DatastoreException(10, "", "", false, null)));
44+
assertFalse(handler.accept(new DatastoreException(0, "", "", false, null)));
45+
46+
assertTrue(transactionHandler.accept(new DatastoreException(10, "", "ABORTED", false, null)));
47+
assertTrue(transactionHandler.accept(new DatastoreException(10, "", "", false, null)));
48+
assertFalse(transactionHandler.accept(new DatastoreException(0, "", "", false, null)));
49+
50+
DatastoreException nestedDatastoreException =
51+
new DatastoreException(
52+
BaseServiceException.UNKNOWN_CODE,
53+
"",
54+
null,
55+
new DatastoreException(10, "", "ABORTED", false, null));
56+
57+
assertTrue(transactionHandler.accept(nestedDatastoreException));
58+
assertFalse(handler.accept(nestedDatastoreException));
59+
}
60+
}

‎branches/tswast-patch-1/google-cloud-datastore/src/test/java/com/google/cloud/datastore/it/ITDatastoreTest.java‎

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
import com.google.cloud.datastore.Datastore;
3131
import com.google.cloud.datastore.DatastoreException;
3232
import com.google.cloud.datastore.DatastoreOptions;
33+
import com.google.cloud.datastore.DatastoreReaderWriter;
3334
import com.google.cloud.datastore.DateTime;
3435
import com.google.cloud.datastore.DateTimeValue;
3536
import com.google.cloud.datastore.Entity;
@@ -729,4 +730,46 @@ public void testDelete() {
729730
assertNull(keys.next());
730731
assertFalse(keys.hasNext());
731732
}
733+
734+
@Test
735+
public void testRunInTransaction() {
736+
Datastore.TransactionCallable<Integer> callable1 =
737+
new Datastore.TransactionCallable<Integer>() {
738+
private Integer attempts = 1;
739+
740+
public Integer run(DatastoreReaderWriter transaction) {
741+
transaction.get(KEY1);
742+
if (attempts < 2) {
743+
++attempts;
744+
throw new DatastoreException(10, "", "ABORTED", false, null);
745+
}
746+
747+
return attempts;
748+
}
749+
};
750+
751+
int result = DATASTORE.runInTransaction(callable1);
752+
assertEquals(result, 2);
753+
754+
Datastore.TransactionCallable<Integer> callable2 =
755+
new Datastore.TransactionCallable<Integer>() {
756+
private Integer attempts = 1;
757+
758+
public Integer run(DatastoreReaderWriter transaction) {
759+
transaction.get(KEY1);
760+
if (attempts < 2) {
761+
++attempts;
762+
throw new DatastoreException(4, "", "DEADLINE_EXCEEDED", false, null);
763+
}
764+
return attempts;
765+
}
766+
};
767+
768+
try {
769+
DATASTORE.runInTransaction(callable2);
770+
fail("Expecting a failure");
771+
} catch (DatastoreException expected) {
772+
assertEquals(((DatastoreException) expected.getCause()).getCode(), 4);
773+
}
774+
}
732775
}

0 commit comments

Comments
 (0)