diff --git a/config/htcondor/submit/99-workspaces-submit.prod.conf b/config/htcondor/submit/99-workspaces-submit.prod.conf index bc67fadf7a91bc3d09521607c82fd3239a7fc5b5..e41607dfe941ed2d1f57c503d03221c1a56bb871 100644 --- a/config/htcondor/submit/99-workspaces-submit.prod.conf +++ b/config/htcondor/submit/99-workspaces-submit.prod.conf @@ -6,7 +6,7 @@ use ROLE : Submit PRIVATE_NETWORK_NAME = nrao.edu # Use mcilroy's correct network interface -NETWORK_INTERFACE = 146.88.1.66 +NETWORK_INTERFACE = 146.88.10.66 BIND_ALL_INTERFACES = False # while not in production yet diff --git a/docker.properties b/docker.properties index cc9bb27a357d3e8afc906544a9b6ad758413edc8..ae4ec668b1c8cad224a35205d59a390af962f965 100644 --- a/docker.properties +++ b/docker.properties @@ -24,7 +24,7 @@ edu.nrao.workspaces.CapabilitySettings.externalServiceUrl = http://capability:34 edu.nrao.workspaces.ProcessingSettings.useCasa = false edu.nrao.workspaces.ProcessingSettings.rootDirectory = /lustre/aoc/cluster/pipeline/docker/workspaces/spool edu.nrao.workspaces.ProcessingSettings.scriptLocation = /lustre/aoc/cluster/pipeline/docker/workspaces/sbin -edu.nrao.workspaces.ProcessingSettings.ramInGb = 0.21G +edu.nrao.workspaces.ProcessingSettings.ramInGb = 0.2G edu.nrao.workspaces.ProcessingSettings.CasaVersion.vlass = /home/casa/packages/pipeline/casa-6.1.3-3-pipeline-2021.1.1.32 edu.nrao.archive.workflow.config.CasaVersions.homeForReprocessing = /home/casa/packages/pipeline/current diff --git a/shared/workspaces/alembic/versions/022dfde2d95f_.py b/shared/workspaces/alembic/versions/022dfde2d95f_.py new file mode 100644 index 0000000000000000000000000000000000000000..7cb8118fad31fd207c1eff3bbec2d15e64c86882 --- /dev/null +++ b/shared/workspaces/alembic/versions/022dfde2d95f_.py @@ -0,0 +1,22 @@ +"""empty message + +Revision ID: 022dfde2d95f +Revises: af13ebf9e040, 2c28308c24cd +Create Date: 2022-10-19 09:36:31.925615 + +""" + + +# revision identifiers, used by Alembic. +revision = '022dfde2d95f' +down_revision = ('af13ebf9e040', '2c28308c24cd') +branch_labels = None +depends_on = None + + +def upgrade(): + pass + + +def downgrade(): + pass diff --git a/shared/workspaces/alembic/versions/2c28308c24cd_fix_img_caching_templates.py b/shared/workspaces/alembic/versions/2c28308c24cd_fix_img_caching_templates.py new file mode 100644 index 0000000000000000000000000000000000000000..b044c87eaefe234f17f077afcc51c842c46dc710 --- /dev/null +++ b/shared/workspaces/alembic/versions/2c28308c24cd_fix_img_caching_templates.py @@ -0,0 +1,81 @@ +"""fix img caching templates + +Revision ID: 2c28308c24cd +Revises: 2b6fb28c98cb +Create Date: 2022-10-19 08:33:38.168474 + +""" +from alembic import op + + +# revision identifiers, used by Alembic. +revision = "2c28308c24cd" +down_revision = "2b6fb28c98cb" +branch_labels = None +depends_on = None + +new_condor = """executable = vlass_image_caching.sh +arguments = {{calibration_name}} {{phase_center}} {{vlass_relative_path}} {{qa_status}} + +output = image_caching.out +error = image_caching.err +log = condor.log + +SBIN_PATH = /lustre/aoc/cluster/pipeline/$ENV(CAPO_PROFILE)/workspaces/sbin +PIMS_PATH = /lustre/aoc/cluster/pipeline/vlass_{{vlass_env}}/workspaces/bin + +should_transfer_files = yes +transfer_input_files = $ENV(HOME)/.ssh/condor_transfer, nraorsync://$(SBIN_PATH)/pycapo, nraorsync://$(PIMS_PATH)/pimscache, nraorsync://$(PIMS_PATH)/cacheImagingProducts.sh + +getenv = True +environment = "CAPO_PATH=/home/casa/capo" +requirements = (VLASS == True) && (HasLustre == True) ++partition = "VLASS" + +queue + +""" + +old_condor = """executable = vlass_image_caching.sh +arguments = {{calibration_name}} {{phase_center}} {{vlass_relative_path}} {{qa_status}} + +output = image_caching.out +error = image_caching.err +log = condor.log + +SBIN_PATH = /lustre/aoc/cluster/pipeline/$ENV(CAPO_PROFILE)/workspaces/sbin +PIMS_PATH = /lustre/aoc/cluster/pipeline/vlass_{{vlass_env}}/workspaces/bin +VLASS_DIR = {{data_location}} +should_transfer_files = yes +transfer_input_files = $ENV(HOME)/.ssh/condor_transfer, nraorsync://$(SBIN_PATH)/pycapo, nraorsync://$(PIMS_PATH)/pimscache, nraorsync://$(PIMS_PATH)/cacheImagingProducts.sh +when_to_transfer_output = ON_EXIT +transfer_output_files = .job.ad +output_destination = nraorsync://$(VLASS_DIR) ++WantIOProxy = True + +getenv = True +environment = "CAPO_PATH=/home/casa/capo" +requirements = (VLASS == True) && (HasLustre == True) ++partition = "VLASS" + +queue + +""" + + +def upgrade(): + op.execute( + f""" + UPDATE workflow_templates + SET content=E'{new_condor}' WHERE filename='vlass_image_caching.condor' + """ + ) + + +def downgrade(): + op.execute( + f""" + UPDATE workflow_templates + SET content=E'{old_condor}' WHERE filename='vlass_image_caching.condor' + """ + )