Fix %err_code/%err_detail for some error:transaction-end-before-headers #270
Conversation
This file contains 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
These format codes were empty in some situations for the second (and subsequent) pipeline transactions if something went wrong with the previous transaction (e.g., client connection was aborted, server send an incomplete response body, etc.). Now a new ERR_STREAM_FAILURE error code marks all these cases.
Also simplified the leftovers logging code, removing checkLogging().
src/client_side.cc
Outdated
| if (intputToConsume && !inBuf.isEmpty()) { | ||
| debugs(83, 5, "forgetting client " << intputToConsume << " bytes: " << inBuf.length()); | ||
| inBuf.clear(); | ||
| if (!terminatedAll) { |
There was a problem hiding this comment.
This flag prevents from logging twice a transaction with zero bytes (!pipeline.nrequests is true). The second terminateAll() call is from swanSong(). We could also reset inBuf below (so that leftovers would be false upon the second call).
| http.req_sz = inBuf.length(); | ||
| // XXX: Or we died while waiting for the pinned connection to become idle. | ||
| http.setErrorUri("error:transaction-end-before-headers"); | ||
| http.updateError(bareError); |
There was a problem hiding this comment.
It looks like bareError became used after removing checkLogging() - we can probably remove it too.
This method is not responsible for inBuf cleanup. Added some other checks upon the 'terminatedAll' state.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
These format codes were empty in some situations for the second (and
subsequent) pipeline transactions if something went wrong with the
previous transaction (e.g., client connection was aborted, server
send an incomplete response body, etc.). Now a new ERR_STREAM_FAILURE
error code (together with 'WITH_CLIENT' error detail) marks all these
cases.