From 60b80121d0f8b9ea95f4b1d1bb5c9b62480eb9d3 Mon Sep 17 00:00:00 2001 From: Ben McIlwain Date: Mon, 9 May 2022 17:52:34 -0400 Subject: [PATCH] Remove cron entries for Datastore-specific jobs (#1615) We'll delete the associated code soon enough too, but it's safer to delete the cron jobs first and run in that state for a week, so we can still run them manually if need be. --- .../batch/RefreshDnsOnHostRenameAction.java | 3 + .../env/alpha/default/WEB-INF/cron.xml | 80 +------------------ .../env/crash/default/WEB-INF/cron.xml | 78 ------------------ .../env/production/default/WEB-INF/cron.xml | 76 +----------------- .../registry/env/qa/default/WEB-INF/cron.xml | 71 +--------------- .../env/sandbox/default/WEB-INF/cron.xml | 76 +----------------- 6 files changed, 7 insertions(+), 377 deletions(-) diff --git a/core/src/main/java/google/registry/batch/RefreshDnsOnHostRenameAction.java b/core/src/main/java/google/registry/batch/RefreshDnsOnHostRenameAction.java index f38a4269d..947250076 100644 --- a/core/src/main/java/google/registry/batch/RefreshDnsOnHostRenameAction.java +++ b/core/src/main/java/google/registry/batch/RefreshDnsOnHostRenameAction.java @@ -49,6 +49,7 @@ import google.registry.batch.AsyncTaskMetrics.OperationResult; import google.registry.dns.DnsQueue; import google.registry.mapreduce.MapreduceRunner; import google.registry.mapreduce.inputs.NullInput; +import google.registry.model.annotations.DeleteAfterMigration; import google.registry.model.domain.DomainBase; import google.registry.model.host.HostResource; import google.registry.model.server.Lock; @@ -79,6 +80,8 @@ import org.joda.time.Duration; service = Action.Service.BACKEND, path = "/_dr/task/refreshDnsOnHostRename", auth = Auth.AUTH_INTERNAL_OR_ADMIN) +@DeleteAfterMigration +@Deprecated public class RefreshDnsOnHostRenameAction implements Runnable { private static final FluentLogger logger = FluentLogger.forEnclosingClass(); diff --git a/core/src/main/java/google/registry/env/alpha/default/WEB-INF/cron.xml b/core/src/main/java/google/registry/env/alpha/default/WEB-INF/cron.xml index 5816f7107..685219a4a 100644 --- a/core/src/main/java/google/registry/env/alpha/default/WEB-INF/cron.xml +++ b/core/src/main/java/google/registry/env/alpha/default/WEB-INF/cron.xml @@ -80,7 +80,7 @@ - + This job resaves all our resources, projected in time to "now". It is needed for "deleteOldCommitLogs" to work correctly. @@ -89,48 +89,6 @@ backend - - - - This job deletes unreferenced commit logs from Datastore that are older than thirty days. - Since references are only updated on save, if we want to delete "unneeded" commit logs, we - also need "resaveAllEppResources" to run periodically. - - 3rd monday of month 09:00 - backend - - - - - - This job checkpoints the commit log buckets and exports the diff since last checkpoint to GCS. - - every 3 minutes synchronized - backend - - - - - - This job runs a mapreduce that processes batch asynchronous deletions of - contact and host resources by mapping over all EppResources and checking - for any references to the contacts/hosts in pending deletion. - - every 5 minutes synchronized - backend - - - - - - This job runs a mapreduce that asynchronously handles DNS refreshes for - host renames by mapping over all domains and creating DNS refresh tasks - for any domains that reference a renamed host. - - every 5 minutes synchronized - backend - - @@ -152,23 +110,6 @@ backend - - - - This job fires off a Datastore managed-export job that generates snapshot files in GCS. - It also enqueues a new task to wait on the completion of that job and then load the resulting - snapshot into bigquery. - - - every day 06:00 - backend - - - @@ -199,24 +139,6 @@ backend - - - - Replays recent commit logs from Datastore to the SQL secondary backend. - - every 3 minutes - backend - - - - - - Replays recent transactions from SQL to the Datastore secondary backend. - - every 3 minutes - backend - - diff --git a/core/src/main/java/google/registry/env/crash/default/WEB-INF/cron.xml b/core/src/main/java/google/registry/env/crash/default/WEB-INF/cron.xml index 140becd86..82c1413d3 100644 --- a/core/src/main/java/google/registry/env/crash/default/WEB-INF/cron.xml +++ b/core/src/main/java/google/registry/env/crash/default/WEB-INF/cron.xml @@ -102,55 +102,6 @@ backend - - - - - - This job runs a mapreduce that processes batch asynchronous deletions of - contact and host resources by mapping over all EppResources and checking - for any references to the contacts/hosts in pending deletion. - - every 5 minutes synchronized - backend - - - - - - This job runs a mapreduce that asynchronously handles DNS refreshes for - host renames by mapping over all domains and creating DNS refresh tasks - for any domains that reference a renamed host. - - every 5 minutes synchronized - backend - - - - @@ -200,26 +151,6 @@ backend - - - - - - Replays recent transactions from SQL to the Datastore secondary backend. - - every 3 minutes - backend - - @@ -231,13 +162,4 @@ every saturday 03:07 backend - - - - - This job runs an action that deletes all data in Cloud Datastore. - - every saturday 03:07 - backend - diff --git a/core/src/main/java/google/registry/env/production/default/WEB-INF/cron.xml b/core/src/main/java/google/registry/env/production/default/WEB-INF/cron.xml index 14fe72328..034a18780 100644 --- a/core/src/main/java/google/registry/env/production/default/WEB-INF/cron.xml +++ b/core/src/main/java/google/registry/env/production/default/WEB-INF/cron.xml @@ -103,7 +103,7 @@ - + This job resaves all our resources, projected in time to "now". It is needed for "deleteOldCommitLogs" to work correctly. @@ -121,26 +121,6 @@ backend - - - - This job deletes unreferenced commit logs from Datastore that are older than thirty days. - Since references are only updated on save, if we want to delete "unneeded" commit logs, we - also need "resaveAllEppResources" to run periodically. - - 3rd monday of month 09:00 - backend - - - - - - This job checkpoints the commit log buckets and exports the diff since last checkpoint to GCS. - - every 3 minutes synchronized - backend - - @@ -150,28 +130,6 @@ backend - - - - This job runs a mapreduce that processes batch asynchronous deletions of - contact and host resources by mapping over all EppResources and checking - for any references to the contacts/hosts in pending deletion. - - every 5 minutes synchronized - backend - - - - - - This job runs a mapreduce that asynchronously handles DNS refreshes for - host renames by mapping over all domains and creating DNS refresh tasks - for any domains that reference a renamed host. - - every 5 minutes synchronized - backend - - @@ -202,20 +160,6 @@ backend - - - - This job fires off a Datastore managed-export job that generates snapshot files in GCS. - It also enqueues a new task to wait on the completion of that job and then load the resulting - snapshot into bigquery. - - - every day 06:00 - backend - - @@ -340,24 +284,6 @@ backend - - - - Replays recent commit logs from Datastore to the SQL secondary backend. - - every 3 minutes - backend - - - - - - Replays recent transactions from SQL to the Datastore secondary backend. - - every 3 minutes - backend - - diff --git a/core/src/main/java/google/registry/env/qa/default/WEB-INF/cron.xml b/core/src/main/java/google/registry/env/qa/default/WEB-INF/cron.xml index c0b3ac91e..503f53fa8 100644 --- a/core/src/main/java/google/registry/env/qa/default/WEB-INF/cron.xml +++ b/core/src/main/java/google/registry/env/qa/default/WEB-INF/cron.xml @@ -32,7 +32,7 @@ - + This job resaves all our resources, projected in time to "now". It is needed for "deleteOldCommitLogs" to work correctly. @@ -41,39 +41,6 @@ backend - - - - This job deletes unreferenced commit logs from Datastore that are older than thirty days. - Since references are only updated on save, if we want to delete "unneeded" commit logs, we - also need "resaveAllEppResources" to run periodically. - - 3rd monday of month 09:00 - backend - - - - - - This job runs a mapreduce that processes batch asynchronous deletions of - contact and host resources by mapping over all EppResources and checking - for any references to the contacts/hosts in pending deletion. - - every 5 minutes synchronized - backend - - - - - - This job runs a mapreduce that asynchronously handles DNS refreshes for - host renames by mapping over all domains and creating DNS refresh tasks - for any domains that reference a renamed host. - - every 5 minutes synchronized - backend - - @@ -101,40 +68,4 @@ every saturday 03:07 backend - - - - - This job runs an action that deletes all data in Cloud Datastore. - - every saturday 03:07 - backend - - - - - - Replays recent commit logs from Datastore to the SQL secondary backend. - - every 3 minutes - backend - - - - - - Replays recent transactions from SQL to the Datastore secondary backend. - - every 3 minutes - backend - - - - - - This job checkpoints the commit log buckets and exports the diff since last checkpoint to GCS. - - every 3 minutes synchronized - backend - diff --git a/core/src/main/java/google/registry/env/sandbox/default/WEB-INF/cron.xml b/core/src/main/java/google/registry/env/sandbox/default/WEB-INF/cron.xml index 84127b1ee..9523227d9 100644 --- a/core/src/main/java/google/registry/env/sandbox/default/WEB-INF/cron.xml +++ b/core/src/main/java/google/registry/env/sandbox/default/WEB-INF/cron.xml @@ -87,7 +87,7 @@ - + This job resaves all our resources, projected in time to "now". It is needed for "deleteOldCommitLogs" to work correctly. @@ -96,26 +96,6 @@ backend - - - - This job deletes unreferenced commit logs from Datastore that are older than thirty days. - Since references are only updated on save, if we want to delete "unneeded" commit logs, we - also need "resaveAllEppResources" to run periodically. - - 3rd monday of month 09:00 - backend - - - - - - This job checkpoints the commit log buckets and exports the diff since last checkpoint to GCS. - - every 3 minutes synchronized - backend - - @@ -125,28 +105,6 @@ backend - - - - This job runs a mapreduce that processes batch asynchronous deletions of - contact and host resources by mapping over all EppResources and checking - for any references to the contacts/hosts in pending deletion. - - every 5 minutes synchronized - backend - - - - - - This job runs a mapreduce that asynchronously handles DNS refreshes for - host renames by mapping over all domains and creating DNS refresh tasks - for any domains that reference a renamed host. - - every 5 minutes synchronized - backend - - @@ -168,20 +126,6 @@ backend - - - - This job fires off a Datastore managed-export job that generates snapshot files in GCS. - It also enqueues a new task to wait on the completion of that job and then load the resulting - snapshot into bigquery. - - - every day 06:00 - backend - - @@ -229,24 +173,6 @@ backend - - - - Replays recent commit logs from Datastore to the SQL secondary backend. - - every 3 minutes - backend - - - - - - Replays recent transactions from SQL to the Datastore secondary backend. - - every 3 minutes - backend - -