From 7dc1940cdbd5a380c7e7dc52a136d4292ba2e761 Mon Sep 17 00:00:00 2001 From: mcilwain Date: Fri, 15 Sep 2017 13:45:49 -0700 Subject: [PATCH] Move ResaveAllEppResources mapreduce from tools service to backend It makes sense for all mapreduces to run in backend, especially onces that are scheduled regularly to run in cron like this one now. We don't have many instances configured for the tools service anymore on some of our environments, so backend is the friendliest place for a mapreduce to run. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=168882122 --- .../server => batch}/ResaveAllEppResourcesAction.java | 4 ++-- java/google/registry/env/alpha/default/WEB-INF/cron.xml | 2 +- java/google/registry/env/common/backend/WEB-INF/web.xml | 6 ++++++ java/google/registry/env/common/tools/WEB-INF/web.xml | 6 ------ .../google/registry/env/production/default/WEB-INF/cron.xml | 2 +- java/google/registry/env/sandbox/default/WEB-INF/cron.xml | 2 +- .../registry/module/backend/BackendRequestComponent.java | 2 ++ .../google/registry/module/tools/ToolsRequestComponent.java | 2 -- .../server => batch}/ResaveAllEppResourcesActionTest.java | 2 +- .../registry/module/backend/testdata/backend_routing.txt | 1 + .../google/registry/module/tools/testdata/tools_routing.txt | 1 - .../tools/server/ResaveAllHistoryEntriesActionTest.java | 2 +- 12 files changed, 16 insertions(+), 16 deletions(-) rename java/google/registry/{tools/server => batch}/ResaveAllEppResourcesAction.java (97%) rename javatests/google/registry/{tools/server => batch}/ResaveAllEppResourcesActionTest.java (98%) diff --git a/java/google/registry/tools/server/ResaveAllEppResourcesAction.java b/java/google/registry/batch/ResaveAllEppResourcesAction.java similarity index 97% rename from java/google/registry/tools/server/ResaveAllEppResourcesAction.java rename to java/google/registry/batch/ResaveAllEppResourcesAction.java index 001dfe332..826a7b691 100644 --- a/java/google/registry/tools/server/ResaveAllEppResourcesAction.java +++ b/java/google/registry/batch/ResaveAllEppResourcesAction.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package google.registry.tools.server; +package google.registry.batch; import static google.registry.model.ofy.ObjectifyService.ofy; import static google.registry.util.PipelineUtils.createJobPath; @@ -57,7 +57,7 @@ public class ResaveAllEppResourcesAction implements Runnable { public void run() { response.sendJavaScriptRedirect(createJobPath(mrRunner .setJobName("Re-save all EPP resources") - .setModuleName("tools") + .setModuleName("backend") .runMapOnly( new ResaveAllEppResourcesActionMapper(), ImmutableList.of(EppResourceInputs.createKeyInput(EppResource.class))))); diff --git a/java/google/registry/env/alpha/default/WEB-INF/cron.xml b/java/google/registry/env/alpha/default/WEB-INF/cron.xml index f34e0f59a..3d0333ece 100644 --- a/java/google/registry/env/alpha/default/WEB-INF/cron.xml +++ b/java/google/registry/env/alpha/default/WEB-INF/cron.xml @@ -90,7 +90,7 @@ It is needed for "deleteOldCommitLogs" to work correctly. 1st monday of month 09:00 - tools + backend diff --git a/java/google/registry/env/common/backend/WEB-INF/web.xml b/java/google/registry/env/common/backend/WEB-INF/web.xml index d976425d5..5965f59dc 100644 --- a/java/google/registry/env/common/backend/WEB-INF/web.xml +++ b/java/google/registry/env/common/backend/WEB-INF/web.xml @@ -256,6 +256,12 @@ /_dr/task/deleteProberData + + + backend-servlet + /_dr/task/resaveAllEppResources + + - - tools-servlet - /_dr/task/resaveAllEppResources - - tools-servlet diff --git a/java/google/registry/env/production/default/WEB-INF/cron.xml b/java/google/registry/env/production/default/WEB-INF/cron.xml index 2af65aa50..f59be23c8 100644 --- a/java/google/registry/env/production/default/WEB-INF/cron.xml +++ b/java/google/registry/env/production/default/WEB-INF/cron.xml @@ -111,7 +111,7 @@ It is needed for "deleteOldCommitLogs" to work correctly. 1st monday of month 09:00 - tools + backend diff --git a/java/google/registry/env/sandbox/default/WEB-INF/cron.xml b/java/google/registry/env/sandbox/default/WEB-INF/cron.xml index 92acc6cba..d848ab098 100644 --- a/java/google/registry/env/sandbox/default/WEB-INF/cron.xml +++ b/java/google/registry/env/sandbox/default/WEB-INF/cron.xml @@ -149,7 +149,7 @@ It is needed for "deleteOldCommitLogs" to work correctly. 1st monday of month 09:00 - tools + backend diff --git a/java/google/registry/module/backend/BackendRequestComponent.java b/java/google/registry/module/backend/BackendRequestComponent.java index cf4543b02..6d45535df 100644 --- a/java/google/registry/module/backend/BackendRequestComponent.java +++ b/java/google/registry/module/backend/BackendRequestComponent.java @@ -26,6 +26,7 @@ import google.registry.batch.DeleteProberDataAction; import google.registry.batch.ExpandRecurringBillingEventsAction; import google.registry.batch.MapreduceEntityCleanupAction; import google.registry.batch.RefreshDnsOnHostRenameAction; +import google.registry.batch.ResaveAllEppResourcesAction; import google.registry.batch.VerifyEntityIntegrityAction; import google.registry.cron.CommitLogFanoutAction; import google.registry.cron.CronModule; @@ -132,6 +133,7 @@ interface BackendRequestComponent { RdeReporter rdeReporter(); RefreshDnsAction refreshDnsAction(); RefreshDnsOnHostRenameAction refreshDnsOnHostRenameAction(); + ResaveAllEppResourcesAction resaveAllEppResourcesAction(); SyncGroupMembersAction syncGroupMembersAction(); SyncRegistrarsSheetAction syncRegistrarsSheetAction(); TldFanoutAction tldFanoutAction(); diff --git a/java/google/registry/module/tools/ToolsRequestComponent.java b/java/google/registry/module/tools/ToolsRequestComponent.java index bd909f7cd..515d3acf2 100644 --- a/java/google/registry/module/tools/ToolsRequestComponent.java +++ b/java/google/registry/module/tools/ToolsRequestComponent.java @@ -44,7 +44,6 @@ import google.registry.tools.server.ListReservedListsAction; import google.registry.tools.server.ListTldsAction; import google.registry.tools.server.PollMapreduceAction; import google.registry.tools.server.RefreshDnsForAllDomainsAction; -import google.registry.tools.server.ResaveAllEppResourcesAction; import google.registry.tools.server.ResaveAllHistoryEntriesAction; import google.registry.tools.server.ToolsServerModule; import google.registry.tools.server.UpdatePremiumListAction; @@ -82,7 +81,6 @@ interface ToolsRequestComponent { PollMapreduceAction pollMapReduceAction(); PublishDetailReportAction publishDetailReportAction(); RefreshDnsForAllDomainsAction refreshDnsForAllDomainsAction(); - ResaveAllEppResourcesAction resaveAllEppResourcesAction(); ResaveAllHistoryEntriesAction resaveAllHistoryEntriesAction(); RestoreCommitLogsAction restoreCommitLogsAction(); UpdatePremiumListAction updatePremiumListAction(); diff --git a/javatests/google/registry/tools/server/ResaveAllEppResourcesActionTest.java b/javatests/google/registry/batch/ResaveAllEppResourcesActionTest.java similarity index 98% rename from javatests/google/registry/tools/server/ResaveAllEppResourcesActionTest.java rename to javatests/google/registry/batch/ResaveAllEppResourcesActionTest.java index 24ffacf9a..1d39f76c7 100644 --- a/javatests/google/registry/tools/server/ResaveAllEppResourcesActionTest.java +++ b/javatests/google/registry/batch/ResaveAllEppResourcesActionTest.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package google.registry.tools.server; +package google.registry.batch; import static com.google.common.truth.Truth.assertThat; import static google.registry.model.ofy.ObjectifyService.ofy; diff --git a/javatests/google/registry/module/backend/testdata/backend_routing.txt b/javatests/google/registry/module/backend/testdata/backend_routing.txt index a571e697a..cbabe5a7e 100644 --- a/javatests/google/registry/module/backend/testdata/backend_routing.txt +++ b/javatests/google/registry/module/backend/testdata/backend_routing.txt @@ -31,6 +31,7 @@ PATH CLASS METHOD /_dr/task/rdeStaging RdeStagingAction GET,POST n INTERNAL APP IGNORED /_dr/task/rdeUpload RdeUploadAction POST n INTERNAL APP IGNORED /_dr/task/refreshDnsOnHostRename RefreshDnsOnHostRenameAction GET n INTERNAL APP IGNORED +/_dr/task/resaveAllEppResources ResaveAllEppResourcesAction GET n INTERNAL,API APP ADMIN /_dr/task/syncGroupMembers SyncGroupMembersAction POST n INTERNAL APP IGNORED /_dr/task/syncRegistrarsSheet SyncRegistrarsSheetAction POST n INTERNAL APP IGNORED /_dr/task/tmchCrl TmchCrlAction POST y INTERNAL APP IGNORED diff --git a/javatests/google/registry/module/tools/testdata/tools_routing.txt b/javatests/google/registry/module/tools/testdata/tools_routing.txt index 7b1b7fc11..551c7c187 100644 --- a/javatests/google/registry/module/tools/testdata/tools_routing.txt +++ b/javatests/google/registry/module/tools/testdata/tools_routing.txt @@ -18,6 +18,5 @@ PATH CLASS METHODS OK AUTH /_dr/task/killAllEppResources KillAllEppResourcesAction POST n INTERNAL APP IGNORED /_dr/task/pollMapreduce PollMapreduceAction POST n INTERNAL APP IGNORED /_dr/task/refreshDnsForAllDomains RefreshDnsForAllDomainsAction GET n INTERNAL,API APP ADMIN -/_dr/task/resaveAllEppResources ResaveAllEppResourcesAction GET n INTERNAL,API APP ADMIN /_dr/task/resaveAllHistoryEntries ResaveAllHistoryEntriesAction GET n INTERNAL,API APP ADMIN /_dr/task/restoreCommitLogs RestoreCommitLogsAction POST y INTERNAL,API APP ADMIN diff --git a/javatests/google/registry/tools/server/ResaveAllHistoryEntriesActionTest.java b/javatests/google/registry/tools/server/ResaveAllHistoryEntriesActionTest.java index 8130612b1..15dbc6b4d 100644 --- a/javatests/google/registry/tools/server/ResaveAllHistoryEntriesActionTest.java +++ b/javatests/google/registry/tools/server/ResaveAllHistoryEntriesActionTest.java @@ -33,7 +33,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; -/** Unit tests for {@link ResaveAllEppResourcesAction}. */ +/** Unit tests for {@link ResaveAllHistoryEntriesAction}. */ @RunWith(JUnit4.class) public class ResaveAllHistoryEntriesActionTest extends MapreduceTestCase {