Batch NORDN pull queue task deletions

They were failing because the maximum App Engine task batch size is 1,000, and
we currently have more than 4,000 tasks in the pull queue. We keep re-uploading
those to NORDN because we're unable to delete the tasks after successful upload,
so the leases expire and they get processed again.

Also renames TaskEnqueuer to TaskQueueUtils to reflect its newly expanded role.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=197060903

javatests/google/registry/backup/CommitLogCheckpointActionTest.java

@@ -31,7 +31,7 @@ import google.registry.testing.AppEngineRule;
 import google.registry.testing.FakeClock;
 import google.registry.testing.TaskQueueHelper.TaskMatcher;
 import google.registry.util.Retrier;
-import google.registry.util.TaskEnqueuer;
+import google.registry.util.TaskQueueUtils;
 import org.joda.time.DateTime;
 import org.junit.Before;
 import org.junit.Rule;
@@ -60,7 +60,7 @@ public class CommitLogCheckpointActionTest {
   public void before() throws Exception {
     task.clock = new FakeClock(now);
     task.strategy = strategy;
-    task.taskEnqueuer = new TaskEnqueuer(new Retrier(null, 1));
+    task.taskQueueUtils = new TaskQueueUtils(new Retrier(null, 1));
     when(strategy.computeCheckpoint())
         .thenReturn(
             CommitLogCheckpoint.create(

javatests/google/registry/cron/CommitLogFanoutActionTest.java

@@ -22,7 +22,7 @@ import google.registry.model.ofy.CommitLogBucket;
 import google.registry.testing.AppEngineRule;
 import google.registry.testing.TaskQueueHelper.TaskMatcher;
 import google.registry.util.Retrier;
-import google.registry.util.TaskEnqueuer;
+import google.registry.util.TaskQueueUtils;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
@@ -54,7 +54,7 @@ public class CommitLogFanoutActionTest {
   @Test
   public void testSuccess() throws Exception {
     CommitLogFanoutAction action = new CommitLogFanoutAction();
-    action.taskEnqueuer = new TaskEnqueuer(new Retrier(null, 1));
+    action.taskQueueUtils = new TaskQueueUtils(new Retrier(null, 1));
     action.endpoint = ENDPOINT;
     action.queue = QUEUE;
     action.jitterSeconds = Optional.empty();

javatests/google/registry/cron/TldFanoutActionTest.java

@@ -35,7 +35,7 @@ import google.registry.testing.AppEngineRule;
 import google.registry.testing.FakeResponse;
 import google.registry.testing.TaskQueueHelper.TaskMatcher;
 import google.registry.util.Retrier;
-import google.registry.util.TaskEnqueuer;
+import google.registry.util.TaskQueueUtils;
 import java.util.List;
 import java.util.Optional;
 import java.util.stream.Stream;
@@ -84,7 +84,7 @@ public class TldFanoutActionTest {
     action.excludes = params.containsKey("exclude")
         ? ImmutableSet.copyOf(Splitter.on(',').split(params.get("exclude").get(0)))
         : ImmutableSet.of();
-    action.taskEnqueuer = new TaskEnqueuer(new Retrier(null, 1));
+    action.taskQueueUtils = new TaskQueueUtils(new Retrier(null, 1));
     action.response = response;
     action.runInEmpty = params.containsKey("runInEmpty");
     action.forEachRealTld = params.containsKey("forEachRealTld");

javatests/google/registry/dns/ReadDnsQueueActionTest.java

@@ -47,7 +47,7 @@ import google.registry.testing.AppEngineRule;
 import google.registry.testing.FakeClock;
 import google.registry.testing.TaskQueueHelper.TaskMatcher;
 import google.registry.util.Retrier;
-import google.registry.util.TaskEnqueuer;
+import google.registry.util.TaskQueueUtils;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map.Entry;
@@ -122,7 +122,7 @@ public class ReadDnsQueueActionTest {
     action.dnsQueue = dnsQueue;
     action.dnsPublishPushQueue = QueueFactory.getQueue(DNS_PUBLISH_PUSH_QUEUE_NAME);
     action.hashFunction = Hashing.murmur3_32();
-    action.taskEnqueuer = new TaskEnqueuer(new Retrier(null, 1));
+    action.taskQueueUtils = new TaskQueueUtils(new Retrier(null, 1));
     action.jitterSeconds = Optional.empty();
     // Advance the time a little, to ensure that leaseTasks() returns all tasks.
     clock.advanceBy(Duration.standardHours(1));

javatests/google/registry/export/BigqueryPollJobActionTest.java

@@ -44,7 +44,7 @@ import google.registry.testing.TaskQueueHelper;
 import google.registry.testing.TaskQueueHelper.TaskMatcher;
 import google.registry.util.CapturingLogHandler;
 import google.registry.util.Retrier;
-import google.registry.util.TaskEnqueuer;
+import google.registry.util.TaskQueueUtils;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -71,8 +71,8 @@ public class BigqueryPollJobActionTest {
   private static final String PROJECT_ID = "project_id";
   private static final String JOB_ID = "job_id";
   private static final String CHAINED_QUEUE_NAME = UpdateSnapshotViewAction.QUEUE;
-  private static final TaskEnqueuer ENQUEUER =
-      new TaskEnqueuer(new Retrier(new FakeSleeper(new FakeClock()), 1));
+  private static final TaskQueueUtils TASK_QUEUE_UTILS =
+      new TaskQueueUtils(new Retrier(new FakeSleeper(new FakeClock()), 1));
 
   private final Bigquery bigquery = mock(Bigquery.class);
   private final Bigquery.Jobs bigqueryJobs = mock(Bigquery.Jobs.class);
@@ -86,7 +86,7 @@ public class BigqueryPollJobActionTest {
     action.bigquery = bigquery;
     when(bigquery.jobs()).thenReturn(bigqueryJobs);
     when(bigqueryJobs.get(PROJECT_ID, JOB_ID)).thenReturn(bigqueryJobsGet);
-    action.enqueuer = ENQUEUER;
+    action.taskQueueUtils = TASK_QUEUE_UTILS;
     action.projectId = PROJECT_ID;
     action.jobId = JOB_ID;
     action.chainedQueueName = () -> CHAINED_QUEUE_NAME;
@@ -103,7 +103,7 @@ public class BigqueryPollJobActionTest {
 
   @Test
   public void testSuccess_enqueuePollTask() throws Exception {
-    new BigqueryPollJobEnqueuer(ENQUEUER).enqueuePollTask(
+    new BigqueryPollJobEnqueuer(TASK_QUEUE_UTILS).enqueuePollTask(
         new JobReference().setProjectId(PROJECT_ID).setJobId(JOB_ID));
     assertTasksEnqueued(BigqueryPollJobAction.QUEUE, newPollJobTaskMatcher("GET"));
   }
@@ -115,7 +115,7 @@ public class BigqueryPollJobActionTest {
         .method(Method.POST)
         .header("X-Testing", "foo")
         .param("testing", "bar");
-    new BigqueryPollJobEnqueuer(ENQUEUER).enqueuePollTask(
+    new BigqueryPollJobEnqueuer(TASK_QUEUE_UTILS).enqueuePollTask(
         new JobReference().setProjectId(PROJECT_ID).setJobId(JOB_ID),
         chainedTask,
         getQueue(CHAINED_QUEUE_NAME));

javatests/google/registry/rde/RdeStagingActionTest.java

@@ -64,7 +64,7 @@ import google.registry.testing.mapreduce.MapreduceTestCase;
 import google.registry.tldconfig.idn.IdnTableEnum;
 import google.registry.util.Retrier;
 import google.registry.util.SystemSleeper;
-import google.registry.util.TaskEnqueuer;
+import google.registry.util.TaskQueueUtils;
 import google.registry.xjc.XjcXmlTransformer;
 import google.registry.xjc.rde.XjcRdeContentType;
 import google.registry.xjc.rde.XjcRdeDeposit;
@@ -132,7 +132,7 @@ public class RdeStagingActionTest extends MapreduceTestCase<RdeStagingAction> {
     action.mrRunner = makeDefaultRunner();
     action.lenient = false;
     action.reducer = new RdeStagingReducer(
-        new TaskEnqueuer(new Retrier(new SystemSleeper(), 1)), // taskEnqueuer
+        new TaskQueueUtils(new Retrier(new SystemSleeper(), 1)), // taskQueueUtils
         new FakeLockHandler(true),
         0, // gcsBufferSize
         "rde-bucket", // bucket

javatests/google/registry/rde/RdeUploadActionTest.java

@@ -72,7 +72,7 @@ import google.registry.testing.Lazies;
 import google.registry.testing.TaskQueueHelper.TaskMatcher;
 import google.registry.testing.sftp.SftpServerRule;
 import google.registry.util.Retrier;
-import google.registry.util.TaskEnqueuer;
+import google.registry.util.TaskQueueUtils;
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.IOException;
@@ -208,7 +208,7 @@ public class RdeUploadActionTest {
       action.stagingDecryptionKey = keyring.getRdeStagingDecryptionKey();
       action.reportQueue = QueueFactory.getQueue("rde-report");
       action.runner = runner;
-      action.taskEnqueuer = new TaskEnqueuer(new Retrier(null, 1));
+      action.taskQueueUtils = new TaskQueueUtils(new Retrier(null, 1));
       action.retrier = new Retrier(new FakeSleeper(clock), 3);
       return action;
     }

javatests/google/registry/tmch/NordnUploadActionTest.java

@@ -47,9 +47,12 @@ import google.registry.model.ofy.Ofy;
 import google.registry.model.registry.Registry;
 import google.registry.testing.AppEngineRule;
 import google.registry.testing.FakeClock;
+import google.registry.testing.FakeSleeper;
 import google.registry.testing.InjectRule;
 import google.registry.testing.MockitoJUnitRule;
 import google.registry.testing.TaskQueueHelper.TaskMatcher;
+import google.registry.util.Retrier;
+import google.registry.util.TaskQueueUtils;
 import google.registry.util.UrlFetchException;
 import java.net.URL;
 import java.util.Optional;
@@ -109,6 +112,7 @@ public class NordnUploadActionTest {
     action.fetchService = fetchService;
     action.lordnRequestInitializer = lordnRequestInitializer;
     action.phase = "claims";
+    action.taskQueueUtils = new TaskQueueUtils(new Retrier(new FakeSleeper(clock), 3));
     action.tld = "tld";
     action.tmchMarksdbUrl = "http://127.0.0.1";
   }

javatests/google/registry/util/TaskQueueUtilsTest.java

@@ -1,4 +1,4 @@
-// Copyright 2017 The Nomulus Authors. All Rights Reserved.
+// Copyright 2018 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.
@@ -17,12 +17,14 @@ package google.registry.util;
 import static com.google.appengine.api.taskqueue.TaskOptions.Builder.withUrl;
 import static com.google.common.truth.Truth.assertThat;
 import static google.registry.testing.JUnitBackports.assertThrows;
+import static google.registry.testing.TaskQueueHelper.getQueueInfo;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 import com.google.appengine.api.taskqueue.Queue;
+import com.google.appengine.api.taskqueue.QueueFactory;
 import com.google.appengine.api.taskqueue.TaskHandle;
 import com.google.appengine.api.taskqueue.TaskOptions;
 import com.google.appengine.api.taskqueue.TransientFailureException;
@@ -31,33 +33,39 @@ import google.registry.testing.AppEngineRule;
 import google.registry.testing.FakeClock;
 import google.registry.testing.FakeSleeper;
 import org.joda.time.DateTime;
+import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
 
-/** Unit tests for {@link TaskEnqueuer}. */
+/** Unit tests for {@link TaskQueueUtils}. */
 @RunWith(JUnit4.class)
-public final class TaskEnqueuerTest {
+public final class TaskQueueUtilsTest {
 
   private static final int MAX_RETRIES = 3;
+
   @Rule
-  public final AppEngineRule appEngine = AppEngineRule.builder()
-      .withDatastore()
-      .build();
+  public final AppEngineRule appEngine =
+      AppEngineRule.builder().withDatastore().withTaskQueue().build();
 
   private final FakeClock clock = new FakeClock(DateTime.parse("2000-01-01TZ"));
   private final FakeSleeper sleeper = new FakeSleeper(clock);
-  private final TaskEnqueuer taskEnqueuer =
-      new TaskEnqueuer(new Retrier(sleeper, MAX_RETRIES));
+  private final TaskQueueUtils taskQueueUtils =
+      new TaskQueueUtils(new Retrier(sleeper, MAX_RETRIES));
   private final Queue queue = mock(Queue.class);
   private final TaskOptions task = withUrl("url").taskName("name");
   private final TaskHandle handle = new TaskHandle(task, "handle");
 
+  @Before
+  public void before() {
+    TaskQueueUtils.BATCH_SIZE = 2;
+  }
+
   @Test
   public void testEnqueue_worksOnFirstTry_doesntSleep() throws Exception {
     when(queue.add(ImmutableList.of(task))).thenReturn(ImmutableList.of(handle));
-    assertThat(taskEnqueuer.enqueue(queue, task)).isSameAs(handle);
+    assertThat(taskQueueUtils.enqueue(queue, task)).isSameAs(handle);
     verify(queue).add(ImmutableList.of(task));
     assertThat(clock.nowUtc()).isEqualTo(DateTime.parse("2000-01-01TZ"));
   }
@@ -68,7 +76,7 @@ public final class TaskEnqueuerTest {
         .thenThrow(new TransientFailureException(""))
         .thenThrow(new TransientFailureException(""))
         .thenReturn(ImmutableList.of(handle));
-    assertThat(taskEnqueuer.enqueue(queue, task)).isSameAs(handle);
+    assertThat(taskQueueUtils.enqueue(queue, task)).isSameAs(handle);
     verify(queue, times(3)).add(ImmutableList.of(task));
     assertThat(clock.nowUtc()).isEqualTo(DateTime.parse("2000-01-01T00:00:00.6Z"));  // 200 + 400ms
   }
@@ -80,7 +88,7 @@ public final class TaskEnqueuerTest {
     ImmutableList<TaskHandle> handles =
         ImmutableList.of(new TaskHandle(taskA, "a"), new TaskHandle(taskB, "b"));
     when(queue.add(ImmutableList.of(taskA, taskB))).thenReturn(handles);
-    assertThat(taskEnqueuer.enqueue(queue, ImmutableList.of(taskA, taskB))).isSameAs(handles);
+    assertThat(taskQueueUtils.enqueue(queue, ImmutableList.of(taskA, taskB))).isSameAs(handles);
     assertThat(clock.nowUtc()).isEqualTo(DateTime.parse("2000-01-01TZ"));
   }
 
@@ -92,7 +100,7 @@ public final class TaskEnqueuerTest {
         .thenThrow(new TransientFailureException("three"))
         .thenThrow(new TransientFailureException("four"));
     TransientFailureException thrown =
-        assertThrows(TransientFailureException.class, () -> taskEnqueuer.enqueue(queue, task));
+        assertThrows(TransientFailureException.class, () -> taskQueueUtils.enqueue(queue, task));
     assertThat(thrown).hasMessageThat().contains("three");
   }
 
@@ -101,9 +109,27 @@ public final class TaskEnqueuerTest {
     when(queue.add(ImmutableList.of(task))).thenThrow(new TransientFailureException(""));
     try {
       Thread.currentThread().interrupt();
-      assertThrows(TransientFailureException.class, () -> taskEnqueuer.enqueue(queue, task));
+      assertThrows(TransientFailureException.class, () -> taskQueueUtils.enqueue(queue, task));
     } finally {
       Thread.interrupted();  // Clear interrupt state so it doesn't pwn other tests.
     }
   }
+
+  @Test
+  public void testDeleteTasks_usesMultipleBatches() {
+    Queue defaultQ = QueueFactory.getQueue("default");
+    TaskOptions taskOptA = withUrl("/a").taskName("a");
+    TaskOptions taskOptB = withUrl("/b").taskName("b");
+    TaskOptions taskOptC = withUrl("/c").taskName("c");
+    taskQueueUtils.enqueue(defaultQ, ImmutableList.of(taskOptA, taskOptB, taskOptC));
+    assertThat(getQueueInfo("default").getTaskInfo()).hasSize(3);
+
+    taskQueueUtils.deleteTasks(
+        defaultQ,
+        ImmutableList.of(
+            new TaskHandle(taskOptA, "default"),
+            new TaskHandle(taskOptB, "default"),
+            new TaskHandle(taskOptC, "default")));
+    assertThat(getQueueInfo("default").getTaskInfo()).hasSize(0);
+  }
 }