From 61bd6159c94766ed82c3ee066ef5f3d2e0b3e1cb Mon Sep 17 00:00:00 2001 From: ctingue Date: Fri, 19 Aug 2016 13:51:37 -0700 Subject: [PATCH] Log-and-swallow post-kickoff in DeleteEppResource ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=130787799 --- .../flows/async/DeleteEppResourceAction.java | 25 +++++++++++-------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/java/google/registry/flows/async/DeleteEppResourceAction.java b/java/google/registry/flows/async/DeleteEppResourceAction.java index b5fe402f4..0bb3234c1 100644 --- a/java/google/registry/flows/async/DeleteEppResourceAction.java +++ b/java/google/registry/flows/async/DeleteEppResourceAction.java @@ -104,16 +104,21 @@ public abstract class DeleteEppResourceAction implements mapper.setTargetResource(resourceKey); reducer.setClient(requestingClientId, isSuperuser); logger.infofmt("Executing Delete EPP resource mapreduce for %s", resourceKey); - response.sendJavaScriptRedirect(createJobPath(mrRunner - .setJobName("Check for EPP resource references and then delete") - .setModuleName("backend") - .runMapreduce( - mapper, - reducer, - ImmutableList.of( - // Add an extra shard that maps over a null domain. See the mapper code for why. - new NullInput(), - EppResourceInputs.createEntityInput(DomainBase.class))))); + try { + response.sendJavaScriptRedirect(createJobPath(mrRunner + .setJobName("Check for EPP resource references and then delete") + .setModuleName("backend") + .runMapreduce( + mapper, + reducer, + ImmutableList.of( + // Add an extra shard that maps over a null domain. See the mapper code for why. + new NullInput(), + EppResourceInputs.createEntityInput(DomainBase.class))))); + } catch (Throwable t) { + logger.severefmt( + t, "Error while kicking off DeleteEppResource MR for %s", resource.getForeignKey()); + } } /**