Support timeouts in Connection.close() and Pool.release() #222
Conversation
This file contains hidden or 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
elprans
force-pushed
the
timeouts
branch
2 times, most recently
from
2dcfa46 to
dcb3816
Compare
1st1
reviewed
Nov 6, 2017
| finally: | ||
| self._con = None | ||
|
|
||
| else: | ||
| try: | ||
| await self._con.reset() | ||
| budget = timeout |
1st1
reviewed
Nov 6, 2017
| @@ -353,6 +353,9 @@ cdef class BaseProtocol(CoreProtocol): | |||
| # Abort the COPY operation on any error in | |||
| # output sink. | |||
| self._request_cancel() | |||
| # Make asyncio shut up about unretrieved | |||
| # QueryCanceledError | |||
| waiter.add_done_callback(lambda f: f.exception()) | |||
There was a problem hiding this comment.
Please make sure you have a warning here, as we fixed that stale cancellation exception warning in 3.6.2
There was a problem hiding this comment.
This is actually not about the asyncio.CancelledError, this is asyncpg.QueryCanceledError, which now propagates when an operation is cancelled.
1st1
reviewed
Nov 14, 2017
asyncpg/pool.py
Outdated
| @@ -201,7 +201,8 @@ def __init__(self, pool, *, connect_args, connect_kwargs, | |||
| await asyncio.wait_for( | |||
| self._con._protocol._wait_for_cancellation(), | |||
| timeout, loop=self._pool._loop) | |||
| budget -= time.monotonic() - started | |||
| if budget is not None: | |||
There was a problem hiding this comment.
Can you add a test that would fail without this change?
1st1
approved these changes
Nov 15, 2017
When running against a temporary cluster, make sure the default superuser and database name are 'postgres'. When PGHOST environment variable is specified, rely on the default connection spec heuristics.
Connection.close() and Pool.release() each gained the new timeout parameter. The pool.acquire() context manager now applies the passed timeout to __aexit__() as well. Connection.close() is now actually graceful. Instead of simply dropping the connection, it attempts to cancel the running query (if any), asks the server to terminate the connection and waits for the connection to terminate. To test all this properly, implement a TCP proxy, which emulates sudden connectivity loss (i.e. packets not reaching the server). Closes: #220
No Sign up for free
to join this conversation on GitHub.
Already have an account?
No 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.
Connection.close()andPool.release()each gained the newtimeoutparameter. The
pool.acquire()context manager now applies thepassed timeout to
__aexit__()as well.Connection.close()is now actually graceful. Instead of simply droppingthe connection, it attempts to cancel the running query (if any), asks
the server to terminate the connection and waits for the connection to
terminate.
To test all this properly, implement a TCP proxy, which emulates sudden
connectivity loss (i.e. packets not reaching the server).
Closes: #220