From fedc5a78a2d50fcc6a10a0b9faab13b6e1ef0065 Mon Sep 17 00:00:00 2001
From: Nathan Bockisch <nbockisc@nrao.edu>
Date: Tue, 27 Sep 2022 13:02:17 -0400
Subject: [PATCH] Fixed slash problem in pims_split alembic file
---
docker.properties | 2 +-
...e6d54d8444_add_pimscache_split_workflow.py | 22 +++++++++++--------
2 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/docker.properties b/docker.properties
index cc9bb27a3..ae4ec668b 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/e8e6d54d8444_add_pimscache_split_workflow.py b/shared/workspaces/alembic/versions/e8e6d54d8444_add_pimscache_split_workflow.py
index a43af580e..e01df648a 100644
--- a/shared/workspaces/alembic/versions/e8e6d54d8444_add_pimscache_split_workflow.py
+++ b/shared/workspaces/alembic/versions/e8e6d54d8444_add_pimscache_split_workflow.py
@@ -101,12 +101,8 @@ queue
split_sh = """#!/bin/sh
set -o errexit
-# Something to link measurement set to rawdata directory
-# CASA envoy call?
-# Populate the cache area
-
-TILE=$(echo $1 | cut -d '/' -f 1)
-PHCENTER=$(echo $1 | cut -d '/' -f 2)
+TILE=$(echo $1 | cut -d \"/\" -f 1)
+PHCENTER=$(echo $1 | cut -d \"/\" -f 2)
# Get the measurement set path
{{^existingRestore}}
@@ -163,7 +159,7 @@ cd {{data_location}}
def upgrade():
op.execute(
"""
- INSERT INTO workflows (workflow_name) VALUES ('pims_split')
+ INSERT INTO workflows (workflow_name, uses_casa) VALUES ('pims_split', true)
"""
)
@@ -215,8 +211,16 @@ def upgrade():
VALUES ('write_finished_file.sh', E'{write_finished_file_sh}', 'pims_split')
"""
)
- pass
def downgrade():
- pass
+ op.execute(
+ """
+ DELETE FROM workflow_templates WHERE workflow_name = 'pims_split'
+ """
+ )
+ op.execute(
+ """
+ DELETE FROM workflows WHERE workflow_name = 'pims_split'
+ """
+ )
--
GitLab