-
Notifications
You must be signed in to change notification settings - Fork 596
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Monitoring script changes for GCP Batch [VS-1550] #9071
Conversation
if [[ -e /mnt/disks/cromwell_root ]] | ||
then | ||
MONITOR_MOUNT_POINT_DEFAULT=/mnt/disks/cromwell_root | ||
else | ||
MONITOR_MOUNT_POINT_DEFAULT=/cromwell_root | ||
fi | ||
|
||
MONITOR_MOUNT_POINT=${MONITOR_MOUNT_POINT:-$MONITOR_MOUNT_POINT_DEFAULT} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The only changes I made in this script are here, to allow for the possibility of different mount points.
# https://support.terra.bio/hc/en-us/articles/4403215299355-Out-of-Memory-Retry | ||
if [[ ${MEM_UNIT} == "GB" ]] | ||
if [[ -z "${MEM_UNIT:-}" ]] |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
MEM_UNIT
and MEM_SIZE
are currently not being set by the GCP Batch backend so I made these changes to do something reasonable so the integration tests can run.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We should back these changes and those below out once the issue is addressed in Cromwell.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good except the naming of the monitoring script
@@ -225,7 +225,7 @@ task MergeVatTSVs { | |||
String cloud_sdk_slim_docker | |||
} | |||
|
|||
File monitoring_script = "gs://gvs_quickstart_storage/cromwell_monitoring_script.sh" | |||
File monitoring_script = "gs://gvs_quickstart_storage/vs_1550_cromwell_monitoring_script.sh" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I presume you are going to name this something differently before this is merged?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yeah I'd like to discuss in post tomorrow how this thing should be named going forward.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
Checking the monitoring script into git and also adapting it to GCP Batch's new mount points. We should probably discuss how to version this script for use from the GVS WDLs (e.g. a naming convention for the script file that lives in he GVS bucket or something).
There are also some changes here around the
MEM_UNIT
andMEM_SIZE
environment variables that are currently not being set by Cromwell, which can be backed out once the Cromwell GCP Batch backend is updated to set them.Successful run here.