From cda4af365e1586a6e10aa2b9dd7846542d2335d4 Mon Sep 17 00:00:00 2001
From: Daniel Nemergut <dnemergu@nrao.edu>
Date: Fri, 14 Apr 2023 15:29:41 -0400
Subject: [PATCH] Conditionalizing the quicklook_url in the dag and condor
files
---
...a8adf1_pims_split_quicklook_corrections.py | 47 ++-----------------
1 file changed, 3 insertions(+), 44 deletions(-)
diff --git a/shared/workspaces/alembic/versions/762c98a8adf1_pims_split_quicklook_corrections.py b/shared/workspaces/alembic/versions/762c98a8adf1_pims_split_quicklook_corrections.py
index a8ba2aa36..c24fd6008 100644
--- a/shared/workspaces/alembic/versions/762c98a8adf1_pims_split_quicklook_corrections.py
+++ b/shared/workspaces/alembic/versions/762c98a8adf1_pims_split_quicklook_corrections.py
@@ -30,39 +30,10 @@ old_metadata = """{"systemId": "{{request_id}}", "fileSetIds": ["{{sdmId}}", "{{
new_metadata = """{"systemId": "{{request_id}}", "fileSetIds": ["{{sdmId}}", "{{calSdmId}}"], "creationTime": "{{created_at}}", "workflowName": "pims_split", "productLocator": "{{product_locator}}", "calProductLocator": "{{cal_locator}}", "destinationDirectory": "{{root_directory}}/{{relative_path}}", "token": "{{token}}", "splits": [{{#splits}}{"split_dir": "{{split_dir}}", "quicklook_url": "{{quicklook_url}}"},{{/splits}}], "casaHome": "{{casaHome}}", "data_location": "{{data_location}}", "vlass_product": "{{vlass_product}}", "existing_restore": "{{existing_restore}}", "need_project_metadata": "{{need_project_metadata}}"}"""
-# It should be safe if we pass an empty quicklook_url to the condor file since there's an empty string check in split.sh
-old_dag = """JOB RESTORE restore.condor
-VARS RESTORE jobname="$(JOB)"
-
-{{#splits}}
-JOB {{#make_condor_jobname}}{{split_dir}}{{/make_condor_jobname}} split.condor
-VARS {{#make_condor_jobname}}{{split_dir}}{{/make_condor_jobname}} jobname="$(JOB)" split_dir="{{split_dir}}" {{#quicklook_url}}quicklook_url="{{quicklook_url}}"{{/quicklook_url}}
-
-{{/splits}}
-
-JOB FINISH write_finished_file.condor
-VARS FINISH jobname="$(JOB)"
-
-PARENT RESTORE CHILD {{#splits}}{{#make_condor_jobname}}{{split_dir}}{{/make_condor_jobname}} {{/splits}}
-PARENT {{#splits}}{{#make_condor_jobname}}{{split_dir}}{{/make_condor_jobname}} {{/splits}} CHILD FINISH
-"""
-
-new_dag = """JOB RESTORE restore.condor
-VARS RESTORE jobname="$(JOB)"
-
-{{#splits}}
-JOB {{#make_condor_jobname}}{{split_dir}}{{/make_condor_jobname}} split.condor
-VARS {{#make_condor_jobname}}{{split_dir}}{{/make_condor_jobname}} jobname="$(JOB)" split_dir="{{split_dir}}" quicklook_url="{{quicklook_url}}"
-
-{{/splits}}
-
-JOB FINISH write_finished_file.condor
-VARS FINISH jobname="$(JOB)"
-
-PARENT RESTORE CHILD {{#splits}}{{#make_condor_jobname}}{{split_dir}}{{/make_condor_jobname}} {{/splits}}
-PARENT {{#splits}}{{#make_condor_jobname}}{{split_dir}}{{/make_condor_jobname}} {{/splits}} CHILD FINISH
-"""
+# Conditionalize the quicklook_url argument in the condor file
+old_condor_args = 'arguments = "$(split_dir)" "$(quicklook_url)"'
+new_condor_args = 'arguments = "$(split_dir)"{{#quicklook_url}} "$(quicklook_url)"{{/quicklook_url}}'
def upgrade():
op.execute(f"""
@@ -71,12 +42,6 @@ def upgrade():
WHERE workflow_name = 'pims_split' AND filename = 'metadata.json'
""")
- op.execute(f"""
- UPDATE workflow_templates
- SET content = E'{new_dag}'
- WHERE workflow_name = 'pims_split' AND filename = 'pims_split.dag'
- """)
-
def downgrade():
op.execute(f"""
@@ -84,9 +49,3 @@ def downgrade():
SET content = E'{old_metadata}'
WHERE workflow_name = 'pims_split' AND filename = 'metadata.json'
""")
-
- op.execute(f"""
- UPDATE workflow_templates
- SET content = E'{old_dag}'
- WHERE workflow_name = 'pims_split' AND filename = 'pims_split.dag'
- """)
--
GitLab