From eeb65b4610553c42ebf3c215e0d32f4a8e76fd8c Mon Sep 17 00:00:00 2001
From: weiminyu <weiminyu@google.com>
Date: Fri, 11 Jan 2019 10:56:33 -0800
Subject: [PATCH] Remove datastore export cron jobs in all environments

Remove those that call the /_dr/task/exportSnapshot endpoint.

The new export mechanism through /_dr/task/backupDatastore
has been running successfully in production.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=228908704
---
 .../env/alpha/default/WEB-INF/cron.xml         | 18 +-----------------
 .../env/crash/default/WEB-INF/cron.xml         |  8 +++++---
 .../env/production/default/WEB-INF/cron.xml    | 18 +-----------------
 .../env/sandbox/default/WEB-INF/cron.xml       | 18 +-----------------
 4 files changed, 8 insertions(+), 54 deletions(-)

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 845822129..3ce2a943c 100644
--- a/java/google/registry/env/alpha/default/WEB-INF/cron.xml
+++ b/java/google/registry/env/alpha/default/WEB-INF/cron.xml
@@ -151,23 +151,7 @@
     </description>
     <!--
       Keep google.registry.export.CheckBackupAction.MAXIMUM_BACKUP_RUNNING_TIME less than
-      this interval.
-
-      To facilitate troubleshooting, run after the exportSnapshot task below (typically finishes in
-      90 minutes in production) has completed.
-      TODO(b/122271637): move to 06:00 (UTC) when the exportSnapshot task is removed. -->
-    <schedule>every day 09:00</schedule>
-    <target>backend</target>
-  </cron>
-
-  <cron>
-    <url><![CDATA[/_dr/cron/fanout?queue=export-snapshot&endpoint=/_dr/task/exportSnapshot&runInEmpty]]></url>
-    <description>
-      This job fires off a Datastore backup-as-a-service 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.
-    </description>
-    <!-- Keep the task-age-limit for this job's task queue less than this cron interval. -->
+      this interval. -->
     <schedule>every day 06:00</schedule>
     <target>backend</target>
   </cron>
diff --git a/java/google/registry/env/crash/default/WEB-INF/cron.xml b/java/google/registry/env/crash/default/WEB-INF/cron.xml
index e4f65a0ae..a2468a0d6 100644
--- a/java/google/registry/env/crash/default/WEB-INF/cron.xml
+++ b/java/google/registry/env/crash/default/WEB-INF/cron.xml
@@ -134,13 +134,15 @@
   </cron>
 
   <cron>
-    <url><![CDATA[/_dr/cron/fanout?queue=export-snapshot&endpoint=/_dr/task/exportSnapshot&runInEmpty]]></url>
+    <url><![CDATA[/_dr/cron/fanout?queue=export-snapshot&endpoint=/_dr/task/backupDatastore&runInEmpty]]></url>
     <description>
-      This job fires off a Datastore backup-as-a-service job that generates snapshot files in GCS.
+      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.
     </description>
-    <!-- Keep the task-age-limit for this job's task queue less than this cron interval. -->
+    <!--
+      Keep google.registry.export.CheckBackupAction.MAXIMUM_BACKUP_RUNNING_TIME less than
+      this interval. -->
     <schedule>every day 06:00</schedule>
     <target>backend</target>
   </cron>
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 cf6090023..068c8f988 100644
--- a/java/google/registry/env/production/default/WEB-INF/cron.xml
+++ b/java/google/registry/env/production/default/WEB-INF/cron.xml
@@ -183,23 +183,7 @@
     </description>
     <!--
       Keep google.registry.export.CheckBackupAction.MAXIMUM_BACKUP_RUNNING_TIME less than
-      this interval.
-
-      To facilitate troubleshooting, run after the exportSnapshot task below (typically finishes in
-      90 minutes in production) has completed.
-      TODO(b/122271637): move to 06:00 (UTC) when the exportSnapshot task is removed. -->
-    <schedule>every day 09:00</schedule>
-    <target>backend</target>
-  </cron>
-
-  <cron>
-    <url><![CDATA[/_dr/cron/fanout?queue=export-snapshot&endpoint=/_dr/task/exportSnapshot&runInEmpty]]></url>
-    <description>
-      This job fires off a Datastore backup-as-a-service 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.
-    </description>
-    <!-- Keep the task-age-limit for this job's task queue less than this cron interval. -->
+      this interval. -->
     <schedule>every day 06:00</schedule>
     <target>backend</target>
   </cron>
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 a02d57f7c..b1e39d942 100644
--- a/java/google/registry/env/sandbox/default/WEB-INF/cron.xml
+++ b/java/google/registry/env/sandbox/default/WEB-INF/cron.xml
@@ -160,23 +160,7 @@
     </description>
     <!--
       Keep google.registry.export.CheckBackupAction.MAXIMUM_BACKUP_RUNNING_TIME less than
-      this interval.
-
-      To facilitate troubleshooting, run after the exportSnapshot task below (typically finishes in
-      90 minutes in production) has completed.
-      TODO(b/122271637): move to 06:00 (UTC) when the exportSnapshot task is removed. -->
-    <schedule>every day 09:00</schedule>
-    <target>backend</target>
-  </cron>
-
-  <cron>
-    <url><![CDATA[/_dr/cron/fanout?queue=export-snapshot&endpoint=/_dr/task/exportSnapshot&runInEmpty]]></url>
-    <description>
-      This job fires off a Datastore backup-as-a-service 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.
-    </description>
-    <!-- Keep the task-age-limit for this job's task queue less than this cron interval. -->
+      this interval. -->
     <schedule>every day 06:00</schedule>
     <target>backend</target>
   </cron>