mirror of
https://github.com/google/nomulus.git
synced 2025-07-04 10:13:30 +02:00
Add short-term host/contact caching for high-QPS domain mutations
After investigating common domain create/update command usage patterns by registrars, we noticed that it is frequent for a given registrar to reuse both hosts (using a standardized set of nameservers) as well as contacts (e.g. for privacy/proxy services). With these usage patterns, potential per-registrar throughput during high volume scenarios (i.e. first moments of General Availability) suffers from hitting hot keys in Datastore. The solution, implemented in this CL, is to add short-term in-memory caching for contacts and hosts, analogous to how we are already caching Registry and Registrar entities. These new cached paths are only used inside domain flows to determine existence and deleted/pending delete status of contacts and hosts. This is a potential loss of transactional consistency, but in practice it's hard to imagine this having negative effects, as contacts or hosts that are in use cannot be deleted, and caching would primarily affect widely used contacts and hosts. Note that this caching can be turned on or off through a configuration option, and by default would be off. We'd only want it on when we really needed it, i.e. during a big launch. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=187093378
This commit is contained in:
parent
cd9bd35a08
commit
ce136f9285
13 changed files with 461 additions and 16 deletions
|
@ -1018,6 +1018,10 @@ public final class RegistryConfig {
|
|||
* asynchronously fails the delete). Without this delay, the mapreduce might have started before
|
||||
* the domain flow committed, and could potentially miss the reference.
|
||||
*
|
||||
* <p>If you are using EPP resource caching (eppResourceCachingEnabled in YAML), then this
|
||||
* duration should also be longer than that cache duration (eppResourceCachingSeconds).
|
||||
*
|
||||
* @see google.registry.config.RegistryConfigSettings.Caching
|
||||
* @see google.registry.flows.async.AsyncFlowEnqueuer
|
||||
*/
|
||||
@Provides
|
||||
|
@ -1324,6 +1328,27 @@ public final class RegistryConfig {
|
|||
return CONFIG_SETTINGS.get().caching.staticPremiumListMaxCachedEntries;
|
||||
}
|
||||
|
||||
public static boolean isEppResourceCachingEnabled() {
|
||||
return CONFIG_SETTINGS.get().caching.eppResourceCachingEnabled;
|
||||
}
|
||||
|
||||
@VisibleForTesting
|
||||
public static void overrideIsEppResourceCachingEnabledForTesting(boolean enabled) {
|
||||
CONFIG_SETTINGS.get().caching.eppResourceCachingEnabled = enabled;
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns the amount of time an EPP resource or key should be cached in memory before expiring.
|
||||
*/
|
||||
public static Duration getEppResourceCachingDuration() {
|
||||
return Duration.standardSeconds(CONFIG_SETTINGS.get().caching.eppResourceCachingSeconds);
|
||||
}
|
||||
|
||||
/** Returns the maximum number of EPP resources and keys to keep in in-memory cache. */
|
||||
public static int getEppResourceMaxCachedEntries() {
|
||||
return CONFIG_SETTINGS.get().caching.eppResourceMaxCachedEntries;
|
||||
}
|
||||
|
||||
/** Returns the email address that outgoing emails from the app are sent from. */
|
||||
public static String getGSuiteOutgoingEmailAddress() {
|
||||
return CONFIG_SETTINGS.get().gSuite.outgoingEmailAddress;
|
||||
|
|
|
@ -110,6 +110,9 @@ public class RegistryConfigSettings {
|
|||
public int domainLabelCachingSeconds;
|
||||
public int singletonCachePersistSeconds;
|
||||
public int staticPremiumListMaxCachedEntries;
|
||||
public boolean eppResourceCachingEnabled;
|
||||
public int eppResourceCachingSeconds;
|
||||
public int eppResourceMaxCachedEntries;
|
||||
}
|
||||
|
||||
/** Configuration for ICANN monthly reporting. */
|
||||
|
|
|
@ -141,6 +141,28 @@ caching:
|
|||
# premium price entries that exist.
|
||||
staticPremiumListMaxCachedEntries: 200000
|
||||
|
||||
# Whether to enable caching of EPP resource entities and keys. Enabling this
|
||||
# caching allows for much higher domain create/update throughput when hosts
|
||||
# and/or contacts are being frequently used (which is commonly the case).
|
||||
# However, this may introduce transactional inconsistencies, such as allowing
|
||||
# hosts or contacts to be used that are actually deleted (though in practice
|
||||
# this will only happen for non-widely-used entities). Only set this to true
|
||||
# if you need the performance, i.e. if you need >10 domain mutations per
|
||||
# frequently used contact or host. This situation is typically caused by
|
||||
# registrars reusing the same contact/host across many operations, e.g. a
|
||||
# privacy/proxy contact or a common host pointing to a registrar-run
|
||||
# nameserver.
|
||||
eppResourceCachingEnabled: false
|
||||
|
||||
# Length of time that EPP resource entities and keys are cached in memory
|
||||
# before expiring.
|
||||
eppResourceCachingSeconds: 60
|
||||
|
||||
# The maximum number of EPP resource entities and keys to cache in memory.
|
||||
# LoadingCache evicts rarely-used keys first, so in practice this does not
|
||||
# have to be very large to achieve the vast majority of possible gains.
|
||||
eppResourceMaxCachedEntries: 500
|
||||
|
||||
oAuth:
|
||||
# OAuth scopes to detect on access tokens. Superset of requiredOauthScopes.
|
||||
availableOauthScopes:
|
||||
|
|
|
@ -18,6 +18,8 @@ caching:
|
|||
domainLabelCachingSeconds: 0
|
||||
singletonCachePersistSeconds: 0
|
||||
staticPremiumListMaxCachedEntries: 50
|
||||
eppResourceCachingEnabled: true
|
||||
eppResourceCachingSeconds: 0
|
||||
|
||||
braintree:
|
||||
merchantAccountIdsMap:
|
||||
|
|
|
@ -17,7 +17,6 @@ package google.registry.flows.domain;
|
|||
import static com.google.common.base.Preconditions.checkNotNull;
|
||||
import static com.google.common.base.Preconditions.checkState;
|
||||
import static com.google.common.base.Predicates.equalTo;
|
||||
import static com.google.common.collect.ImmutableList.toImmutableList;
|
||||
import static com.google.common.collect.ImmutableMap.toImmutableMap;
|
||||
import static com.google.common.collect.Iterables.any;
|
||||
import static com.google.common.collect.Sets.difference;
|
||||
|
@ -275,12 +274,7 @@ public class DomainFlowUtils {
|
|||
nullToEmpty(contacts).stream().map(DesignatedContact::getContactKey).forEach(keysToLoad::add);
|
||||
Optional.ofNullable(registrant).ifPresent(keysToLoad::add);
|
||||
keysToLoad.addAll(nullToEmpty(nameservers));
|
||||
// This cast is safe because, in Objectify, Key<? extends EppResource> can also be
|
||||
// treated as a Key<EppResource>.
|
||||
@SuppressWarnings("unchecked")
|
||||
ImmutableList<Key<EppResource>> typedKeys =
|
||||
keysToLoad.build().stream().map(key -> (Key<EppResource>) key).collect(toImmutableList());
|
||||
verifyNotInPendingDelete(ofy().load().keys(typedKeys).values());
|
||||
verifyNotInPendingDelete(EppResource.loadCached(keysToLoad.build()).values());
|
||||
}
|
||||
|
||||
private static void verifyNotInPendingDelete(Iterable<EppResource> resources)
|
||||
|
|
|
@ -16,23 +16,39 @@ package google.registry.model;
|
|||
|
||||
import static com.google.common.base.Preconditions.checkArgument;
|
||||
import static com.google.common.base.Preconditions.checkState;
|
||||
import static com.google.common.collect.ImmutableList.toImmutableList;
|
||||
import static com.google.common.collect.Sets.difference;
|
||||
import static com.google.common.collect.Sets.union;
|
||||
import static google.registry.config.RegistryConfig.getEppResourceCachingDuration;
|
||||
import static google.registry.config.RegistryConfig.getEppResourceMaxCachedEntries;
|
||||
import static google.registry.model.ofy.ObjectifyService.ofy;
|
||||
import static google.registry.util.CollectionUtils.nullToEmpty;
|
||||
import static google.registry.util.CollectionUtils.nullToEmptyImmutableCopy;
|
||||
import static google.registry.util.DateTimeUtils.END_OF_TIME;
|
||||
import static java.util.concurrent.TimeUnit.MILLISECONDS;
|
||||
|
||||
import com.google.common.annotations.VisibleForTesting;
|
||||
import com.google.common.cache.CacheBuilder;
|
||||
import com.google.common.cache.CacheLoader;
|
||||
import com.google.common.cache.LoadingCache;
|
||||
import com.google.common.collect.ImmutableList;
|
||||
import com.google.common.collect.ImmutableMap;
|
||||
import com.google.common.collect.ImmutableSet;
|
||||
import com.google.common.collect.ImmutableSortedMap;
|
||||
import com.google.common.collect.Streams;
|
||||
import com.googlecode.objectify.Key;
|
||||
import com.googlecode.objectify.annotation.Id;
|
||||
import com.googlecode.objectify.annotation.Index;
|
||||
import google.registry.config.RegistryConfig;
|
||||
import google.registry.model.eppcommon.StatusValue;
|
||||
import google.registry.model.ofy.CommitLogManifest;
|
||||
import google.registry.model.transfer.TransferData;
|
||||
import google.registry.util.NonFinalForTesting;
|
||||
import java.util.Map;
|
||||
import java.util.Map.Entry;
|
||||
import java.util.Optional;
|
||||
import java.util.Set;
|
||||
import java.util.concurrent.ExecutionException;
|
||||
import org.joda.time.DateTime;
|
||||
|
||||
/** An EPP entity object (i.e. a domain, application, contact, or host). */
|
||||
|
@ -301,4 +317,71 @@ public abstract class EppResource extends BackupGroupRoot implements Buildable {
|
|||
return ImmutableObject.cloneEmptyToNull(super.build());
|
||||
}
|
||||
}
|
||||
|
||||
static final CacheLoader<Key<? extends EppResource>, EppResource> CACHE_LOADER =
|
||||
new CacheLoader<Key<? extends EppResource>, EppResource>() {
|
||||
|
||||
@Override
|
||||
public EppResource load(Key<? extends EppResource> key) {
|
||||
return ofy().doTransactionless(() -> ofy().load().key(key).now());
|
||||
}
|
||||
|
||||
@Override
|
||||
public Map<Key<? extends EppResource>, EppResource> loadAll(
|
||||
Iterable<? extends Key<? extends EppResource>> keys) {
|
||||
return ofy().doTransactionless(() -> loadMultiple(keys));
|
||||
}
|
||||
};
|
||||
|
||||
/**
|
||||
* A limited size, limited time cache for EPP resource entities.
|
||||
*
|
||||
* <p>This is only used to cache contacts and hosts for the purposes of checking whether they are
|
||||
* deleted or in pending delete during a few domain flows. Any operations on contacts and hosts
|
||||
* directly should of course never use the cache.
|
||||
*/
|
||||
@NonFinalForTesting
|
||||
static LoadingCache<Key<? extends EppResource>, EppResource> cacheEppResources =
|
||||
CacheBuilder.newBuilder()
|
||||
.expireAfterWrite(getEppResourceCachingDuration().getMillis(), MILLISECONDS)
|
||||
.maximumSize(getEppResourceMaxCachedEntries())
|
||||
.build(CACHE_LOADER);
|
||||
|
||||
private static ImmutableMap<Key<? extends EppResource>, EppResource> loadMultiple(
|
||||
Iterable<? extends Key<? extends EppResource>> keys) {
|
||||
// This cast is safe because, in Objectify, Key<? extends EppResource> can also be
|
||||
// treated as a Key<EppResource>.
|
||||
@SuppressWarnings("unchecked")
|
||||
ImmutableList<Key<EppResource>> typedKeys =
|
||||
Streams.stream(keys).map(key -> (Key<EppResource>) key).collect(toImmutableList());
|
||||
|
||||
// Typing shenanigans are required to return the map with the correct required generic type.
|
||||
return ofy()
|
||||
.load()
|
||||
.keys(typedKeys)
|
||||
.entrySet()
|
||||
.stream()
|
||||
.collect(
|
||||
ImmutableMap
|
||||
.<Map.Entry<Key<EppResource>, EppResource>, Key<? extends EppResource>, EppResource>
|
||||
toImmutableMap(Entry::getKey, Entry::getValue));
|
||||
}
|
||||
|
||||
/**
|
||||
* Loads a given EppResource by its key using the cache (if enabled).
|
||||
*
|
||||
* <p>Don't use this unless you really need it for performance reasons, and be sure that you are
|
||||
* OK with the trade-offs in loss of transactional consistency.
|
||||
*/
|
||||
public static ImmutableMap<Key<? extends EppResource>, EppResource> loadCached(
|
||||
Iterable<Key<? extends EppResource>> keys) {
|
||||
if (!RegistryConfig.isEppResourceCachingEnabled()) {
|
||||
return loadMultiple(keys);
|
||||
}
|
||||
try {
|
||||
return cacheEppResources.getAll(keys);
|
||||
} catch (ExecutionException e) {
|
||||
throw new RuntimeException("Error loading cached EppResources", e.getCause());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -19,7 +19,6 @@ import static com.google.common.base.Preconditions.checkNotNull;
|
|||
import static com.google.common.collect.Iterables.getOnlyElement;
|
||||
import static com.google.common.collect.Maps.transformValues;
|
||||
import static com.google.common.collect.Sets.difference;
|
||||
import static google.registry.model.ofy.ObjectifyService.ofy;
|
||||
import static google.registry.util.CollectionUtils.difference;
|
||||
import static google.registry.util.CollectionUtils.forceEmptyToNull;
|
||||
import static google.registry.util.CollectionUtils.nullSafeImmutableCopy;
|
||||
|
@ -391,7 +390,7 @@ public class DomainCommand {
|
|||
clone.registrant = clone.registrantContactId == null
|
||||
? null
|
||||
: getOnlyElement(
|
||||
loadByForeignKey(
|
||||
loadByForeignKeys(
|
||||
ImmutableSet.of(clone.registrantContactId), ContactResource.class, now)
|
||||
.values());
|
||||
return clone;
|
||||
|
@ -420,7 +419,7 @@ public class DomainCommand {
|
|||
return null;
|
||||
}
|
||||
return ImmutableSet.copyOf(
|
||||
loadByForeignKey(fullyQualifiedHostNames, HostResource.class, now).values());
|
||||
loadByForeignKeys(fullyQualifiedHostNames, HostResource.class, now).values());
|
||||
}
|
||||
|
||||
private static Set<DesignatedContact> linkContacts(
|
||||
|
@ -433,7 +432,7 @@ public class DomainCommand {
|
|||
foreignKeys.add(contact.contactId);
|
||||
}
|
||||
ImmutableMap<String, Key<ContactResource>> loadedContacts =
|
||||
loadByForeignKey(foreignKeys.build(), ContactResource.class, now);
|
||||
loadByForeignKeys(foreignKeys.build(), ContactResource.class, now);
|
||||
ImmutableSet.Builder<DesignatedContact> linkedContacts = new ImmutableSet.Builder<>();
|
||||
for (ForeignKeyedDesignatedContact contact : contacts) {
|
||||
linkedContacts.add(DesignatedContact.create(
|
||||
|
@ -442,12 +441,11 @@ public class DomainCommand {
|
|||
return linkedContacts.build();
|
||||
}
|
||||
|
||||
/** Load keys to resources by their foreign keys. */
|
||||
private static <T extends EppResource> ImmutableMap<String, Key<T>> loadByForeignKey(
|
||||
/** Loads keys to EPP resources by their foreign keys. */
|
||||
private static <T extends EppResource> ImmutableMap<String, Key<T>> loadByForeignKeys(
|
||||
final Set<String> foreignKeys, final Class<T> clazz, final DateTime now)
|
||||
throws InvalidReferencesException {
|
||||
Map<String, ForeignKeyIndex<T>> fkis =
|
||||
ofy().doTransactionless(() -> ForeignKeyIndex.load(clazz, foreignKeys, now));
|
||||
Map<String, ForeignKeyIndex<T>> fkis = ForeignKeyIndex.loadCached(clazz, foreignKeys, now);
|
||||
if (!fkis.keySet().equals(foreignKeys)) {
|
||||
throw new InvalidReferencesException(
|
||||
clazz, ImmutableSet.copyOf(difference(foreignKeys, fkis.keySet())));
|
||||
|
|
|
@ -14,23 +14,37 @@
|
|||
|
||||
package google.registry.model.index;
|
||||
|
||||
import static com.google.common.collect.ImmutableList.toImmutableList;
|
||||
import static com.google.common.collect.Maps.filterValues;
|
||||
import static google.registry.config.RegistryConfig.getEppResourceCachingDuration;
|
||||
import static google.registry.config.RegistryConfig.getEppResourceMaxCachedEntries;
|
||||
import static google.registry.model.ofy.ObjectifyService.ofy;
|
||||
import static google.registry.util.TypeUtils.instantiate;
|
||||
import static java.util.concurrent.TimeUnit.MILLISECONDS;
|
||||
|
||||
import com.google.common.cache.CacheBuilder;
|
||||
import com.google.common.cache.CacheLoader;
|
||||
import com.google.common.cache.LoadingCache;
|
||||
import com.google.common.collect.ImmutableList;
|
||||
import com.google.common.collect.ImmutableMap;
|
||||
import com.google.common.collect.ImmutableSet;
|
||||
import com.google.common.collect.Maps;
|
||||
import com.google.common.collect.Streams;
|
||||
import com.googlecode.objectify.Key;
|
||||
import com.googlecode.objectify.annotation.Entity;
|
||||
import com.googlecode.objectify.annotation.Id;
|
||||
import com.googlecode.objectify.annotation.Index;
|
||||
import google.registry.config.RegistryConfig;
|
||||
import google.registry.model.BackupGroupRoot;
|
||||
import google.registry.model.EppResource;
|
||||
import google.registry.model.annotations.ReportedOn;
|
||||
import google.registry.model.contact.ContactResource;
|
||||
import google.registry.model.domain.DomainResource;
|
||||
import google.registry.model.host.HostResource;
|
||||
import google.registry.util.NonFinalForTesting;
|
||||
import java.util.Map;
|
||||
import java.util.Optional;
|
||||
import java.util.concurrent.ExecutionException;
|
||||
import javax.annotation.Nullable;
|
||||
import org.joda.time.DateTime;
|
||||
|
||||
|
@ -96,7 +110,6 @@ public abstract class ForeignKeyIndex<E extends EppResource> extends BackupGroup
|
|||
return topReference;
|
||||
}
|
||||
|
||||
|
||||
@SuppressWarnings("unchecked")
|
||||
public static <T extends EppResource> Class<ForeignKeyIndex<T>> mapToFkiClass(
|
||||
Class<T> resourceClass) {
|
||||
|
@ -167,4 +180,87 @@ public abstract class ForeignKeyIndex<E extends EppResource> extends BackupGroup
|
|||
ofy().load().type(mapToFkiClass(clazz)).ids(foreignKeys),
|
||||
(ForeignKeyIndex<?> fki) -> now.isBefore(fki.deletionTime));
|
||||
}
|
||||
|
||||
static final CacheLoader<Key<ForeignKeyIndex<?>>, Optional<ForeignKeyIndex<?>>> CACHE_LOADER =
|
||||
new CacheLoader<Key<ForeignKeyIndex<?>>, Optional<ForeignKeyIndex<?>>>() {
|
||||
|
||||
@Override
|
||||
public Optional<ForeignKeyIndex<?>> load(Key<ForeignKeyIndex<?>> key) {
|
||||
return Optional.ofNullable(ofy().doTransactionless(() -> ofy().load().key(key).now()));
|
||||
}
|
||||
|
||||
@Override
|
||||
public Map<Key<ForeignKeyIndex<?>>, Optional<ForeignKeyIndex<?>>> loadAll(
|
||||
Iterable<? extends Key<ForeignKeyIndex<?>>> keys) {
|
||||
ImmutableSet<Key<ForeignKeyIndex<?>>> typedKeys = ImmutableSet.copyOf(keys);
|
||||
Map<Key<ForeignKeyIndex<?>>, ForeignKeyIndex<?>> existingFkis =
|
||||
ofy().doTransactionless(() -> ofy().load().keys(typedKeys));
|
||||
// ofy() omits keys that don't have values in Datastore, so re-add them in
|
||||
// here with Optional.empty() values.
|
||||
return Maps.asMap(
|
||||
typedKeys,
|
||||
(Key<ForeignKeyIndex<?>> key) ->
|
||||
Optional.ofNullable(existingFkis.getOrDefault(key, null)));
|
||||
}
|
||||
};
|
||||
|
||||
/**
|
||||
* A limited size, limited time cache for foreign key entities.
|
||||
*
|
||||
* <p>This is only used to cache foreign key entities for the purposes of checking whether they
|
||||
* exist (and if so, what entity they point to) during a few domain flows. Any other operations on
|
||||
* foreign keys should not use this cache.
|
||||
*
|
||||
* <p>Note that the value type of this cache is Optional because the foreign keys in question are
|
||||
* coming from external commands, and thus don't necessarily represent entities in our system that
|
||||
* actually exist. So we cache the fact that they *don't* exist by using Optional.empty(), and
|
||||
* then several layers up the EPP command will fail with an error message like "The contact with
|
||||
* given IDs (blah) don't exist."
|
||||
*/
|
||||
@NonFinalForTesting
|
||||
static LoadingCache<Key<ForeignKeyIndex<?>>, Optional<ForeignKeyIndex<?>>>
|
||||
cacheForeignKeyIndexes =
|
||||
CacheBuilder.newBuilder()
|
||||
.expireAfterWrite(getEppResourceCachingDuration().getMillis(), MILLISECONDS)
|
||||
.maximumSize(getEppResourceMaxCachedEntries())
|
||||
.build(CACHE_LOADER);
|
||||
|
||||
/**
|
||||
* Load a list of {@link ForeignKeyIndex} instances by class and id strings that are active at or
|
||||
* after the specified moment in time, using the cache if enabled.
|
||||
*
|
||||
* <p>The returned map will omit any keys for which the {@link ForeignKeyIndex} doesn't exist or
|
||||
* has been soft deleted.
|
||||
*
|
||||
* <p>Don't use the cached version of this method unless you really need it for performance
|
||||
* reasons, and are OK with the trade-offs in loss of transactional consistency.
|
||||
*/
|
||||
public static <E extends EppResource> Map<String, ForeignKeyIndex<E>> loadCached(
|
||||
Class<E> clazz, Iterable<String> foreignKeys, final DateTime now) {
|
||||
if (!RegistryConfig.isEppResourceCachingEnabled()) {
|
||||
return ofy().doTransactionless(() -> load(clazz, foreignKeys, now));
|
||||
}
|
||||
ImmutableList<Key<ForeignKeyIndex<?>>> fkiKeys =
|
||||
Streams.stream(foreignKeys)
|
||||
.map(fk -> Key.<ForeignKeyIndex<?>>create(mapToFkiClass(clazz), fk))
|
||||
.collect(toImmutableList());
|
||||
try {
|
||||
// This cast is safe because when we loaded ForeignKeyIndexes above we used type clazz, which
|
||||
// is scoped to E.
|
||||
@SuppressWarnings("unchecked")
|
||||
Map<String, ForeignKeyIndex<E>> fkisFromCache = cacheForeignKeyIndexes
|
||||
.getAll(fkiKeys)
|
||||
.entrySet()
|
||||
.stream()
|
||||
.filter(entry -> entry.getValue().isPresent())
|
||||
.filter(entry -> now.isBefore(entry.getValue().get().getDeletionTime()))
|
||||
.collect(
|
||||
ImmutableMap.toImmutableMap(
|
||||
entry -> entry.getKey().getName(),
|
||||
entry -> (ForeignKeyIndex<E>) entry.getValue().get()));
|
||||
return fkisFromCache;
|
||||
} catch (ExecutionException e) {
|
||||
throw new RuntimeException("Error loading cached ForeignKeyIndexes", e.getCause());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -59,6 +59,7 @@ import com.google.common.collect.ImmutableMap;
|
|||
import com.google.common.collect.ImmutableSet;
|
||||
import com.google.common.collect.ImmutableSortedMap;
|
||||
import com.googlecode.objectify.Key;
|
||||
import google.registry.config.RegistryConfig;
|
||||
import google.registry.flows.EppException;
|
||||
import google.registry.flows.EppException.UnimplementedExtensionException;
|
||||
import google.registry.flows.EppRequestSource;
|
||||
|
@ -387,6 +388,13 @@ public class DomainCreateFlowTest extends ResourceFlowTestCase<DomainCreateFlow,
|
|||
doSuccessfulTest();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testSuccess_cachingDisabled() throws Exception {
|
||||
RegistryConfig.overrideIsEppResourceCachingEnabledForTesting(false);
|
||||
persistContactsAndHosts();
|
||||
doSuccessfulTest();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testFailure_invalidAllocationToken() throws Exception {
|
||||
setEppInput("domain_create_allocationtoken.xml");
|
||||
|
|
|
@ -44,6 +44,7 @@ import com.google.common.collect.ImmutableList;
|
|||
import com.google.common.collect.ImmutableMap;
|
||||
import com.google.common.collect.ImmutableSet;
|
||||
import com.googlecode.objectify.Key;
|
||||
import google.registry.config.RegistryConfig;
|
||||
import google.registry.flows.EppException;
|
||||
import google.registry.flows.EppException.UnimplementedExtensionException;
|
||||
import google.registry.flows.EppRequestSource;
|
||||
|
@ -176,6 +177,14 @@ public class DomainUpdateFlowTest extends ResourceFlowTestCase<DomainUpdateFlow,
|
|||
doSuccessfulTest();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testSuccess_cachingDisabled() throws Exception {
|
||||
RegistryConfig.overrideIsEppResourceCachingEnabledForTesting(false);
|
||||
persistReferencedEntities();
|
||||
persistDomain();
|
||||
doSuccessfulTest();
|
||||
}
|
||||
|
||||
private void doSunrushAddTest(
|
||||
BillingEvent.OneTime sunrushAddBillingEvent,
|
||||
UserPrivileges userPrivileges,
|
||||
|
|
70
javatests/google/registry/model/EppResourceTest.java
Normal file
70
javatests/google/registry/model/EppResourceTest.java
Normal file
|
@ -0,0 +1,70 @@
|
|||
// Copyright 2017 The Nomulus Authors. 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 google.registry.model;
|
||||
|
||||
import static com.google.common.truth.Truth.assertThat;
|
||||
import static google.registry.model.EppResource.CACHE_LOADER;
|
||||
import static google.registry.testing.DatastoreHelper.persistActiveContact;
|
||||
import static google.registry.testing.DatastoreHelper.persistActiveHost;
|
||||
import static google.registry.testing.DatastoreHelper.persistResource;
|
||||
import static java.util.concurrent.TimeUnit.DAYS;
|
||||
|
||||
import com.google.common.cache.CacheBuilder;
|
||||
import com.google.common.collect.ImmutableList;
|
||||
import com.googlecode.objectify.Key;
|
||||
import google.registry.model.contact.ContactResource;
|
||||
import google.registry.model.host.HostResource;
|
||||
import org.junit.Test;
|
||||
|
||||
/** Unit tests for {@link EppResource}. */
|
||||
public class EppResourceTest extends EntityTestCase {
|
||||
|
||||
@Test
|
||||
public void test_loadCached_ignoresContactChange() {
|
||||
setNonZeroCachingInterval();
|
||||
ContactResource originalContact = persistActiveContact("contact123");
|
||||
assertThat(EppResource.loadCached(ImmutableList.of(Key.create(originalContact))))
|
||||
.containsExactly(Key.create(originalContact), originalContact);
|
||||
ContactResource modifiedContact =
|
||||
persistResource(originalContact.asBuilder().setEmailAddress("different@fake.lol").build());
|
||||
assertThat(EppResource.loadCached(ImmutableList.of(Key.create(originalContact))))
|
||||
.containsExactly(Key.create(originalContact), originalContact);
|
||||
assertThat(
|
||||
EppResourceUtils.loadByForeignKey(ContactResource.class, "contact123", clock.nowUtc()))
|
||||
.isEqualTo(modifiedContact);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void test_loadCached_ignoresHostChange() {
|
||||
setNonZeroCachingInterval();
|
||||
HostResource originalHost = persistActiveHost("ns1.example.com");
|
||||
assertThat(EppResource.loadCached(ImmutableList.of(Key.create(originalHost))))
|
||||
.containsExactly(Key.create(originalHost), originalHost);
|
||||
HostResource modifiedHost =
|
||||
persistResource(
|
||||
originalHost.asBuilder().setLastTransferTime(clock.nowUtc().minusDays(60)).build());
|
||||
assertThat(EppResource.loadCached(ImmutableList.of(Key.create(originalHost))))
|
||||
.containsExactly(Key.create(originalHost), originalHost);
|
||||
assertThat(
|
||||
EppResourceUtils.loadByForeignKey(
|
||||
HostResource.class, "ns1.example.com", clock.nowUtc()))
|
||||
.isEqualTo(modifiedHost);
|
||||
}
|
||||
|
||||
private static void setNonZeroCachingInterval() {
|
||||
EppResource.cacheEppResources =
|
||||
CacheBuilder.newBuilder().expireAfterWrite(1L, DAYS).build(CACHE_LOADER);
|
||||
}
|
||||
}
|
|
@ -39,6 +39,7 @@ import org.junit.Test;
|
|||
|
||||
/** Unit tests for {@link HostResource}. */
|
||||
public class HostResourceTest extends EntityTestCase {
|
||||
|
||||
final DateTime day3 = clock.nowUtc();
|
||||
final DateTime day2 = day3.minusDays(1);
|
||||
final DateTime day1 = day2.minusDays(1);
|
||||
|
|
|
@ -15,15 +15,23 @@
|
|||
package google.registry.model.index;
|
||||
|
||||
import static com.google.common.truth.Truth.assertThat;
|
||||
import static google.registry.model.index.ForeignKeyIndex.CACHE_LOADER;
|
||||
import static google.registry.model.ofy.ObjectifyService.ofy;
|
||||
import static google.registry.testing.DatastoreHelper.createTld;
|
||||
import static google.registry.testing.DatastoreHelper.deleteResource;
|
||||
import static google.registry.testing.DatastoreHelper.persistActiveContact;
|
||||
import static google.registry.testing.DatastoreHelper.persistActiveHost;
|
||||
import static google.registry.testing.DatastoreHelper.persistDeletedHost;
|
||||
import static google.registry.testing.DatastoreHelper.persistResource;
|
||||
import static google.registry.util.DateTimeUtils.END_OF_TIME;
|
||||
import static java.util.concurrent.TimeUnit.DAYS;
|
||||
|
||||
import com.google.common.cache.CacheBuilder;
|
||||
import com.google.common.collect.ImmutableList;
|
||||
import com.googlecode.objectify.Key;
|
||||
import google.registry.model.EntityTestCase;
|
||||
import google.registry.model.EppResourceUtils;
|
||||
import google.registry.model.contact.ContactResource;
|
||||
import google.registry.model.host.HostResource;
|
||||
import google.registry.model.index.ForeignKeyIndex.ForeignKeyHostIndex;
|
||||
import org.junit.Before;
|
||||
|
@ -101,4 +109,130 @@ public class ForeignKeyIndexTest extends EntityTestCase {
|
|||
assertThat(ForeignKeyIndex.load(HostResource.class, "omg", clock.nowUtc()).getForeignKey())
|
||||
.isEqualTo("omg");
|
||||
}
|
||||
|
||||
private ForeignKeyIndex<HostResource> loadHostFki(String hostname) {
|
||||
return ForeignKeyIndex.load(HostResource.class, hostname, clock.nowUtc());
|
||||
}
|
||||
|
||||
private ForeignKeyIndex<ContactResource> loadContactFki(String contactId) {
|
||||
return ForeignKeyIndex.load(ContactResource.class, contactId, clock.nowUtc());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void test_loadCached_cachesNonexistenceOfHosts() throws Exception {
|
||||
setNonZeroCachingInterval();
|
||||
assertThat(
|
||||
ForeignKeyIndex.loadCached(
|
||||
HostResource.class,
|
||||
ImmutableList.of("ns5.example.com", "ns6.example.com"),
|
||||
clock.nowUtc()))
|
||||
.isEmpty();
|
||||
persistActiveHost("ns4.example.com");
|
||||
persistActiveHost("ns5.example.com");
|
||||
persistActiveHost("ns6.example.com");
|
||||
clock.advanceOneMilli();
|
||||
assertThat(
|
||||
ForeignKeyIndex.loadCached(
|
||||
HostResource.class,
|
||||
ImmutableList.of("ns6.example.com", "ns5.example.com", "ns4.example.com"),
|
||||
clock.nowUtc()))
|
||||
.containsExactly("ns4.example.com", loadHostFki("ns4.example.com"));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void test_loadCached_cachesExistenceOfHosts() throws Exception {
|
||||
setNonZeroCachingInterval();
|
||||
HostResource host1 = persistActiveHost("ns1.example.com");
|
||||
HostResource host2 = persistActiveHost("ns2.example.com");
|
||||
assertThat(
|
||||
ForeignKeyIndex.loadCached(
|
||||
HostResource.class,
|
||||
ImmutableList.of("ns1.example.com", "ns2.example.com"),
|
||||
clock.nowUtc()))
|
||||
.containsExactly("ns1.example.com", loadHostFki("ns1.example.com"),
|
||||
"ns2.example.com", loadHostFki("ns2.example.com"));
|
||||
deleteResource(host1);
|
||||
deleteResource(host2);
|
||||
persistActiveHost("ns3.example.com");
|
||||
assertThat(
|
||||
ForeignKeyIndex.loadCached(
|
||||
HostResource.class,
|
||||
ImmutableList.of("ns3.example.com", "ns2.example.com", "ns1.example.com"),
|
||||
clock.nowUtc()))
|
||||
.containsExactly(
|
||||
"ns1.example.com", loadHostFki("ns1.example.com"),
|
||||
"ns2.example.com", loadHostFki("ns2.example.com"),
|
||||
"ns3.example.com", loadHostFki("ns3.example.com"));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void test_loadCached_doesntSeeHostChangesWhileCacheIsValid() throws Exception {
|
||||
setNonZeroCachingInterval();
|
||||
HostResource originalHost = persistActiveHost("ns1.example.com");
|
||||
ForeignKeyIndex<HostResource> originalFki = loadHostFki("ns1.example.com");
|
||||
clock.advanceOneMilli();
|
||||
assertThat(
|
||||
ForeignKeyIndex.loadCached(
|
||||
HostResource.class, ImmutableList.of("ns1.example.com"), clock.nowUtc()))
|
||||
.containsExactly("ns1.example.com", originalFki);
|
||||
HostResource modifiedHost =
|
||||
persistResource(
|
||||
originalHost.asBuilder().setPersistedCurrentSponsorClientId("OtherRegistrar").build());
|
||||
clock.advanceOneMilli();
|
||||
ForeignKeyIndex<HostResource> newFki = loadHostFki("ns1.example.com");
|
||||
assertThat(newFki).isNotEqualTo(originalFki);
|
||||
assertThat(
|
||||
EppResourceUtils.loadByForeignKey(
|
||||
HostResource.class, "ns1.example.com", clock.nowUtc()))
|
||||
.isEqualTo(modifiedHost);
|
||||
assertThat(
|
||||
ForeignKeyIndex.loadCached(
|
||||
HostResource.class, ImmutableList.of("ns1.example.com"), clock.nowUtc()))
|
||||
.containsExactly("ns1.example.com", originalFki);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void test_loadCached_filtersOutSoftDeletedHosts() throws Exception {
|
||||
setNonZeroCachingInterval();
|
||||
persistActiveHost("ns1.example.com");
|
||||
persistDeletedHost("ns2.example.com", clock.nowUtc().minusDays(1));
|
||||
assertThat(
|
||||
ForeignKeyIndex.loadCached(
|
||||
HostResource.class,
|
||||
ImmutableList.of("ns1.example.com", "ns2.example.com"),
|
||||
clock.nowUtc()))
|
||||
.containsExactly("ns1.example.com", loadHostFki("ns1.example.com"));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void test_loadCached_cachesContactFkis() throws Exception {
|
||||
setNonZeroCachingInterval();
|
||||
persistActiveContact("contactid1");
|
||||
ForeignKeyIndex<ContactResource> fki1 = loadContactFki("contactid1");
|
||||
assertThat(
|
||||
ForeignKeyIndex.loadCached(
|
||||
ContactResource.class,
|
||||
ImmutableList.of("contactid1", "contactid2"),
|
||||
clock.nowUtc()))
|
||||
.containsExactly("contactid1", fki1);
|
||||
persistActiveContact("contactid2");
|
||||
deleteResource(fki1);
|
||||
assertThat(
|
||||
ForeignKeyIndex.loadCached(
|
||||
ContactResource.class,
|
||||
ImmutableList.of("contactid1", "contactid2"),
|
||||
clock.nowUtc()))
|
||||
.containsExactly("contactid1", fki1);
|
||||
assertThat(
|
||||
ForeignKeyIndex.load(
|
||||
ContactResource.class,
|
||||
ImmutableList.of("contactid1", "contactid2"),
|
||||
clock.nowUtc()))
|
||||
.containsExactly("contactid2", loadContactFki("contactid2"));
|
||||
}
|
||||
|
||||
private static void setNonZeroCachingInterval() {
|
||||
ForeignKeyIndex.cacheForeignKeyIndexes =
|
||||
CacheBuilder.newBuilder().expireAfterWrite(1L, DAYS).build(CACHE_LOADER);
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue