-
Notifications
You must be signed in to change notification settings - Fork 1.2k
Reconstruct failure for forwarded Nexus completion requests #8198
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
Merged
Merged
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -264,10 +264,41 @@ func (h *completionHandler) forwardCompleteOperation(ctx context.Context, r *nex | |
| } | ||
| } | ||
|
|
||
| forwardReq, err := http.NewRequestWithContext(ctx, r.HTTPRequest.Method, forwardURL, r.HTTPRequest.Body) | ||
| if err != nil { | ||
| h.Logger.Error("failed to construct forwarding HTTP request", tag.Operation(apiName), tag.WorkflowNamespace(rCtx.namespace.Name().String()), tag.Error(err)) | ||
| return nexus.HandlerErrorf(nexus.HandlerErrorTypeInternal, "internal error") | ||
| var forwardReq *http.Request | ||
| switch r.State { | ||
| case nexus.OperationStateSucceeded: | ||
| // For successful operations, the Nexus framework streams the result as a LazyValue, so we can reuse the | ||
| // incoming request body. | ||
| forwardReq, err = http.NewRequestWithContext(ctx, r.HTTPRequest.Method, forwardURL, r.HTTPRequest.Body) | ||
| if err != nil { | ||
| h.Logger.Error("failed to construct forwarding HTTP request", tag.Operation(apiName), tag.WorkflowNamespace(rCtx.namespace.Name().String()), tag.Error(err)) | ||
| return nexus.HandlerErrorf(nexus.HandlerErrorTypeInternal, "internal error") | ||
| } | ||
| case nexus.OperationStateFailed, nexus.OperationStateCanceled: | ||
| // For unsuccessful operations, the Nexus framework reads and closes the original request body to deserialize | ||
| // the failure, so we must construct a new completion to forward. | ||
| var failureErr *nexus.FailureError | ||
| if !errors.As(r.Error, &failureErr) { | ||
| // This shouldn't happen as the Nexus SDK is always expected to convert Failures from the wire to | ||
| // FailureErrors. | ||
| h.Logger.Error("received unexpected error type when trying to forward Nexus operation completion", tag.WorkflowNamespace(rCtx.namespace.Name().String()), tag.Error(err)) | ||
| return nexus.HandlerErrorf(nexus.HandlerErrorTypeInternal, "internal error") | ||
| } | ||
| c := &nexus.OperationCompletionUnsuccessful{ | ||
| Header: httpHeaderToNexusHeader(r.HTTPRequest.Header), | ||
| State: r.State, | ||
| OperationToken: r.OperationToken, | ||
| StartTime: r.StartTime, | ||
| Links: r.Links, | ||
| Failure: failureErr.Failure, | ||
| } | ||
| forwardReq, err = nexus.NewCompletionHTTPRequest(ctx, forwardURL, c) | ||
| if err != nil { | ||
| h.Logger.Error("failed to construct forwarding HTTP request", tag.Operation(apiName), tag.WorkflowNamespace(rCtx.namespace.Name().String()), tag.Error(err)) | ||
| return nexus.HandlerErrorf(nexus.HandlerErrorTypeInternal, "internal error") | ||
| } | ||
| default: | ||
| return nexus.HandlerErrorf(nexus.HandlerErrorTypeBadRequest, "invalid operation state: %q", r.State) | ||
| } | ||
|
|
||
| if r.HTTPRequest.Header != nil { | ||
|
|
@@ -337,6 +368,19 @@ func isMediaTypeJSON(contentType string) bool { | |
| return err == nil && mediaType == "application/json" | ||
| } | ||
|
|
||
| // Copies HTTP request headers to Nexus headers except those starting with content- since those will be added by the client. | ||
| func httpHeaderToNexusHeader(httpHeader http.Header) nexus.Header { | ||
| header := nexus.Header{} | ||
| for k, v := range httpHeader { | ||
| lowerK := strings.ToLower(k) | ||
| if strings.HasPrefix(lowerK, "content-") { | ||
| // Nexus headers can only have single values, ignore multiple values. | ||
| header[lowerK[len("content-"):]] = v[0] | ||
|
||
| } | ||
| } | ||
| return header | ||
| } | ||
|
|
||
| type requestContext struct { | ||
| *completionHandler | ||
| logger log.Logger | ||
|
|
||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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 try out the new completion client and server once it's ready. It will simplify this code significantly.