From 8c1e0ff4de9a8f05fa21856fa2f208087723548d Mon Sep 17 00:00:00 2001
From: gbrodman <gbrodman@google.com>
Date: Tue, 12 Aug 2025 16:48:04 -0400
Subject: [PATCH] Chage run-time of DeleteExpiredDomainsAction (#2801)

We probably want this to run before the billing recurrence expansion
pipeline just in case there are any domains that should be deleted
before their billing recurrence gets expanded.
---
 .../config/files/tasks/cloud-scheduler-tasks-alpha.xml        | 4 +++-
 .../config/files/tasks/cloud-scheduler-tasks-crash.xml        | 3 ++-
 .../config/files/tasks/cloud-scheduler-tasks-production.xml   | 4 +++-
 .../registry/config/files/tasks/cloud-scheduler-tasks-qa.xml  | 3 ++-
 .../config/files/tasks/cloud-scheduler-tasks-sandbox.xml      | 4 +++-
 5 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/core/src/main/java/google/registry/config/files/tasks/cloud-scheduler-tasks-alpha.xml b/core/src/main/java/google/registry/config/files/tasks/cloud-scheduler-tasks-alpha.xml
index bebc20c89..e53acaeae 100644
--- a/core/src/main/java/google/registry/config/files/tasks/cloud-scheduler-tasks-alpha.xml
+++ b/core/src/main/java/google/registry/config/files/tasks/cloud-scheduler-tasks-alpha.xml
@@ -88,6 +88,7 @@
       should exist between the RECURRING_BILLING cursor's time and the execution
       time of the action.
     </description>
+    <!-- Runs shortly after DeleteExpiredDomainsAction so it can delete domains before they renew -->
     <schedule>0 3 * * *</schedule>
   </task>
 
@@ -98,7 +99,8 @@
       This job runs an action that deletes domains that are past their
       autorenew end date.
     </description>
-    <schedule>7 3 * * *</schedule>
+    <!-- Runs shortly before ExpandBillingRecurrencesPipeline to catch and delete domains before they renew -->
+    <schedule>45 2 * * *</schedule>
   </task>
 
   <task>
diff --git a/core/src/main/java/google/registry/config/files/tasks/cloud-scheduler-tasks-crash.xml b/core/src/main/java/google/registry/config/files/tasks/cloud-scheduler-tasks-crash.xml
index dfb7f3f7c..96be218e5 100644
--- a/core/src/main/java/google/registry/config/files/tasks/cloud-scheduler-tasks-crash.xml
+++ b/core/src/main/java/google/registry/config/files/tasks/cloud-scheduler-tasks-crash.xml
@@ -146,6 +146,7 @@
       This job runs an action that deletes domains that are past their
       autorenew end date.
     </description>
-    <schedule>7 3 * * *</schedule>
+    <!-- Runs shortly before ExpandBillingRecurrencesPipeline to catch and delete domains before they renew -->
+    <schedule>45 2 * * *</schedule>
   </task>
 </entries>
diff --git a/core/src/main/java/google/registry/config/files/tasks/cloud-scheduler-tasks-production.xml b/core/src/main/java/google/registry/config/files/tasks/cloud-scheduler-tasks-production.xml
index 584d02376..7beba48ca 100644
--- a/core/src/main/java/google/registry/config/files/tasks/cloud-scheduler-tasks-production.xml
+++ b/core/src/main/java/google/registry/config/files/tasks/cloud-scheduler-tasks-production.xml
@@ -130,6 +130,7 @@
       should exist between the RECURRING_BILLING cursor's time and the execution
       time of the action.
     </description>
+    <!-- Runs shortly after DeleteExpiredDomainsAction so it can delete domains before they renew -->
     <schedule>0 3 * * *</schedule>
   </task>
 
@@ -140,7 +141,8 @@
       This job runs an action that deletes domains that are past their
       autorenew end date.
     </description>
-    <schedule>7 3 * * *</schedule>
+    <!-- Runs shortly before ExpandBillingRecurrencesPipeline to catch and delete domains before they renew -->
+    <schedule>45 2 * * *</schedule>
   </task>
 
   <task>
diff --git a/core/src/main/java/google/registry/config/files/tasks/cloud-scheduler-tasks-qa.xml b/core/src/main/java/google/registry/config/files/tasks/cloud-scheduler-tasks-qa.xml
index 50c158ce8..67e574806 100644
--- a/core/src/main/java/google/registry/config/files/tasks/cloud-scheduler-tasks-qa.xml
+++ b/core/src/main/java/google/registry/config/files/tasks/cloud-scheduler-tasks-qa.xml
@@ -57,6 +57,7 @@
       This job runs an action that deletes domains that are past their
       autorenew end date.
     </description>
-    <schedule>7 3 * * *</schedule>
+    <!-- Runs shortly before ExpandBillingRecurrencesPipeline to catch and delete domains before they renew -->
+    <schedule>45 2 * * *</schedule>
   </task>
 </entries>
diff --git a/core/src/main/java/google/registry/config/files/tasks/cloud-scheduler-tasks-sandbox.xml b/core/src/main/java/google/registry/config/files/tasks/cloud-scheduler-tasks-sandbox.xml
index 0855c11d4..11451d54f 100644
--- a/core/src/main/java/google/registry/config/files/tasks/cloud-scheduler-tasks-sandbox.xml
+++ b/core/src/main/java/google/registry/config/files/tasks/cloud-scheduler-tasks-sandbox.xml
@@ -90,6 +90,7 @@
       should exist between the RECURRING_BILLING cursor's time and the execution
       time of the action.
     </description>
+    <!-- Runs shortly after DeleteExpiredDomainsAction so it can delete domains before they renew -->
     <schedule>0 3 * * *</schedule>
   </task>
 
@@ -113,7 +114,8 @@
       This job runs an action that deletes domains that are past their
       autorenew end date.
     </description>
-    <schedule>7 3 * * *</schedule>
+    <!-- Runs shortly before ExpandBillingRecurrencesPipeline to catch and delete domains before they renew -->
+    <schedule>45 2 * * *</schedule>
   </task>
 
   <task>