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

Update TES executor to TES API v1.1 #4195

Merged
merged 19 commits into from
May 10, 2024
Merged

Update TES executor to TES API v1.1 #4195

merged 19 commits into from
May 10, 2024

Conversation

bentsherman
Copy link
Member

Summary of changes:

  • Update TES Java SDK to TES 1.1 spec
  • Deprecate NXF_EXECUTOR_TES_ENDPOINT in favor of tes.endpoint config option
  • Add support for output globs
  • Add support for output directories
  • Update docs
  • Add README with instructions for Java SDK generation

Unfortunately Funnel hasn't been updated to 1.1 yet, so I don't have an easy way to test it at the moment.

@vsmalladi can you test this PR with Azure?

git clone https://github.com/nextflow-io/nextflow -b tes-update-1.1
cd nextflow
make compile

./launch.sh run ...

Signed-off-by: Ben Sherman <bentshermann@gmail.com>
@netlify
Copy link

netlify bot commented Aug 15, 2023

Deploy Preview for nextflow-docs-staging ready!

Name Link
🔨 Latest commit 0b86d0f
🔍 Latest deploy log https://app.netlify.com/sites/nextflow-docs-staging/deploys/663e0815e503ae00080f80b5
😎 Deploy Preview https://deploy-preview-4195--nextflow-docs-staging.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site configuration.

Signed-off-by: Ben Sherman <bentshermann@gmail.com>
Signed-off-by: Ben Sherman <bentshermann@gmail.com>
Signed-off-by: Ben Sherman <bentshermann@gmail.com>
Signed-off-by: Ben Sherman <bentshermann@gmail.com>
Signed-off-by: Ben Sherman <bentshermann@gmail.com>
Signed-off-by: Ben Sherman <bentshermann@gmail.com>
Signed-off-by: Ben Sherman <bentshermann@gmail.com>
Signed-off-by: Ben Sherman <bentshermann@gmail.com>
@kellrott
Copy link

BTW, v1.1 support is being tested in Funnel PR 716

@bentsherman
Copy link
Member Author

Release candidate for Funnel with TES 1.1 support: https://github.com/ohsu-comp-bio/funnel/releases/tag/0.11.0-rc.2

Signed-off-by: Liam Beckman <lbeckman314@gmail.com>
@bentsherman bentsherman changed the title Update TES plugin to TES API v1.1 Update TES executor to TES API v1.1 Mar 24, 2024
Signed-off-by: Ben Sherman <bentshermann@gmail.com>
Signed-off-by: Ben Sherman <bentshermann@gmail.com>
@lbeckman314
Copy link
Contributor

Hi @bentsherman! Just wanted to reach out and check if there were any updates or blockers with this PR that we can help with. Let us know and we'll happy to take a look!

@bentsherman
Copy link
Member Author

We're just trying to get TES Azure to work and then I think we'll merge

@vsmalladi
Copy link
Contributor

Have an outstanding PR that is almost done. Should be able to finish this week.

Signed-off-by: Ben Sherman <bentshermann@gmail.com>

---------

Signed-off-by: Venkat Malladi <vmalladi@microsoft.com>
Signed-off-by: Ben Sherman <bentshermann@gmail.com>
Co-authored-by: Ben Sherman <bentshermann@gmail.com>
@vsmalladi
Copy link
Contributor

@bentsherman Whats the next steps to get this out of draft?

@bentsherman
Copy link
Member Author

@vsmalladi I just looked over everything in total and it looks good, you should probably do another test with TES Azure to make sure it still works with my last round of edits

Signed-off-by: Ben Sherman <bentshermann@gmail.com>
Signed-off-by: Ben Sherman <bentshermann@gmail.com>
Signed-off-by: Ben Sherman <bentshermann@gmail.com>
Signed-off-by: Ben Sherman <bentshermann@gmail.com>
@vsmalladi
Copy link
Contributor

@bentsherman built and hit this error:

ERROR ~ Unexpected error [ProviderMismatchException]

Thoughts?

@bentsherman
Copy link
Member Author

Need more context that just the error message. How you ran it, the stack trace, etc

@vsmalladi
Copy link
Contributor

@bentsherman test pass. I am able to submit to azure now. using this build.

I think we can merge this in.

@bentsherman bentsherman marked this pull request as ready for review May 9, 2024 13:44
@bentsherman bentsherman requested a review from a team as a code owner May 9, 2024 13:44
@lbeckman314
Copy link
Contributor

