goodboy
/
tractor
1
0
Fork 1
Code Issues 1 Pull Requests 4 Packages Projects Releases Wiki Activity

Merge pull request #14 from tgoodlet/asyncgen_closing_fix 

Asyncgen closing fix
drop_main_kwarg
goodboy 2018-07-13 22:26:23 -04:00 committed by GitHub
parent c326a90484 1f85f71534
commit f636bfdf83
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 56 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
tractor/__init__.py
View File

@ -12,7 +12,7 @@ import traceback
import uuid
import trio
from async_generator import asynccontextmanager
from async_generator import asynccontextmanager, aclosing
from .ipc import Channel, _connect_chan
from .log import get_console_log, get_logger
@ -77,7 +77,15 @@ async def _invoke(
coro = func(**kwargs)
if inspect.isasyncgen(coro):
async for item in coro:
# XXX: massive gotcha! If the containing scope
# is cancelled and we execute the below line,
# any ``ActorNursery.__aexit__()`` WON'T be
# triggered in the underlying async gen! So we
# have to properly handle the closing (aclosing)
# of the async gen in order to be sure the cancel
# is propagated!
async with aclosing(coro) as agen:
async for item in agen:
# TODO: can we send values back in here?
# it's gonna require a `while True:` and
# some non-blocking way to retrieve new `asend()`
@ -102,14 +110,15 @@ async def _invoke(
else:
await chan.send({'return': await coro, 'cid': cid})
task_status.started()
except Exception:
log.exception("Actor errored:")
if not raise_errs:
await chan.send({'error': traceback.format_exc(), 'cid': cid})
log.exception("Actor errored:")
else:
raise
task_status.started()
async def result_from_q(q, chan):
"""Process a msg from a remote actor.
@ -444,25 +453,26 @@ class Actor:
self._process_messages, self._parent_chan)
if self.main:
with trio.open_cancel_scope() as main_scope:
self._main_scope = main_scope
try:
if self._parent_chan:
async with trio.open_nursery() as n:
self._main_scope = n.cancel_scope
log.debug(f"Starting main task `{self.main}`")
# spawned subactor so deliver "main"
# task result(s) back to parent
await nursery.start(
await n.start(
_invoke, 'main',
self._parent_chan, self.main, {},
# treat_as_gen, raise_errs params
False, True
)
else:
# run directly - we are an "unspawned actor"
with trio.open_cancel_scope() as main_scope:
self._main_scope = main_scope
# run directly we are an "unspawned actor"
log.debug(f"Running `{self.main}` directly")
result = await self.main()
finally:
self._main_complete.set()
# tear down channel server in order to ensure
# we exit normally when the main task is done
if not self._outlive_main:
@ -470,7 +480,9 @@ class Actor:
self.cancel_server()
log.debug(f"Shutting down root nursery")
nursery.cancel_scope.cancel()
if main_scope.cancelled_caught:
self._main_complete.set()
if self._main_scope.cancelled_caught:
log.debug("Main task was cancelled sucessfully")
log.debug("Waiting on root nursery to complete")
# blocks here as expected if no nursery was provided until
@ -659,6 +671,7 @@ class Portal:
log.debug(
f"Cancelling async gen call {cid} to "
f"{self.channel.uid}")
raise
return yield_from_q()
@ -874,13 +887,18 @@ class ActorNursery:
"""Wait on all subactor's main routines to complete.
"""
if etype is not None:
# XXX: hypothetically an error could be raised and then
# a cancel signal shows up slightly after in which case the
# else block here might not complete? Should both be shielded?
if etype is trio.Cancelled:
log.warn(f"{current_actor().uid} was cancelled with {etype}, "
"cancelling actor nursery")
with trio.open_cancel_scope(shield=True):
log.warn(
f"{current_actor().uid} was cancelled with {etype}"
", cancelling actor nursery")
await self.cancel()
else:
log.exception(f"{current_actor().uid} errored with {etype}, "
log.exception(
f"{current_actor().uid} errored with {etype}, "
"cancelling actor nursery")
await self.cancel()
else: