Skip to content

Commit

Permalink
Make the async delete delay configurable in YAML config files
Browse files Browse the repository at this point in the history
Since this has interactions with the recently added EPP resource caching,
they both need to be configurable, otherwise the EPP resource caching time
could not be set longer than the hard-coded async delete delay.

This also adds comments to better clarify the interaction between the two.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=187179539
  • Loading branch information
CydeWeys authored and jianglai committed Mar 7, 2018
1 parent ce136f9 commit 9e3fb8b
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 3 deletions.
4 changes: 2 additions & 2 deletions java/google/registry/config/RegistryConfig.java
Original file line number Diff line number Diff line change
Expand Up @@ -1026,8 +1026,8 @@ public static int provideMaxChecks() {
*/
@Provides
@Config("asyncDeleteFlowMapreduceDelay")
public static Duration provideAsyncDeleteFlowMapreduceDelay() {
return Duration.standardSeconds(90);
public static Duration provideAsyncDeleteFlowMapreduceDelay(RegistryConfigSettings config) {
return Duration.standardSeconds(config.misc.asyncDeleteDelaySeconds);
}

/**
Expand Down
1 change: 1 addition & 0 deletions java/google/registry/config/RegistryConfigSettings.java
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,7 @@ public static class Misc {
public String sheetExportId;
public String alertRecipientEmailAddress;
public String alertEmailSenderDomain;
public int asyncDeleteDelaySeconds;
}

/** Configuration for Braintree credit card payment processing. */
Expand Down
8 changes: 7 additions & 1 deletion java/google/registry/config/files/default-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,8 @@ caching:
eppResourceCachingEnabled: false

# Length of time that EPP resource entities and keys are cached in memory
# before expiring.
# before expiring. This should always be shorter than asyncDeleteDelaySeconds,
# to prevent deleted contacts or hosts from being used on domains.
eppResourceCachingSeconds: 60

# The maximum number of EPP resource entities and keys to cache in memory.
Expand Down Expand Up @@ -244,6 +245,11 @@ misc:
# Domain for the email address we send alert summary emails from.
alertEmailSenderDomain: appspotmail.com

# How long to delay processing of asynchronous deletions. This should always
# be longer than eppResourceCachingSeconds, to prevent deleted contacts or
# hosts from being used on domains.
asyncDeleteDelaySeconds: 90

# Braintree is a credit card payment processor that is used on the registrar
# console to allow registrars to pay their invoices.
braintree:
Expand Down

0 comments on commit 9e3fb8b

Please sign in to comment.