Skip to content

Fix #180: Server unable to shutdown while persistent connections exist#181

Merged
1st1 merged 2 commits into
MagicStack:masterfrom
ciscorn:fix-server-wait
Aug 1, 2018
Merged

Fix #180: Server unable to shutdown while persistent connections exist#181
1st1 merged 2 commits into
MagicStack:masterfrom
ciscorn:fix-server-wait

Conversation

@ciscorn

@ciscorn ciscorn commented Jul 8, 2018 •
edited
Loading

Copy link
Copy Markdown
Contributor

Fix #180

test results with uvloop==0.11.0 (on Python3.7):

test_aiohttp_basic_1 (test_aiohttp.Test_AIO_AioHTTP) ... ok
test_aiohttp_graceful_shutdown (test_aiohttp.Test_AIO_AioHTTP) ... ok
test_aiohttp_basic_1 (test_aiohttp.Test_UV_AioHTTP) ... ok
test_aiohttp_graceful_shutdown (test_aiohttp.Test_UV_AioHTTP) ... ERROR

After reverting 124e981:

...
test_aiohttp_basic_1 (test_aiohttp.Test_AIO_AioHTTP) ... ok
test_aiohttp_graceful_shutdown (test_aiohttp.Test_AIO_AioHTTP) ... ok
test_aiohttp_basic_1 (test_aiohttp.Test_UV_AioHTTP) ... ok
test_aiohttp_graceful_shutdown (test_aiohttp.Test_UV_AioHTTP) ... ok
...
Ran 433 tests in 56.299s

OK (skipped=16)
@ciscorn ciscorn force-pushed the fix-server-wait branch from 90d7e06 to 451110e Compare July 8, 2018 05:48
@ciscorn ciscorn changed the base branch from 0.11 to master July 8, 2018 05:49
@samuelcolvin

samuelcolvin commented Jul 13, 2018

Copy link
Copy Markdown

I can confirm this fixes shutdown behaviour with python 3.6.5 and aiohttp 3.3.2.

Would be great to get this merged and released.
@ciscorn ciscorn changed the title Fix #180 Server fails to shutdown while persistent connections exist Jul 13, 2018
@1st1

1st1 commented Jul 31, 2018

Copy link
Copy Markdown
Member

Could you please add a comment to uvloop/server.pyx explaining the code? (I don't want to reintroduce this regression in a slightly different way that the test wouldn't be able to catch)

The PR looks fine otherwise and as soon as I merge it I'll issue a bugfix release.
@ciscorn
Fix MagicStack#180 (Revert commit 124e981 and add a comment)
474d9ae 
Revert "Fix Server to wait in wait_closed() until all transports are done"
This reverts commit 124e981.
@ciscorn

ciscorn commented Jul 31, 2018

Copy link
Copy Markdown
Contributor Author

@1st1 I added a comment.
@1st1 1st1 merged commit 486f82d into MagicStack:master Aug 1, 2018
@1st1

1st1 commented Aug 1, 2018

Copy link
Copy Markdown
Member

Thank you!
1st1 pushed a commit that referenced this pull request Aug 1, 2018
@ciscorn
Fix #180: Server unable to shutdown when persistent connections exist (…
5f71e29 
…#181)

Revert "Fix Server to wait in wait_closed() until all transports are done"
This reverts commit 124e981.
@ciscorn ciscorn changed the title Fix #180: Server unable to shutdown when persistent connections exist Jul 13, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

3 participants

@ciscorn @samuelcolvin @1st1