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.

Sign up for GitHub

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

WX-1339 Make throwExceptionOnExecuteError false for PAPI aborts #7245

Merged
merged 3 commits into from
Nov 2, 2023
Merged

WX-1339 Make throwExceptionOnExecuteError false for PAPI aborts #7245

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3859c76
Make `throwExceptionOnExecuteError` false for PAPI aborts
aednichols Nov 1, 2023
43dc4b3
Cleanup
aednichols Nov 1, 2023
87fa855
Merge branch 'develop' into aen_wx_1339
aednichols Nov 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...main/scala/cromwell/backend/google/pipelines/v2beta/api/request/AbortRequestHandler.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ trait AbortRequestHandler extends LazyLogging { this: RequestHandler =>
// The Genomics batch endpoint doesn't seem to be able to handle abort requests on V2 operations at the moment
// For now, don't batch the request and execute it on its own
def handleRequest(abortQuery: PAPIAbortRequest, batch: BatchRequest, pollingManager: ActorRef)(implicit ec: ExecutionContext): Future[Try[Unit]] = {
Future(abortQuery.httpRequest.execute()) map {
Future(abortQuery.httpRequest.setThrowExceptionOnExecuteError(false).execute()) map {
case response if response.isSuccessStatusCode =>
abortQuery.requester ! PAPIAbortRequestSuccessful(abortQuery.jobId.jobId)
Success(())
Expand Down