From 339202e8791bb8a96140c900ac4c81528a7ca2d6 Mon Sep 17 00:00:00 2001 From: mcilwain Date: Fri, 1 Feb 2019 13:08:29 -0800 Subject: [PATCH] Delete the mapreduce poll action We never used it for anything. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=232024489 --- .../registry/env/common/tools/WEB-INF/web.xml | 5 - .../module/tools/ToolsRequestComponent.java | 2 - .../tools/server/PollMapreduceAction.java | 62 ------------- .../module/tools/testdata/tools_routing.txt | 1 - .../tools/server/PollMapreduceActionTest.java | 91 ------------------- 5 files changed, 161 deletions(-) delete mode 100644 java/google/registry/tools/server/PollMapreduceAction.java delete mode 100644 javatests/google/registry/tools/server/PollMapreduceActionTest.java diff --git a/java/google/registry/env/common/tools/WEB-INF/web.xml b/java/google/registry/env/common/tools/WEB-INF/web.xml index eb7dde515..5795a2063 100644 --- a/java/google/registry/env/common/tools/WEB-INF/web.xml +++ b/java/google/registry/env/common/tools/WEB-INF/web.xml @@ -121,11 +121,6 @@ /_dr/task/generateZoneFiles - - tools-servlet - /_dr/task/pollMapreduce - - diff --git a/java/google/registry/module/tools/ToolsRequestComponent.java b/java/google/registry/module/tools/ToolsRequestComponent.java index 633a38709..db56afcd0 100644 --- a/java/google/registry/module/tools/ToolsRequestComponent.java +++ b/java/google/registry/module/tools/ToolsRequestComponent.java @@ -41,7 +41,6 @@ import google.registry.tools.server.ListPremiumListsAction; import google.registry.tools.server.ListRegistrarsAction; 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.ResaveAllHistoryEntriesAction; import google.registry.tools.server.ToolsServerModule; @@ -77,7 +76,6 @@ interface ToolsRequestComponent { ListReservedListsAction listReservedListsAction(); ListTldsAction listTldsAction(); LoadTestAction loadTestAction(); - PollMapreduceAction pollMapReduceAction(); RefreshDnsForAllDomainsAction refreshDnsForAllDomainsAction(); ResaveAllHistoryEntriesAction resaveAllHistoryEntriesAction(); RestoreCommitLogsAction restoreCommitLogsAction(); diff --git a/java/google/registry/tools/server/PollMapreduceAction.java b/java/google/registry/tools/server/PollMapreduceAction.java deleted file mode 100644 index c51796c31..000000000 --- a/java/google/registry/tools/server/PollMapreduceAction.java +++ /dev/null @@ -1,62 +0,0 @@ -// Copyright 2017 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. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -package google.registry.tools.server; - -import static com.google.appengine.tools.pipeline.PipelineServiceFactory.newPipelineService; -import static google.registry.request.Action.Method.POST; -import static javax.servlet.http.HttpServletResponse.SC_OK; - -import com.google.appengine.tools.mapreduce.MapReduceResult; -import com.google.appengine.tools.pipeline.JobInfo; -import com.google.appengine.tools.pipeline.NoSuchObjectException; -import com.google.common.collect.ImmutableMap; -import google.registry.request.Action; -import google.registry.request.HttpException.InternalServerErrorException; -import google.registry.request.JsonResponse; -import google.registry.request.Parameter; -import google.registry.request.auth.Auth; -import javax.inject.Inject; - -/** Action to poll the status of a mapreduce job. */ -@Action( - service = Action.Service.TOOLS, - path = PollMapreduceAction.PATH, - method = POST, - auth = Auth.AUTH_INTERNAL_ONLY) -public class PollMapreduceAction implements Runnable { - - public static final String PATH = "/_dr/task/pollMapreduce"; - - @Inject @Parameter("jobId") String jobId; - @Inject JsonResponse response; - @Inject PollMapreduceAction() {} - - @Override - public void run() { - JobInfo jobInfo; - try { - jobInfo = newPipelineService().getJobInfo(jobId); - } catch (NoSuchObjectException e) { - throw new InternalServerErrorException("Job not found: " + e); - } - ImmutableMap.Builder json = new ImmutableMap.Builder<>(); - json.put("state", jobInfo.getJobState().toString()); - if (jobInfo.getJobState() == JobInfo.State.COMPLETED_SUCCESSFULLY) { - json.put("output", ((MapReduceResult) jobInfo.getOutput()).getOutputResult().toString()); - } - response.setPayload(json.build()); - response.setStatus(SC_OK); - } -} diff --git a/javatests/google/registry/module/tools/testdata/tools_routing.txt b/javatests/google/registry/module/tools/testdata/tools_routing.txt index 40756e6f4..71546c1c9 100644 --- a/javatests/google/registry/module/tools/testdata/tools_routing.txt +++ b/javatests/google/registry/module/tools/testdata/tools_routing.txt @@ -15,7 +15,6 @@ PATH CLASS METHODS OK AUTH /_dr/task/generateZoneFiles GenerateZoneFilesAction POST n INTERNAL,API APP ADMIN /_dr/task/killAllCommitLogs KillAllCommitLogsAction POST n INTERNAL APP IGNORED /_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/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/PollMapreduceActionTest.java b/javatests/google/registry/tools/server/PollMapreduceActionTest.java deleted file mode 100644 index d26e378ee..000000000 --- a/javatests/google/registry/tools/server/PollMapreduceActionTest.java +++ /dev/null @@ -1,91 +0,0 @@ -// Copyright 2017 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. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -package google.registry.tools.server; - -import static com.google.appengine.tools.pipeline.PipelineServiceFactory.newPipelineService; -import static com.google.common.truth.Truth.assertThat; - -import com.google.appengine.tools.mapreduce.Counters; -import com.google.appengine.tools.mapreduce.MapReduceResult; -import com.google.appengine.tools.pipeline.Job0; -import com.google.appengine.tools.pipeline.JobInfo.State; -import com.google.appengine.tools.pipeline.Value; -import google.registry.testing.FakeJsonResponse; -import google.registry.testing.mapreduce.MapreduceTestCase; -import java.util.Map; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.JUnit4; - -/** Tests for {@link PollMapreduceAction}.*/ -@RunWith(JUnit4.class) -public class PollMapreduceActionTest extends MapreduceTestCase { - - @Before - public void init() { - action = new PollMapreduceAction(); - } - - @Test - public void testPollUntilSuccess() throws Exception { - action.jobId = newPipelineService().startNewPipeline(new SuccessfulJob()); - assertThat(poll()).containsExactly("state", State.RUNNING.toString()); - executeTasksUntilEmpty("default"); - assertThat(poll()).containsExactly( - "state", State.COMPLETED_SUCCESSFULLY.toString(), "output", "foobar"); - } - - @Test - public void testPollUntilFailure() throws Exception { - action.jobId = newPipelineService().startNewPipeline(new ThrowingJob()); - assertThat(poll()).containsExactly("state", State.RUNNING.toString()); - executeTasksUntilEmpty("default"); - assertThat(poll()).containsExactly("state", State.STOPPED_BY_ERROR.toString()); - } - - Map poll() { - action.response = new FakeJsonResponse(); - action.run(); - return ((FakeJsonResponse) action.response).getResponseMap(); - } - - /** A job that returns a string. */ - static class SuccessfulJob extends Job0> { - @Override - public Value> run() { - MapReduceResult result = - new MapReduceResult() { - @Override - public Counters getCounters() { - throw new UnsupportedOperationException(); - } - - @Override - public String getOutputResult() { - return "foobar"; - }}; - return immediate(result); - } - } - - /** A job that throws a RunTimeException when run. */ - static class ThrowingJob extends Job0 { - @Override - public Value run() { - throw new RuntimeException("expected"); - } - } -}