fix: complete LongBridge scheduler migration

Co-Authored-By: Codex <noreply@openai.com>

Author: Pigbibi

.github/workflows/sync-cloud-run-env.yml

@@ -1034,6 +1034,24 @@ jobs:
           PY
           )"
 
+          desired_probe_schedule="$(CURRENT_SCHEDULE="${desired_schedule}" SCHEDULE_TIME="${probe_time}" python - <<'PY'
+          import os
+
+          current_fields = os.environ["CURRENT_SCHEDULE"].split()
+          time_fields = os.environ["SCHEDULE_TIME"].split()
+          if len(current_fields) != 5:
+              raise SystemExit(f"Cloud Scheduler schedule must have 5 fields: {os.environ['CURRENT_SCHEDULE']!r}")
+          if len(time_fields) == 5:
+              print(" ".join(time_fields))
+          elif len(time_fields) == 2:
+              print(" ".join([*time_fields, *current_fields[2:]]))
+          else:
+              raise SystemExit(
+                  f"Cloud Scheduler override must have 2 time fields or 5 cron fields: {os.environ['SCHEDULE_TIME']!r}"
+              )
+          PY
+          )"
+
           scheduler_uri="${service_url}/run"
           if [ -n "${current_schedule}" ]; then
             echo "Updating Cloud Scheduler job ${job_name} schedule to ${desired_schedule}, timezone to ${market_timezone}, and URI to ${scheduler_uri}."
@@ -1059,6 +1077,42 @@ jobs:
               --quiet
           fi
 
+          probe_job_name="${CLOUD_RUN_SERVICE}-probe-scheduler"
+          probe_uri="${service_url}/probe"
+          if gcloud scheduler jobs describe "${probe_job_name}" \
+            --project="${GCP_PROJECT_ID}" \
+            --location="${scheduler_location}" >/dev/null 2>&1; then
+            echo "Updating Cloud Scheduler probe ${probe_job_name} to ${desired_probe_schedule}."
+            gcloud scheduler jobs update http "${probe_job_name}" \
+              --project="${GCP_PROJECT_ID}" \
+              --location="${scheduler_location}" \
+              --uri="${probe_uri}" \
+              --schedule="${desired_probe_schedule}" \
+              --time-zone="${market_timezone}" \
+              --http-method=POST \
+              --oidc-service-account-email="${GCP_SCHEDULER_SERVICE_ACCOUNT}" \
+              --oidc-token-audience="${service_url}" \
+              --attempt-deadline=180s \
+              --max-retry-attempts=0 \
+              --max-retry-duration=0s \
+              --quiet
+          else
+            echo "Creating Cloud Scheduler probe ${probe_job_name} at ${desired_probe_schedule}."
+            gcloud scheduler jobs create http "${probe_job_name}" \
+              --project="${GCP_PROJECT_ID}" \
+              --location="${scheduler_location}" \
+              --uri="${probe_uri}" \
+              --schedule="${desired_probe_schedule}" \
+              --time-zone="${market_timezone}" \
+              --http-method=POST \
+              --oidc-service-account-email="${GCP_SCHEDULER_SERVICE_ACCOUNT}" \
+              --oidc-token-audience="${service_url}" \
+              --attempt-deadline=180s \
+              --max-retry-attempts=0 \
+              --max-retry-duration=0s \
+              --quiet
+          fi
+
           precheck_job_name="${CLOUD_RUN_SERVICE}-precheck-scheduler"
           precheck_uri="${service_url}/dry-run"
           if gcloud scheduler jobs describe "${precheck_job_name}" \
@@ -1095,7 +1149,7 @@ jobs:
               --quiet
           fi
 
-          managed_scheduler_jobs=("${job_name}" "${precheck_job_name}")
+          managed_scheduler_jobs=("${job_name}" "${probe_job_name}" "${precheck_job_name}")
           for managed_job_name in "${managed_scheduler_jobs[@]}"; do
             managed_job_state="$(gcloud scheduler jobs describe "${managed_job_name}" \
               --project="${GCP_PROJECT_ID}" \
@@ -1123,6 +1177,19 @@ jobs:
             esac
           done
 
+          if [ "${DEPLOYMENT_LABEL:-}" = "SG" ]; then
+            monitor_job_name="longbridge-monitor-dispatcher-scheduler"
+            if gcloud scheduler jobs describe "${monitor_job_name}" \
+              --project="${GCP_PROJECT_ID}" \
+              --location="${scheduler_location}" >/dev/null 2>&1; then
+              echo "Deleting obsolete shared monitor dispatcher ${monitor_job_name}."
+              gcloud scheduler jobs delete "${monitor_job_name}" \
+                --project="${GCP_PROJECT_ID}" \
+                --location="${scheduler_location}" \
+                --quiet
+            fi
+          fi
+
       - name: Reconcile legacy Cloud Scheduler jobs
         if: steps.config.outputs.env_sync_enabled == 'true'
         env:

