Skip to content

Commit

Permalink
retry datastore transactions (googleapis#1242)
Browse files Browse the repository at this point in the history
  • Loading branch information
neozwu committed Apr 17, 2017
1 parent a27d8c7 commit 5f3c1d7
Show file tree
Hide file tree
Showing 5 changed files with 156 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ public RetryResult afterEval(Exception exception, RetryResult retryResult) {
public RetryResult beforeEval(Exception exception) {
if (exception instanceof BaseServiceException) {
boolean retriable = ((BaseServiceException) exception).isRetryable();
return retriable ? Interceptor.RetryResult.RETRY : Interceptor.RetryResult.NO_RETRY;
return retriable ? Interceptor.RetryResult.RETRY : RetryResult.CONTINUE_EVALUATION;
}
return Interceptor.RetryResult.CONTINUE_EVALUATION;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,11 @@

package com.google.cloud.datastore;

import com.google.api.gax.core.RetrySettings;
import com.google.cloud.BaseService;
import com.google.cloud.ExceptionHandler;
import com.google.cloud.RetryHelper;
import com.google.cloud.RetryHelper.RetryHelperException;
import com.google.api.gax.core.RetrySettings;
import com.google.cloud.ServiceOptions;
import com.google.cloud.datastore.ReadOption.EventualConsistency;
import com.google.cloud.datastore.spi.v1.DatastoreRpc;
Expand All @@ -31,7 +32,6 @@
import com.google.common.collect.Sets;
import com.google.datastore.v1.ReadOptions.ReadConsistency;
import com.google.protobuf.ByteString;

import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
Expand Down Expand Up @@ -66,8 +66,23 @@ public Transaction newTransaction() {
}

@Override
public <T> T runInTransaction(TransactionCallable<T> callable) {
return DatastoreHelper.runInTransaction(this, callable);
public <T> T runInTransaction(final TransactionCallable<T> callable) {
ExceptionHandler TRANSACTION_EXCEPTION_HANDLER = TransactionExceptionHandler.build();
final DatastoreImpl self = this;
try {
return RetryHelper.runWithRetries(
new Callable<T>() {
@Override
public T call() throws DatastoreException {
return DatastoreHelper.runInTransaction(self, callable);
}
},
retrySettings,
TRANSACTION_EXCEPTION_HANDLER,
getOptions().getClock());
} catch (RetryHelperException e) {
throw DatastoreException.translateAndThrow(e);
}
}

@Override
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
/*
* Copyright 2017 Google Inc. All Rights Reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

package com.google.cloud.datastore;

import com.google.cloud.ExceptionHandler;
import com.google.cloud.ExceptionHandler.Interceptor;

public class TransactionExceptionHandler {
public static final Interceptor TRANSACTION_EXCEPTION_HANDLER_INTERCEPTOR =
new Interceptor() {
@Override
public RetryResult beforeEval(Exception exception) {
if (exception instanceof DatastoreException) {
DatastoreException e = getInnerException((DatastoreException) exception);
if (e.getCode() == 10 || e.getReason() == "ABORTED") {
return RetryResult.RETRY;
}
}
return Interceptor.RetryResult.CONTINUE_EVALUATION;
}

@Override
public RetryResult afterEval(Exception exception, RetryResult retryResult) {
return Interceptor.RetryResult.CONTINUE_EVALUATION;
}

private DatastoreException getInnerException(DatastoreException exception) {
DatastoreException innerException = exception;
while (innerException.getCause() instanceof DatastoreException) {
innerException = (DatastoreException) innerException.getCause();
}
return innerException;
}
};

public static ExceptionHandler build() {
return ExceptionHandler.newBuilder()
.abortOn(RuntimeException.class)
.addInterceptors(
DatastoreImpl.EXCEPTION_HANDLER_INTERCEPTOR, TRANSACTION_EXCEPTION_HANDLER_INTERCEPTOR)
.build();
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
/*
* Copyright 2017 Google Inc. All Rights Reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

package com.google.cloud.datastore;

import static junit.framework.TestCase.assertFalse;
import static junit.framework.TestCase.assertTrue;

import com.google.cloud.BaseServiceException;
import com.google.cloud.ExceptionHandler;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.ExpectedException;

/** Tests for {@link TransactionExceptionHandler}. */
public class TransactionExceptionHandlerTest {

@Rule public ExpectedException thrown = ExpectedException.none();

@Test
public void testShouldTry() {
ExceptionHandler handler =
ExceptionHandler.newBuilder()
.abortOn(RuntimeException.class)
.addInterceptors(DatastoreImpl.EXCEPTION_HANDLER_INTERCEPTOR)
.build();
ExceptionHandler transactionHandler = TransactionExceptionHandler.build();

assertFalse(handler.accept(new DatastoreException(10, "", "ABORTED", false, null)));
assertFalse(handler.accept(new DatastoreException(10, "", "", false, null)));
assertFalse(handler.accept(new DatastoreException(0, "", "", false, null)));

assertTrue(transactionHandler.accept(new DatastoreException(10, "", "ABORTED", false, null)));
assertTrue(transactionHandler.accept(new DatastoreException(10, "", "", false, null)));
assertFalse(transactionHandler.accept(new DatastoreException(0, "", "", false, null)));

DatastoreException nestedDatastoreException =
new DatastoreException(
BaseServiceException.UNKNOWN_CODE,
"",
null,
new DatastoreException(10, "", "ABORTED", false, null));

assertTrue(transactionHandler.accept(nestedDatastoreException));
assertFalse(handler.accept(nestedDatastoreException));
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
import com.google.cloud.datastore.Datastore;
import com.google.cloud.datastore.DatastoreException;
import com.google.cloud.datastore.DatastoreOptions;
import com.google.cloud.datastore.DatastoreReaderWriter;
import com.google.cloud.datastore.DateTime;
import com.google.cloud.datastore.DateTimeValue;
import com.google.cloud.datastore.Entity;
Expand Down Expand Up @@ -58,6 +59,7 @@
import com.google.cloud.datastore.ValueType;
import com.google.cloud.datastore.testing.RemoteDatastoreHelper;
import com.google.common.base.Preconditions;
import com.google.common.collect.Iterators;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashSet;
Expand Down Expand Up @@ -729,4 +731,21 @@ public void testDelete() {
assertNull(keys.next());
assertFalse(keys.hasNext());
}

@Test
public void testRunInTransaction() {
Datastore.TransactionCallable<Integer> callable = new Datastore.TransactionCallable<Integer>() {
private Integer attempts = 0;
public Integer run(DatastoreReaderWriter transaction) {
if (attempts < 1) {
++attempts;
throw new DatastoreException(10,"","ABORTED",false,null);
}
transaction.get(KEY1);
return attempts;
}
};
int result = DATASTORE.runInTransaction(callable);
assertTrue( result == 1);
}
}

0 comments on commit 5f3c1d7

Please sign in to comment.