lbeckman314 commented May 10, 2024

Overview

Tests passing with latest Nextflow PR and Funnel. Good to merge! ✅

Installing Nextflow PR 🐍

➜ gh pr checkout 4195
# Switched to branch 'tes-update-1.1'

➜ make compile
# ./gradlew compile exportClasspath
# Starting a Gradle Daemon (subsequent builds will be faster)
# 
# BUILD SUCCESSFUL in 19s
# 49 actionable tasks: 37 executed, 12 from cache
# DONE Thu May  9 18:55:00 PDT 2024

Starting Funnel Server 🌪️

➜ brew install funnel
# ==> Installing funnel from ohsu-comp-bio/formula
# 🍺  /opt/homebrew/Cellar/funnel/0.11.0: 5 files, 81.8MB, built in 4 seconds

➜ which funnel
# /opt/homebrew/bin/funnel

➜ funnel version
# git commit: a514ca2b
# git branch: master
# git upstream: git@github.com:ohsu-comp-bio/funnel.git
# build date: 2024-04-27T04:02:37Z
# version: 0.11.0

➜ funnel server run
# server               Server listening
# httpPort             8000
# rpcAddress           :9090
# time                 2024-05-09T19:03:48-07:00

Running nf-canary tests ✅

cd ~/nf-canary

➜ cat <<EOF >> nextflow.config
// Config to use TES Executor
plugins {
  id 'nf-ga4gh'
}
process.executor = 'tes'
tes.endpoint = 'http://localhost:8000'
EOF~/nextflow/launch.sh run main.nf

 N E X T F L O W   ~  version 24.02.0-edge

 ┃ Launching `main.nf` [fabulous_lamarr] DSL2 - revision: d61ea81ba6

# Uploading local `bin` scripts folder to /Users/beckmanl/nf-canary/work/tmp/3b/7c490ef46b32227c138d65b5662de4/bin
# executor >  tes [http://localhost:8000] (13)
# executor >  tes [http://localhost:8000] (14)
# executor >  tes [http://localhost:8000] (14)
# executor >  tes [http://localhost:8000] (14)
# executor >  tes [http://localhost:8000] (14)
# executor >  tes [http://localhost:8000] (14)
[9d/473866] NF_CANARY:TEST_SUCCESS            | 1 of 1 ✔
[9f/583360] NF_CANARY:TEST_CREATE_FILE        | 1 of 1 ✔
[75/e6598e] NF_CANARY:TEST_CREATE_EMPTY_FILE  | 1 of 1 ✔
[60/75354d] NF_CANARY:TEST_CREATE_FOLDER      | 1 of 1 ✔
[7b/248ba5] NF_CANARY:TEST_INPUT (1)          | 1 of 1 ✔
[0c/bf0a94] NF_CANARY:TEST_BIN_SCRIPT         | 1 of 1 ✔
[-        ] NF_CANARY:TEST_STAGE_REMOTE       -
[3f/383a73] NF_CANARY:TEST_PASS_FILE          | 1 of 1 ✔
[51/d0335c] NF_CANARY:TEST_PASS_FOLDER        | 1 of 1 ✔
[91/e8ad57] NF_CANARY:TEST_PUBLISH_FILE       | 1 of 1 ✔
[8a/58f714] NF_CANARY:TEST_PUBLISH_FOLDER     | 1 of 1 ✔                
[ea/19b2cb] NF_CANARY:TEST_IGNORED_FAIL       | 1 of 1, failed: 1 ✔                  
[f3/99efe0] NF_CANARY:TEST_MV_FILE            | 1 of 1 ✔                             
[ce/f5fcce] NF_CANARY:TEST_MV_FOLDER_CONTENTS | 1 of 1 ✔                             
[ae/8d5187] NF_CANARY:TEST_VAL_INPUT          | 1 of 1 ✔                            
[ea/19b2cb] NOTE: Process `NF_CANARY:TEST_IGNORED_FAIL` terminated with an error exit status (1) -- Error is ignored

Signed-off-by: Ben Sherman <bentshermann@gmail.com>
@pditommaso pditommaso merged commit 7b32c2d into master May 10, 2024
22 checks passed
@pditommaso pditommaso deleted the tes-update-1.1 branch May 10, 2024 11:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants