Skip to content
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

Add resource handler #178

Merged
merged 11 commits into from
Mar 6, 2025
Merged

Add resource handler #178

merged 11 commits into from
Mar 6, 2025

Conversation

Faizal-Eeman
Copy link
Contributor

@Faizal-Eeman Faizal-Eeman commented Dec 6, 2024

Description

Add generalized resource handler.

Closes #177

Testing Results

sample: HG003 downsampled
NFTest YAML: /hot/code/mmootor/GitHub/uclahs-cds/pipeline-call-gSV/nftest.yaml

  • Manta

    • output: /hot/software/pipeline/pipeline-call-gSV/Nextflow/development/pre-5.2.0/mmootor-resource-handler/gsv_discovery-all-tools-std-input/call-gSV-5.2.0/HG003/Manta-1.6.0/output/
  • Delly - gSV & gCNV

    • output: /hot/software/pipeline/pipeline-call-gSV/Nextflow/development/pre-5.2.0/mmootor-resource-handler/gsv_discovery-all-tools-std-input/call-gSV-5.2.0/HG003/DELLY-1.2.6/output/

Checklist

  • I have read the code review guidelines and the code review best practice on GitHub check-list.

  • I have reviewed the Nextflow pipeline standards.

  • The name of the branch is meaningful and well formatted following the standards, using [AD_username (or 5 letters of AD if AD is too long)]-[brief_description_of_branch].

  • I have set up or verified the branch protection rule following the github standards before opening this pull request.

  • I have added my name to the contributors listings in the manifest block in the nextflow.config as part of this pull request, am listed
    already, or do not wish to be listed. (This acknowledgement is optional.)

  • I have added the changes included in this pull request to the CHANGELOG.md under the next release version or unreleased, and updated the date.

  • I have updated the version number in the metadata.yaml and manifest block of the nextflow.config file following semver, or the version number has already been updated. (Leave it unchecked if you are unsure about new version number and discuss it with the infrastructure team in this PR.)

  • I have tested the pipeline on at least one A-mini sample with run_delly = true, run_manta = true, run_qc = true. For run_delly = true, I have tested 'variant_type' set to gSV, gCNV, and both. The paths to the test config files and output directories are captured above in the Testing Results section.

Copy link

github-actions bot commented Dec 6, 2024

Bleep bloop, I am a robot.

This is embarrassing... the main branch has test changes that haven't been merged into this branch, and I can't handle that. Please fix that and then I can fix the tests for you!

cd /path/to/your/repository/
git checkout mmootor-resource-handler
git fetch origin
git merge origin/main
git push origin

@Faizal-Eeman
Copy link
Contributor Author

Successful NFTest run on an F16 - /hot/software/pipeline/pipeline-call-gSV/Nextflow/development/pre-5.2.0/mmootor-resource-handler/sbatch-nftest-20241206T015559Z.log

@Faizal-Eeman Faizal-Eeman marked this pull request as ready for review December 6, 2024 20:58
@Faizal-Eeman Faizal-Eeman requested a review from a team as a code owner December 6, 2024 20:58
@yashpatel6
Copy link
Contributor

Bump here, can you fix the tests and make sure this is working? @Faizal-Eeman

Copy link

github-actions bot commented Mar 5, 2025

Bleep bloop, I am a robot.

Alas, some of the Nextflow configuration tests failed!

test/configtest-F16.json

@ ["params","proc_resource_params"]
- {"call_gCNV_Delly":{"cpus":"1","memory":"8 GB","retry_strategy":{"memory":{"operand":"2","strategy":"exponential"}}},"call_gSV_Delly":{"cpus":"1","memory":"8 GB","retry_strategy":{"memory":{"operand":"2","strategy":"exponential"}}},"call_gSV_Manta":{"cpus":"6","ext":{"retry_codes":[]},"memory":"8 GB","retry_strategy":{"memory":{"operand":"2","strategy":"exponential"}}},"convert_gCNV_BCF2VCF_BCFtools":{"cpus":"1","memory":"1 GB","retry_strategy":{"memory":{"operand":"2","strategy":"exponential"}}},"convert_gSV_BCF2VCF_BCFtools":{"cpus":"1","memory":"1 GB","retry_strategy":{"memory":{"operand":"2","strategy":"exponential"}}},"run_gCNV_vcf_validator_VCFtools":{"cpus":"1","memory":"1 GB","retry_strategy":{"memory":{"operand":"2","strategy":"exponential"}}},"run_gCNV_vcfstats_RTGTools":{"cpus":"1","memory":"1 GB","retry_strategy":{"memory":{"operand":"2","strategy":"exponential"}}},"run_gSV_vcf_validator_VCFtools":{"cpus":"1","memory":"1 GB","retry_strategy":{"memory":{"operand":"2","strategy":"exponential"}}},"run_gSV_vcfstats_RTGTools":{"cpus":"1","memory":"1 GB","retry_strategy":{"memory":{"operand":"2","strategy":"exponential"}}},"run_validate_PipeVal":{"cpus":"1","memory":"1 GB"}}
@ ["params","base_allocations"]
+ {"call_gCNV_Delly":{"cpus":"1","memory":"8 GB"},"call_gSV_Delly":{"cpus":"1","memory":"8 GB"},"call_gSV_Manta":{"cpus":"6","memory":"8 GB"},"convert_gCNV_BCF2VCF_BCFtools":{"cpus":"1","memory":"1 GB"},"convert_gSV_BCF2VCF_BCFtools":{"cpus":"1","memory":"1 GB"},"run_gCNV_vcf_validator_VCFtools":{"cpus":"1","memory":"1 GB"},"run_gCNV_vcfstats_RTGTools":{"cpus":"1","memory":"1 GB"},"run_gSV_vcf_validator_VCFtools":{"cpus":"1","memory":"1 GB"},"run_gSV_vcfstats_RTGTools":{"cpus":"1","memory":"1 GB"},"run_validate_PipeVal":{"cpus":"1","memory":"1 GB"}}
@ ["params","max_time"]
+ "24d 20h 31m 24s"
@ ["params","min_time"]
+ "1s"
@ ["params","retry_information"]
+ {"call_gCNV_Delly":{"memory":{"operand":"2","strategy":"exponential"}},"call_gSV_Delly":{"memory":{"operand":"2","strategy":"exponential"}},"call_gSV_Manta":{"memory":{"operand":"2","strategy":"exponential"}},"convert_gCNV_BCF2VCF_BCFtools":{"memory":{"operand":"2","strategy":"exponential"}},"convert_gSV_BCF2VCF_BCFtools":{"memory":{"operand":"2","strategy":"exponential"}},"run_gCNV_vcf_validator_VCFtools":{"memory":{"operand":"2","strategy":"exponential"}},"run_gCNV_vcfstats_RTGTools":{"memory":{"operand":"2","strategy":"exponential"}},"run_gSV_vcf_validator_VCFtools":{"memory":{"operand":"2","strategy":"exponential"}},"run_gSV_vcfstats_RTGTools":{"memory":{"operand":"2","strategy":"exponential"}}}
@ ["resource_handler"]
+ {"handle_resources":"closure()","set_resource_limit_params":"closure()","set_retry":"closure()","setup_retry":"closure()"}

If the above changes are surprising, stop and determine what happened.

If the above changes are expected, there are two ways to fix this:

  1. Automatically: Post a comment starting with "/fix-tests" (without the quotes) and I will update the tests for you (you must review my work afterwards).
  2. Manually: Follow these steps on Confluence.

@Faizal-Eeman
Copy link
Contributor Author

/fix-tests

Copy link

github-actions bot commented Mar 5, 2025

Bleep bloop, I am a robot.

I have updated all of the failing tests for you with a015ad1. You must review my work before merging this pull request!

@wiz-inc-8da00b022c
Copy link

wiz-inc-8da00b022c bot commented Mar 5, 2025

Wiz Scan Summary

Scanner Findings
Vulnerability Finding Vulnerabilities
Data Finding Sensitive Data 1 Info
Secret Finding Secrets
IaC Misconfiguration IaC Misconfigurations
Total 1 Info

View scan details in Wiz

To detect these findings earlier in the dev lifecycle, try using Wiz Code VS Code Extension.

…179)

Bumps the pipeline-submodules group with 2 updates in the / directory: [external/pipeline-Nextflow-module](https://github.com/uclahs-cds/pipeline-Nextflow-module) and [external/pipeline-Nextflow-config](https://github.com/uclahs-cds/pipeline-Nextflow-config).


Updates `external/pipeline-Nextflow-module` from `1cfa9fa` to `b1d7a78`
- [Commits](uclahs-cds/pipeline-Nextflow-module@1cfa9fa...b1d7a78)

Updates `external/pipeline-Nextflow-config` from `a4e99e0` to `07c99b8`
- [Release notes](https://github.com/uclahs-cds/pipeline-Nextflow-config/releases)
- [Commits](uclahs-cds/pipeline-Nextflow-config@a4e99e0...07c99b8)

---
updated-dependencies:
- dependency-name: external/pipeline-Nextflow-module
  dependency-type: direct:production
  dependency-group: pipeline-submodules
- dependency-name: external/pipeline-Nextflow-config
  dependency-type: direct:production
  dependency-group: pipeline-submodules
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@Faizal-Eeman
Copy link
Contributor Author

NFTest log - /hot/software/pipeline/pipeline-call-gSV/Nextflow/development/pre-5.2.0/mmootor-resource-handler/sbatch-nftest-20250305T220929Z.log

@Faizal-Eeman
Copy link
Contributor Author

Bump here, can you fix the tests and make sure this is working? @Faizal-Eeman

@yashpatel6 This PR is ready.

Copy link
Contributor

@yashpatel6 yashpatel6 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good! One comment

@Faizal-Eeman Faizal-Eeman merged commit aa5598b into main Mar 6, 2025
7 checks passed
@Faizal-Eeman Faizal-Eeman deleted the mmootor-resource-handler branch March 6, 2025 17:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Switch to using generalized resources
2 participants