scripts/reconcile_cloud_runtime.py

@@ -277,7 +277,7 @@ def ensure_latest_traffic(
 
 def _legacy_jobs_for_target(platform: str, target: RuntimeTarget) -> list[str]:
     service = target.service_name
-    jobs = [f"{service}-probe-scheduler"]
+    jobs: list[str] = []
     if service.endswith("-service"):
         base = service[: -len("-service")]
         jobs.extend([f"{base}-probe-scheduler", f"{base}-precheck-scheduler"])

tests/test_reconcile_cloud_runtime.py

@@ -159,11 +159,6 @@ def fake_run(args, *, json_output=False, dry_run=False):
         self.assertEqual(
             delete_commands,
             [
-                ("longbridge-quant-paper-service-probe-scheduler", "asia-east2"),
-                ("longbridge-quant-paper-service-probe-scheduler", "asia-east1"),
-                ("longbridge-quant-paper-service-probe-scheduler", "europe-west1"),
-                ("longbridge-quant-paper-service-probe-scheduler", "asia-northeast1"),
-                ("longbridge-quant-paper-service-probe-scheduler", "asia-south1"),
                 ("longbridge-quant-paper-probe-scheduler", "asia-east2"),
                 ("longbridge-quant-paper-probe-scheduler", "asia-east1"),
                 ("longbridge-quant-paper-probe-scheduler", "europe-west1"),

tests/test_scheduler_workflow.py

@@ -0,0 +1,12 @@
+from pathlib import Path
+
+
+def test_replacement_probe_and_precheck_exist_before_shared_dispatcher_cleanup() -> None:
+    workflow = Path(".github/workflows/sync-cloud-run-env.yml").read_text(encoding="utf-8")
+
+    probe = workflow.index('probe_job_name="${CLOUD_RUN_SERVICE}-probe-scheduler"')
+    precheck = workflow.index('precheck_job_name="${CLOUD_RUN_SERVICE}-precheck-scheduler"')
+    cleanup = workflow.index('gcloud scheduler jobs delete "${monitor_job_name}"')
+
+    assert probe < cleanup
+    assert precheck < cleanup

tests/test_sync_cloud_run_env_workflow.sh

@@ -222,20 +222,24 @@ grep -Fq 'print(" ".join(time_fields))' "$workflow_file"
 grep -Fq 'print(" ".join([*time_fields, *current_fields[2:]]))' "$workflow_file"
 grep -Fq 'gcloud scheduler jobs update http "${job_name}"' "$workflow_file"
 grep -Fq 'gcloud scheduler jobs create http "${job_name}"' "$workflow_file"
+grep -Fq 'probe_job_name="${CLOUD_RUN_SERVICE}-probe-scheduler"' "$workflow_file"
+grep -Fq 'probe_uri="${service_url}/probe"' "$workflow_file"
 grep -Fq 'precheck_job_name="${CLOUD_RUN_SERVICE}-precheck-scheduler"' "$workflow_file"
 grep -Fq 'precheck_uri="${service_url}/dry-run"' "$workflow_file"
-grep -Fq 'managed_scheduler_jobs=("${job_name}" "${precheck_job_name}")' "$workflow_file"
+grep -Fq 'managed_scheduler_jobs=("${job_name}" "${probe_job_name}" "${precheck_job_name}")' "$workflow_file"
 grep -Fq 'gcloud scheduler jobs resume "${managed_job_name}"' "$workflow_file"
 grep -Fq 'gcloud scheduler jobs pause "${managed_job_name}"' "$workflow_file"
+grep -Fq 'monitor_job_name="longbridge-monitor-dispatcher-scheduler"' "$workflow_file"
+grep -Fq 'gcloud scheduler jobs delete "${monitor_job_name}"' "$workflow_file"
 grep -Fq 'Reconcile Cloud Run traffic' "$workflow_file"
 grep -Fq 'python3 scripts/reconcile_cloud_runtime.py --platform longbridge --ensure-latest-traffic' "$workflow_file"
 grep -Fq 'Reconcile legacy Cloud Scheduler jobs' "$workflow_file"
 grep -Fq 'python3 scripts/reconcile_cloud_runtime.py --platform longbridge --delete-legacy-schedulers' "$workflow_file"
 grep -Fq -- '--schedule="${desired_schedule}"' "$workflow_file"
 grep -Fq -- '--time-zone="${market_timezone}"' "$workflow_file"
 
-if grep -Fq 'longbridge-monitor-dispatcher-scheduler' "$workflow_file"; then
-  echo "unexpected shared monitor dispatcher scheduler still present" >&2
+if grep -Fq 'monitor_uri="${service_url}/monitor-dispatch"' "$workflow_file"; then
+  echo "unexpected shared monitor dispatcher creation still present" >&2
   exit 1
 fi