diff --git a/core/src/main/java/google/registry/dns/PublishDnsUpdatesAction.java b/core/src/main/java/google/registry/dns/PublishDnsUpdatesAction.java index 08371079f..5edf27d3f 100644 --- a/core/src/main/java/google/registry/dns/PublishDnsUpdatesAction.java +++ b/core/src/main/java/google/registry/dns/PublishDnsUpdatesAction.java @@ -81,7 +81,7 @@ public final class PublishDnsUpdatesAction implements Runnable, Callable { // tasks. public static final String APP_ENGINE_RETRY_HEADER = "X-AppEngine-TaskRetryCount"; public static final String CLOUD_TASKS_RETRY_HEADER = "X-CloudTasks-TaskRetryCount"; - public static final int RETRIES_BEFORE_PERMANENT_FAILURE = 10; + public static final int RETRIES_BEFORE_PERMANENT_FAILURE = 20; private static final FluentLogger logger = FluentLogger.forEnclosingClass(); diff --git a/core/src/test/java/google/registry/dns/PublishDnsUpdatesActionTest.java b/core/src/test/java/google/registry/dns/PublishDnsUpdatesActionTest.java index 00722d23d..65398d8b1 100644 --- a/core/src/test/java/google/registry/dns/PublishDnsUpdatesActionTest.java +++ b/core/src/test/java/google/registry/dns/PublishDnsUpdatesActionTest.java @@ -23,6 +23,7 @@ import static google.registry.dns.DnsModule.PARAM_LOCK_INDEX; import static google.registry.dns.DnsModule.PARAM_NUM_PUBLISH_LOCKS; import static google.registry.dns.DnsModule.PARAM_PUBLISH_TASK_ENQUEUED; import static google.registry.dns.DnsModule.PARAM_REFRESH_REQUEST_CREATED; +import static google.registry.dns.PublishDnsUpdatesAction.RETRIES_BEFORE_PERMANENT_FAILURE; import static google.registry.request.RequestParameters.PARAM_TLD; import static google.registry.testing.DatabaseHelper.createTld; import static google.registry.testing.DatabaseHelper.persistActiveDomain; @@ -392,10 +393,13 @@ public class PublishDnsUpdatesActionTest { } @Test - void testTaskFailsAfterTenRetries_doesNotRetry() { + void testTaskFailsAfterMaxRetries_doesNotRetry() { action = createAction( - "xn--q9jyb4c", ImmutableSet.of(), ImmutableSet.of("ns1.example.xn--q9jyb4c"), 10); + "xn--q9jyb4c", + ImmutableSet.of(), + ImmutableSet.of("ns1.example.xn--q9jyb4c"), + RETRIES_BEFORE_PERMANENT_FAILURE); doThrow(new RuntimeException()).when(dnsWriter).commit(); action.run(); cloudTasksHelper.assertNoTasksEnqueued(DNS_PUBLISH_PUSH_QUEUE_NAME); @@ -405,7 +409,11 @@ public class PublishDnsUpdatesActionTest { @Test void testDomainDnsUpdateRetriesExhausted_emailIsSent() { action = - createAction("xn--q9jyb4c", ImmutableSet.of("example.xn--q9jyb4c"), ImmutableSet.of(), 10); + createAction( + "xn--q9jyb4c", + ImmutableSet.of("example.xn--q9jyb4c"), + ImmutableSet.of(), + RETRIES_BEFORE_PERMANENT_FAILURE); doThrow(new RuntimeException()).when(dnsWriter).commit(); action.run(); ArgumentCaptor contentCaptor = ArgumentCaptor.forClass(EmailMessage.class); @@ -423,7 +431,10 @@ public class PublishDnsUpdatesActionTest { void testHostDnsUpdateRetriesExhausted_emailIsSent() { action = createAction( - "xn--q9jyb4c", ImmutableSet.of(), ImmutableSet.of("ns1.example.xn--q9jyb4c"), 10); + "xn--q9jyb4c", + ImmutableSet.of(), + ImmutableSet.of("ns1.example.xn--q9jyb4c"), + RETRIES_BEFORE_PERMANENT_FAILURE); doThrow(new RuntimeException()).when(dnsWriter).commit(); action.run(); ArgumentCaptor contentCaptor = ArgumentCaptor.forClass(EmailMessage.class);