From 3613eff2042c68767aa1aed1cab4d30fe3506876 Mon Sep 17 00:00:00 2001 From: mcilwain Date: Fri, 30 Sep 2016 16:15:30 -0700 Subject: [PATCH] Add human-readable responses when manually running batch []s This will make potential issues a little nicer to debug in the future, because the person hitting these endpoints manually will immediately know why they may not be kicking off a [] console as might be expected. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=134840223 --- .../flows/async/DeleteContactsAndHostsAction.java | 2 ++ .../flows/async/RefreshDnsOnHostRenameAction.java | 8 +++++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/java/google/registry/flows/async/DeleteContactsAndHostsAction.java b/java/google/registry/flows/async/DeleteContactsAndHostsAction.java index b09d6a23c..f34b4e87f 100644 --- a/java/google/registry/flows/async/DeleteContactsAndHostsAction.java +++ b/java/google/registry/flows/async/DeleteContactsAndHostsAction.java @@ -114,6 +114,7 @@ public class DeleteContactsAndHostsAction implements Runnable { LeaseOptions.Builder.withCountLimit(maxLeaseCount()).leasePeriod(LEASE_MINUTES, MINUTES); List tasks = queue.leaseTasks(options); if (tasks.isEmpty()) { + response.setPayload("No contact/host deletion tasks in pull queue."); return; } Multiset kindCounts = HashMultiset.create(2); @@ -143,6 +144,7 @@ public class DeleteContactsAndHostsAction implements Runnable { ImmutableList deletionRequests = builder.build(); if (deletionRequests.isEmpty()) { logger.info("No asynchronous deletions to process because all were already handled."); + response.setPayload("All requested deletions of contacts/hosts have already occurred."); } else { logger.infofmt( "Processing asynchronous deletion of %d contacts and %d hosts: %s", diff --git a/java/google/registry/flows/async/RefreshDnsOnHostRenameAction.java b/java/google/registry/flows/async/RefreshDnsOnHostRenameAction.java index 430129299..9bbaf679e 100644 --- a/java/google/registry/flows/async/RefreshDnsOnHostRenameAction.java +++ b/java/google/registry/flows/async/RefreshDnsOnHostRenameAction.java @@ -81,6 +81,7 @@ public class RefreshDnsOnHostRenameAction implements Runnable { LeaseOptions.Builder.withCountLimit(maxLeaseCount()).leasePeriod(LEASE_MINUTES, MINUTES); List tasks = pullQueue.leaseTasks(options); if (tasks.isEmpty()) { + response.setPayload("No DNS refresh on host rename tasks to process in pull queue."); return; } ImmutableList.Builder requestsBuilder = new ImmutableList.Builder<>(); @@ -111,10 +112,11 @@ public class RefreshDnsOnHostRenameAction implements Runnable { if (refreshRequests.isEmpty()) { logger.info( "No asynchronous DNS refreshes to process because all renamed hosts are deleted."); - return; + response.setPayload("All requested DNS refreshes are on hosts that were since deleted."); + } else { + logger.infofmt("Processing asynchronous DNS refresh for renamed hosts: %s", hostKeys.build()); + runMapreduce(refreshRequests, tasks); } - logger.infofmt("Processing asynchronous DNS refresh for renamed hosts: %s", hostKeys.build()); - runMapreduce(refreshRequests, tasks); } private void runMapreduce(