Upstream: pass the correct state when freeing the last peer #959
Conversation
68fa437 to
6809708
Compare
When `peer.free` is called from `ngx_http_upstream_next` [1], the `state` argument is correctly passed. But for the last attempt that doesn't finally enter `ngx_http_upstream_next`, `peer.free` is called from `ngx_http_upstream_finalize_request` [2] with the `state` being 0, in this case the last attempt is always considered successful. But in fact it may be unsuccessful. Therefore the status should also be checked there in order to pass the correct `state`. This PR checks status against `u->conf->next_upstream` and if it should be considered unsuccessful, the `state` is set to `NGX_PEER_FAILED` before `peer.free` is called. [1]: https://github.com/nginx/nginx/blob/fd0848bdd3f7ed50a3a2cd5abe6bf4ae186927c6/src/http/ngx_http_upstream.c#L4565 [2]: https://github.com/nginx/nginx/blob/fd0848bdd3f7ed50a3a2cd5abe6bf4ae186927c6/src/http/ngx_http_upstream.c#L4748
6809708 to
4f1a151
Compare
|
The last attempt is also handled in |
@arut The last attempt does not always enter |
When
peer.freeis called fromngx_http_upstream_next1, thestateargument is correctly passed. But for the last attempt that doesn't
finally enter
ngx_http_upstream_next,peer.freeis called fromngx_http_upstream_finalize_request2 with thestatebeing 0, in thiscase the last attempt is always considered successful. But in fact it
may be unsuccessful. Therefore the status should also be checked there
in order to pass the correct
state.This PR checks status against
u->conf->next_upstreamand if it should beconsidered unsuccessful, the
stateis set toNGX_PEER_FAILEDbeforepeer.freeis called.Proposed changes
Describe the use case and detail of the change.
If this pull request addresses an issue on GitHub, make sure to reference that
issue using one of the
supported keywords.
Before creating a pull request, make sure to comply with the
Contributing Guidelines.