patchback/backports/3.11/06db052eae399de1c7c34c0122d736e06c045ec7/pr-10656 - Branch - aio-libs/aiohttp

[PR #10656/06db052e backport][3.11] Revert: Close the socket if there's a failure in start_connection() #10464

#10657Merged

Comparing

patchback/backports/3.11/06db052eae399de1c7c34c0122d736e06c045ec7/pr-10656

(

d1fa9a2

) with

3.11

(

b93993d

)

Untouched: 50

Ignored: 3

Benchmarks

Passed

test_create_client_request_with_headers[pyloop]

tests/test_benchmarks_client_request.py

+1%

70 µs69.4 µs

test_send_one_hundred_websocket_text_messages_with_mask[pyloop]

tests/test_benchmarks_http_websocket.py

+1%

795.3 µs789.3 µs

test_client_request_update_cookies[pyloop]

tests/test_benchmarks_client_request.py

+1%

169.2 µs168.1 µs

test_create_client_request_with_cookies[pyloop]

tests/test_benchmarks_client_request.py

125.5 µs125 µs

test_resolve_gitapi_root[pyloop]

tests/test_benchmarks_web_urldispatcher.py

2 ms2 ms

test_simple_web_file_response[pyloop]

tests/test_benchmarks_web_fileresponse.py

78.6 ms78.4 ms

test_one_thousand_large_round_trip_websocket_text_messages[pyloop]

tests/test_benchmarks_client_ws.py

24.2 ms24.1 ms

test_one_thousand_round_trip_websocket_binary_messages[pyloop]

tests/test_benchmarks_client_ws.py

16.7 ms16.7 ms

test_send_one_hundred_websocket_compressed_messages[pyloop]

tests/test_benchmarks_http_websocket.py

3 ms3 ms

test_one_hundred_simple_get_requests_multiple_methods_route[pyloop]

tests/test_benchmarks_client.py

31.9 ms31.9 ms

test_resolve_root_route[pyloop]

tests/test_benchmarks_web_urldispatcher.py

879.8 µs879 µs

test_one_thousand_round_trip_websocket_text_messages[pyloop]

tests/test_benchmarks_client_ws.py

17.1 ms17.1 ms

test_send_client_request_one_hundred[pyloop]

tests/test_benchmarks_client_request.py

2.4 ms2.4 ms

test_resolve_static_root_route[pyloop]

tests/test_benchmarks_web_urldispatcher.py

971.5 µs971.1 µs

test_ten_streamed_responses_iter_chunked_4096[pyloop]

tests/test_benchmarks_client.py

28 ms28 ms

test_get_request_with_251308_compressed_chunked_payload[pyloop]

tests/test_benchmarks_client.py

426 ms425.9 ms

test_one_hundred_get_requests_with_1024_chunked_payload[pyloop]

tests/test_benchmarks_client.py

35.5 ms35.5 ms

test_one_hundred_json_post_requests[pyloop]

tests/test_benchmarks_client.py

38.6 ms38.6 ms

test_one_hundred_simple_get_requests[pyloop]

tests/test_benchmarks_client.py

32.2 ms32.2 ms

test_read_large_binary_websocket_messages[pyloop]

tests/test_benchmarks_http_websocket.py

9 ms9 ms

test_one_hundred_get_requests_with_512kib_content_length_payload[pyloop]

tests/test_benchmarks_client.py

164.5 ms164.5 ms

test_resolve_multiple_fixed_url_with_many_routes[pyloop]

tests/test_benchmarks_web_urldispatcher.py

2.2 ms2.2 ms

test_one_hundred_get_requests_with_30000_content_length_payload[pyloop]

tests/test_benchmarks_client.py

39.3 ms39.3 ms

test_read_one_hundred_websocket_text_messages[pyloop]

tests/test_benchmarks_http_websocket.py

266.2 µs266.3 µs

test_one_hundred_get_requests_with_1024_content_length_payload[pyloop]

tests/test_benchmarks_client.py

35 ms35.1 ms

test_send_one_hundred_websocket_text_messages[pyloop]

tests/test_benchmarks_http_websocket.py

556.6 µs557 µs

test_resolve_gitapi[pyloop]

tests/test_benchmarks_web_urldispatcher.py

296.8 ms297 ms

test_send_one_hundred_large_websocket_text_messages[pyloop]

tests/test_benchmarks_http_websocket.py

532.5 µs533.1 µs

test_simple_web_file_response_not_modified[pyloop]

tests/test_benchmarks_web_fileresponse.py

55.3 ms55.3 ms

test_resolve_multiple_level_fixed_url_with_many_routes[pyloop]

tests/test_benchmarks_web_urldispatcher.py

8.5 ms8.5 ms

test_one_hundred_get_requests_with_30000_chunked_payload[pyloop]

tests/test_benchmarks_client.py

40.4 ms40.5 ms

test_web_response_with_text_body

tests/test_benchmarks_web_response.py

654.2 µs655.3 µs

test_ten_web_middlewares[pyloop]

tests/test_benchmarks_web_middleware.py

34.9 ms35 ms

test_simple_web_stream_response

tests/test_benchmarks_web_response.py

241.9 µs242.5 µs

test_ten_streamed_responses_iter_chunked_65536[pyloop]

tests/test_benchmarks_client.py

22.8 ms22.9 ms

test_one_hundred_simple_post_requests[pyloop]

tests/test_benchmarks_client.py

36.7 ms36.8 ms

test_resolve_prefix_resources_many_prefix_many_plain[pyloop]

tests/test_benchmarks_web_urldispatcher.py

4.9 ms4.9 ms

test_resolve_dynamic_resource_url_with_many_static_routes[pyloop]

tests/test_benchmarks_web_urldispatcher.py

3.6 ms3.6 ms

test_resolve_gitapi_subapps[pyloop]

tests/test_benchmarks_web_urldispatcher.py

296.9 ms298.2 ms

test_serialize_headers

tests/test_benchmarks_http_writer.py

802.3 µs805.9 µs

test_ten_streamed_responses_iter_chunks[pyloop]

tests/test_benchmarks_client.py

16 ms16.1 ms

test_simple_web_file_sendfile_fallback_response[pyloop]

tests/test_benchmarks_web_fileresponse.py

-1%

84.2 ms84.6 ms

test_resolve_root_route_with_many_fixed_routes[pyloop]

tests/test_benchmarks_web_urldispatcher.py

-1%

877.9 µs883.3 µs

test_resolve_single_fixed_url_with_many_routes[pyloop]

tests/test_benchmarks_web_urldispatcher.py

-1%

879.7 µs885.3 µs

test_web_response_with_headers

tests/test_benchmarks_web_response.py

-1%

886.9 µs892.8 µs

test_resolve_dynamic_resource_url_with_many_dynamic_routes[pyloop]

tests/test_benchmarks_web_urldispatcher.py

-1%

3.5 ms3.6 ms

test_web_response_with_bytes_body

tests/test_benchmarks_web_response.py

-1%

539.6 µs544.3 µs

test_simple_web_response

tests/test_benchmarks_web_response.py

-1%

443.9 µs448.4 µs

test_load_cookies_into_temp_cookiejar

tests/test_benchmarks_cookiejar.py

-1%

199.9 µs202.1 µs

test_resolve_dynamic_resource_url_with_many_dynamic_routes_with_common_prefix[pyloop]

tests/test_benchmarks_web_urldispatcher.py

-2%

243 ms248.6 ms

Ignored

test_one_hundred_get_requests_iter_chunks_on_512kib_chunked_payload[pyloop]

tests/test_benchmarks_client.py

Ignored

96.8 ms96.7 ms

test_one_hundred_get_requests_with_512kib_chunked_payload[pyloop]

tests/test_benchmarks_client.py

Ignored

166.1 ms166 ms

test_ten_streamed_responses_iter_any[pyloop]

tests/test_benchmarks_client.py

Ignored

21.5 ms21.5 ms

Commits

Click on a commit to change the comparison range

Base

3.11

b93993d

-0.16%

Revert: Close the socket if there's a failure in start_connection() #10464 (#10656) Reverts #10464 While this change improved the situation for uvloop users, it caused a regression with `SelectorEventLoop` (issue #10617) The alternative fix is https://github.com/MagicStack/uvloop/pull/646 (not merged at the time of this PR) issue #10617 appears to be very similar to https://github.com/python/cpython/commit/d5aeccf9767c1619faa29e8ed61c93bde7bc5e3f If someone can come up with a working reproducer for #10617 we can revisit this. cc @top-oai Minimal implementation that shows on cancellation the socket is cleaned up without the explicit `close` https://github.com/aio-libs/aiohttp/issues/10617#issuecomment-2767890703 so this should be unneeded unless I've missed something (very possible with all the moving parts here) ## Related issue number fixes #10617 (cherry picked from commit 06db052eae399de1c7c34c0122d736e06c045ec7)

d1fa9a2

6 months ago

by bdraco

Home Terms Privacy Docs