pipelining: check for doomed connections #1075
Conversation
…tion for pipelining. Restores checks by Carlo Wood.
|
@nopjmp, thanks for your PR! By analyzing the history of the files in this pull request, we identified @bagder, @dfandrich and @captain-caveman2k to be potential reviewers. |
| @@ -2908,7 +2908,8 @@ static bool IsPipeliningPossible(const struct Curl_easy *handle, | |||
| const struct connectdata *conn) | |||
| { | |||
| /* If a HTTP protocol and pipelining is enabled */ | |||
| if(conn->handler->protocol & PROTO_FAMILY_HTTP) { | |||
| if(!conn->bits.close && | |||
| (conn->handler->protocol & PROTO_FAMILY_HTTP)) { | |||
There was a problem hiding this comment.
please review code style column alignment, you need to back it up one see the other if statements in the function for example. also it could fit on one line, for example
if((conn->handler->protocol & PROTO_FAMILY_HTTP) && !conn->bits.close) {| @@ -3283,6 +3284,12 @@ ConnectionExists(struct Curl_easy *data, | |||
| pipeLen = check->send_pipe->size + check->recv_pipe->size; | |||
|
|
|||
| if(canPipeline) { | |||
| /* | |||
| * We can not use this connection if the connection is marked for | |||
There was a problem hiding this comment.
comment is too many lines, though i know you were doing it like it is above. instead do it like
/* If the connection is marked for closure it can't be used. */
if(check->bits.close)
continue;although it seems superfluous to me, because the code implies that. you could probably eschew it
|
I agree. I was having a hard time justifying the large comment from the original patch, but I was leaving it in just in case. I also rearranged the checks like you did in the example as that made more sense to me regarding the comment before the check. |
|
Thanks, just landed. I squashed it into the previous commit and gave you attribution in the commit message as 'Participation-by:'. |
|
breaks some pipelining tests, investigating |
|
Background: All connections start off in the 'close' state and later their protocol can turn that off, for example HTTP will default to persistent connections when its protocol specific function is called. However, before the protocol specific function is called create_conn calls ConnectionExists and IsPipeliningPossible and so now that we are checking for the close bit in those functions the connections are not always pipelined, causing some tests to fail (530 584 1900 1902 1903). I'm not sure about the best way to solve this, I don't know if this should be reverted for the moment or there is some easy fix I'm missing. It seems to me that we would need a separate bit to mark a connection as |
bagder
changed the title
|
These test failures are sort of proof why Pipelining is a pain to support in the first place (and I ultimately would like to remove that support in a future). The timing sensitivity is really hard to write reliable tests for. In this case, it really seems like the tests are to blame but I would feel very uncomfortable disabling these tests since Pipelining is already shaky as it is and reducing the number of pipelining tests further is like asking for more breakage to land. This said, we can't have broken tests either so... I think we should revert the patch short-term and then see what we can do to fix the tests when trying to merge the fix back again. |
|
I did test this, but I forgot to respond. This fixes it better than the workaround Carlo Wood and others came up with at least on my horrible connection. Thanks for getting the tests working again and finding a better condition to exit on. |
Issue #627: Checks for doomed connections when selecting a connection for pipelining. Restores checks by Carlo Wood.
It appears that Rider-Linden hasn't had time to upstream this. We were bitten by this bug with our fork of their project and found this commit message as I can replicate the problem without issue on ethernet over powerline within my home. They have been using this fix / workaround for several months now.
So, I took the liberty of getting his fork rebased into a single commit and will fix any code quality changes that are recommended by the community.