zydronium/google-nomulus
1
0
Fork 0
mirror of https://github.com/google/nomulus.git synced 2025-06-28 07:13:34 +02:00
Code Issues Projects Releases Packages Wiki Activity

Fix checkState failing to trigger retrier's retry

Browse source 
We have a retrier wanting to call a function, retrying on
IllegalStateExceptions (thrown by checkState()).

However, one of the checkStates is called inside a Concurrent.transform, so
when the checkState fails, the resulting IllegalStateException is wrapped in an
UncheckedExecutionException and isn't caught by the retrier.

We unwrap the IllegalStateException to make sure it's caught.

Q: Why not just catch UncheckedExecution exception?
A: Because it might wrap a different exception which we don't want to retry on.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=224862573
This commit is contained in:
guyben 2018-12-10 12:37:28 -08:00 • committed by jianglai
parent 5bc70cbc99
commit 4dad0a8a73
1 changed files with 27 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

41
java/google/registry/model/tmch/ClaimsListShard.java
View file

@ -16,6 +16,7 @@ package google.registry.model.tmch;
import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Preconditions.checkNotNull;
import static com.google.common.base.Preconditions.checkState; import static com.google.common.base.Preconditions.checkState;
import static com.google.common.base.Throwables.throwIfUnchecked;
import static com.google.common.base.Verify.verify; import static com.google.common.base.Verify.verify;
import static google.registry.model.CacheUtils.memoizeWithShortExpiration; import static google.registry.model.CacheUtils.memoizeWithShortExpiration;
import static google.registry.model.ofy.ObjectifyService.allocateId; import static google.registry.model.ofy.ObjectifyService.allocateId;
@ -25,6 +26,7 @@ import static google.registry.util.DateTimeUtils.START_OF_TIME;
import com.google.common.annotations.VisibleForTesting; import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Supplier; import com.google.common.base.Supplier;
import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableMap;
import com.google.common.util.concurrent.UncheckedExecutionException;
import com.googlecode.objectify.Key; import com.googlecode.objectify.Key;
import com.googlecode.objectify.annotation.EmbedMap; import com.googlecode.objectify.annotation.EmbedMap;
import com.googlecode.objectify.annotation.Entity; import com.googlecode.objectify.annotation.Entity;
@ -102,20 +104,31 @@ public class ClaimsListShard extends ImmutableObject {
final List<Key<ClaimsListShard>> shardKeys = final List<Key<ClaimsListShard>> shardKeys =
ofy().load().type(ClaimsListShard.class).ancestor(revisionKey).keys().list(); ofy().load().type(ClaimsListShard.class).ancestor(revisionKey).keys().list();
// Load all of the shards concurrently, each in a separate transaction. List<ClaimsListShard> shards;
List<ClaimsListShard> shards = try {
Concurrent.transform( // Load all of the shards concurrently, each in a separate transaction.
shardKeys, shards =
(final Key<ClaimsListShard> key) -> Concurrent.transform(
ofy() shardKeys,
.transactNewReadOnly( key ->
() -> { ofy()
ClaimsListShard claimsListShard = ofy().load().key(key).now(); .transactNewReadOnly(
checkState( () -> {
claimsListShard != null, ClaimsListShard claimsListShard = ofy().load().key(key).now();
"Key not found when loading claims list shards."); checkState(
return claimsListShard; claimsListShard != null,
})); "Key not found when loading claims list shards.");
return claimsListShard;
}));
} catch (UncheckedExecutionException e) {
// We retry on IllegalStateException. However, there's a checkState inside the
// Concurrent.transform, so if it's thrown it'll be wrapped in an
// UncheckedExecutionException. We want to unwrap it so it's caught by the retrier.
if (e.getCause() != null) {
throwIfUnchecked(e.getCause());
}
throw e;
}
// Combine the shards together and return the concatenated ClaimsList. // Combine the shards together and return the concatenated ClaimsList.
if (!shards.isEmpty()) { if (!shards.isEmpty()) {