switch back to spot for multi-burst insar

ASFHyP3 · Dec 20, 2024 · 0e5958b · 0e5958b
1 parent a9c2e6f
commit 0e5958b
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 93 deletions.
diff --git a/.github/workflows/deploy-multi-burst-sandbox.yml b/.github/workflows/deploy-multi-burst-sandbox.yml
@@ -26,7 +26,6 @@ jobs:
             job_files: >-
               job_spec/INSAR_ISCE_BURST.yml
               job_spec/INSAR_ISCE_MULTI_BURST.yml
-              job_spec/INSAR_ISCE_MULTI_BURST_SPOT.yml
             instance_types: r6id.xlarge,r6id.2xlarge,r6id.4xlarge,r6id.8xlarge,r6idn.xlarge,r6idn.2xlarge,r6idn.4xlarge,r6idn.8xlarge
             default_max_vcpus: 640
             expanded_max_vcpus: 640

diff --git a/apps/set-batch-overrides/src/set_batch_overrides.py b/apps/set-batch-overrides/src/set_batch_overrides.py
@@ -65,9 +65,7 @@ def get_insar_isce_burst_memory(job_parameters: dict) -> str:
 def lambda_handler(event: dict, _) -> dict:
     job_type, job_parameters = event['job_type'], event['job_parameters']
 
-    # TODO revert
-    #if job_type == 'INSAR_ISCE_MULTI_BURST':
-    if job_type in ('INSAR_ISCE_MULTI_BURST', 'INSAR_ISCE_MULTI_BURST_SPOT'):
+    if job_type == 'INSAR_ISCE_MULTI_BURST':
         memory = get_insar_isce_burst_memory(job_parameters)
         omp_num_threads = INSAR_ISCE_BURST_OMP_NUM_THREADS[memory]
         return get_container_overrides(memory, omp_num_threads)

diff --git a/job_spec/INSAR_ISCE_MULTI_BURST.yml b/job_spec/INSAR_ISCE_MULTI_BURST.yml
@@ -7,7 +7,7 @@ INSAR_ISCE_MULTI_BURST:
       api_schema:
         type: array
         minItems: 1
-        maxItems: 30  # TODO limit based on Spot failure rate?
+        maxItems: 15
         # TODO: provide an example with multiple bursts
         example:
           - S1_136231_IW2_20200604T022312_VV_7C85-BURST
@@ -22,7 +22,7 @@ INSAR_ISCE_MULTI_BURST:
       api_schema:
         type: array
         minItems: 1
-        maxItems: 30  # TODO limit based on Spot failure rate?
+        maxItems: 15
         example:
           - S1_136231_IW2_20200616T022313_VV_5D11-BURST
         items:
@@ -75,7 +75,7 @@ INSAR_ISCE_MULTI_BURST:
         - --secondary
         - Ref::secondary
       timeout: 126000 # 35 hours
-      compute_environment: InsarIsceMultiBurst
+      compute_environment: Default
       vcpu: 1
       memory: 4 # Memory is always overridden by the step function
       secrets:

diff --git a/job_spec/INSAR_ISCE_MULTI_BURST_SPOT.yml b/job_spec/INSAR_ISCE_MULTI_BURST_SPOT.yml
diff --git a/job_spec/config/compute_environments.yml b/job_spec/config/compute_environments.yml
@@ -12,6 +12,3 @@ compute_environments:
   InsarIsceAria:
     allocation_type: EC2
     allocation_strategy: BEST_FIT_PROGRESSIVE
-  InsarIsceMultiBurst:
-    allocation_type: EC2
-    allocation_strategy: BEST_FIT_PROGRESSIVE