examples/debugging/fast_error_in_root_after_spawn.py

@@ -1,53 +0,0 @@
-'''
-fast fail test with a context.
-ensure the partially initialized sub-actor process
-doesn't cause a hang on error/cancel of the parent
-nrusery.
-
-'''
-import trio
-import tractor
-
-
-@tractor.context
-async def sleep(
-    ctx: tractor.Context,
-):
-    await trio.sleep(0.5)
-    await ctx.started()
-    await trio.sleep_forever()
-
-
-async def open_ctx(
-    n: tractor._trionics.ActorNursery
-):
-
-    # spawn both actors
-    portal = await n.start_actor(
-        name='sleeper',
-        enable_modules=[__name__],
-    )
-
-    async with portal.open_context(
-        sleep,
-    ) as (ctx, first):
-        assert first is None
-
-
-async def main():
-
-    async with tractor.open_nursery(
-        debug_mode=True,
-        loglevel='runtime',
-    ) as an:
-
-        async with trio.open_nursery() as n:
-            n.start_soon(open_ctx, an)
-
-            await trio.sleep(0.2)
-            await trio.sleep(0.1)
-            assert 0
-
-
-if __name__ == '__main__':
-    trio.run(main)

tests/test_2way.py

@@ -262,7 +262,7 @@ async def test_caller_closes_ctx_after_callee_opens_stream(
             async with ctx.open_stream() as stream:
                 async for msg in stream:
                     pass
-        except tractor.ContextCancelled:
+        except trio.ClosedResourceError:
             pass
         else:
             assert 0, "Should have received closed resource error?"

tests/test_advanced_streaming.py

@@ -30,7 +30,7 @@ async def publisher(
 
         sub = 'even' if is_even(val) else 'odd'
 
-        for sub_stream in _registry[sub].copy():
+        for sub_stream in _registry[sub]:
             await sub_stream.send(val)
 
         # throttle send rate to ~1kHz

tests/test_debugger.py

@@ -307,46 +307,19 @@ def test_multi_daemon_subactors(spawn, loglevel):
     before = str(child.before.decode())
     assert "NameError" in before
 
-    # XXX: hoorayy the root clobering the child here was fixed!
-
-    # now the root actor won't clobber the bp_forever child
-    # during it's first access to the debug lock, but will instead
-    # wait for the lock to release, by the edge triggered
-    # ``_debug._no_remote_has_tty`` event before sending cancel messages
-    # (via portals) to its underlings B)
-
-    # IMO, this demonstrates the true power of SC system design.
-    child.sendline('c')
-    child.expect(r"\(Pdb\+\+\)")
-    before = str(child.before.decode())
-    assert "Attaching pdb to actor: ('bp_forever'," in before
-
-
     child.sendline('c')
+
     child.expect(r"\(Pdb\+\+\)")
     before = str(child.before.decode())
+    assert "tractor._exceptions.RemoteActorError: ('name_error'" in before
 
     try:
-        # final error in root
-        assert "tractor._exceptions.RemoteActorError: ('name_error'" in before
-
-    except AssertionError:
-    # except pexpect.exceptions.TIMEOUT:
-
-        # one last entry in the root
         child.sendline('c')
-        child.expect(r"\(Pdb\+\+\)")
-        before = str(child.before.decode())
-        assert "tractor._exceptions.RemoteActorError: ('name_error'" in before
+        child.expect(pexpect.EOF)
+    except pexpect.exceptions.TIMEOUT:
+        # Failed to exit using continue..?
 
-        # theory there should have been some msg like this from
-        # root announcing it avoided a clobber of the child's lock,
-        # but it seems unreliable in testing here to gnab it.
-        # assert "in use by child ('bp_forever'," in before
-
-    child.sendline('c')
-    # final error in root
-    assert "tractor._exceptions.RemoteActorError: ('name_error'" in before
+        child.sendline('q')
         child.expect(pexpect.EOF)
 
 
@@ -399,7 +372,7 @@ def test_multi_nested_subactors_error_through_nurseries(spawn):
     child = spawn('multi_nested_subactors_error_up_through_nurseries')
 
     # startup time can be iffy
-    # time.sleep(1)
+    time.sleep(1)
 
     for i in range(12):
         try:
@@ -481,21 +454,3 @@ def test_root_nursery_cancels_before_child_releases_tty_lock(
         assert "tractor._exceptions.RemoteActorError: ('spawner0'" in before
         assert "tractor._exceptions.RemoteActorError: ('name_error'" in before
         assert "NameError: name 'doggypants' is not defined" in before
-
-
-def test_root_cancels_child_context_during_startup(
-    spawn,
-):
-    '''Verify a fast fail in the root doesn't lock up the child reaping
-    and all while using the new context api.
-
-    '''
-    child = spawn('fast_error_in_root_after_spawn')
-
-    child.expect(r"\(Pdb\+\+\)")
-
-    before = str(child.before.decode())
-    assert "AssertionError" in before
-
-    child.sendline('c')
-    child.expect(pexpect.EOF)

tractor/_actor.py

@@ -466,7 +466,7 @@ class Actor:
                 f"already have channel(s) for {uid}:{chans}?"
             )
 
-        log.runtime(f"Registered {chan} for {uid}")  # type: ignore
+        log.trace(f"Registered {chan} for {uid}")  # type: ignore
         # append new channel
         self._peers[uid].append(chan)
 
@@ -640,7 +640,7 @@ class Actor:
 
                         break
 
-                    log.transport(   # type: ignore
+                    log.trace(   # type: ignore
                         f"Received msg {msg} from {chan.uid}")
 
                     cid = msg.get('cid')

tractor/_debug.py

@@ -110,7 +110,7 @@ class PdbwTeardown(pdbpp.Pdb):
 
 #     async with aclosing(async_stdin):
 #         async for msg in async_stdin:
-#             log.runtime(f"Stdin input:\n{msg}")
+#             log.trace(f"Stdin input:\n{msg}")
 #             # encode to bytes
 #             bmsg = str.encode(msg)
 

tractor/_discovery.py

@@ -16,14 +16,12 @@ from ._state import current_actor, _runtime_vars
 
 @asynccontextmanager
 async def get_arbiter(
-
     host: str,
     port: int,
-
 ) -> typing.AsyncGenerator[Union[Portal, LocalPortal], None]:
-    '''Return a portal instance connected to a local or remote
+    """Return a portal instance connected to a local or remote
     arbiter.
-    '''
+    """
     actor = current_actor()
 
     if not actor:
@@ -35,20 +33,16 @@ async def get_arbiter(
         yield LocalPortal(actor, Channel((host, port)))
     else:
         async with _connect_chan(host, port) as chan:
-
             async with open_portal(chan) as arb_portal:
-
                 yield arb_portal
 
 
 @asynccontextmanager
 async def get_root(
-    **kwargs,
+**kwargs,
 ) -> typing.AsyncGenerator[Union[Portal, LocalPortal], None]:
-
     host, port = _runtime_vars['_root_mailbox']
     assert host is not None
-
     async with _connect_chan(host, port) as chan:
         async with open_portal(chan, **kwargs) as portal:
             yield portal
@@ -66,16 +60,12 @@ async def find_actor(
     """
     actor = current_actor()
     async with get_arbiter(*arbiter_sockaddr or actor._arb_addr) as arb_portal:
-
         sockaddr = await arb_portal.run_from_ns('self', 'find_actor', name=name)
-
         # TODO: return portals to all available actors - for now just
         # the last one that registered
         if name == 'arbiter' and actor.is_arbiter:
             raise RuntimeError("The current actor is the arbiter")
-
         elif sockaddr:
-
             async with _connect_chan(*sockaddr) as chan:
                 async with open_portal(chan) as portal:
                     yield portal
@@ -93,12 +83,9 @@ async def wait_for_actor(
     A portal to the first registered actor is returned.
     """
     actor = current_actor()
-
     async with get_arbiter(*arbiter_sockaddr or actor._arb_addr) as arb_portal:
-
         sockaddrs = await arb_portal.run_from_ns('self', 'wait_for_actor', name=name)
         sockaddr = sockaddrs[-1]
-
         async with _connect_chan(*sockaddr) as chan:
             async with open_portal(chan) as portal:
                 yield portal

tractor/_root.py

@@ -166,11 +166,8 @@ async def open_root_actor(
                 yield actor
 
             except (Exception, trio.MultiError) as err:
-                # with trio.CancelScope(shield=True):
-                entered = await _debug._maybe_enter_pm(err)
-
-                if not entered:
-                    logger.exception("Root actor crashed:")
+                logger.exception("Actor crashed:")
+                await _debug._maybe_enter_pm(err)
 
                 # always re-raise
                 raise

tractor/_spawn.py

@@ -157,7 +157,6 @@ async def cancel_on_completion(
 
 async def do_hard_kill(
     proc: trio.Process,
-
 ) -> None:
     # NOTE: this timeout used to do nothing since we were shielding
     # the ``.wait()`` inside ``new_proc()`` which will pretty much
@@ -210,45 +209,43 @@ async def spawn_subactor(
         yield proc
 
     finally:
-        log.runtime(f"Attempting to kill {proc}")
+        log.debug(f"Attempting to kill {proc}")
 
         # XXX: do this **after** cancellation/tearfown
         # to avoid killing the process too early
         # since trio does this internally on ``__aexit__()``
 
-        # if (
-        #     is_root_process()
+        if (
+            is_root_process()
 
-        #     # XXX: basically the pre-closing of stdstreams in a
-        #     # root-processe's ``trio.Process.aclose()`` can clobber
-        #     # any existing debugger session so we avoid
-        #     and _runtime_vars['_debug_mode']
-        #     and _global_actor_in_debug is not None
-        # ):
-        #     # XXX: this is ``trio.Process.aclose()`` MINUS the
-        #     # std-streams pre-closing steps inside ``proc.__aexit__()``
-        #     # (see below) which incluses a ``Process.kill()`` call
+            # XXX: basically the pre-closing of stdstreams in a
+            # root-processe's ``trio.Process.aclose()`` can clobber
+            # any existing debugger session so we avoid
+            and _runtime_vars['_debug_mode']
+            and _global_actor_in_debug is not None
+        ):
+            # XXX: this is ``trio.Process.aclose()`` MINUS the
+            # std-streams pre-closing steps inside ``proc.__aexit__()``
+            # (see below) which incluses a ``Process.kill()`` call
 
-        #     log.error(
-        #         "Root process tty is locked in debug mode by "
-        #         f"{_global_actor_in_debug}. If the console is hanging, you "
-        #         "may need to trigger a KBI to kill any "
-        #         "not-fully-initialized" " subprocesses and allow errors "
-        #         "from `trio` to propagate"
-        #     )
-        #     try:
-        #         # one more graceful wait try can can be cancelled by KBI
-        #         # sent by user.
-        #         await proc.wait()
-
-        #     finally:
-        #         if proc.returncode is None:
-        #             # with trio.CancelScope(shield=True):
-        #             #     await proc.wait()
-
-        #             await do_hard_kill(proc)
-        # else:
+            log.critical(
+                "Root process tty is locked in debug mode by "
+                f"{_global_actor_in_debug}. If the console is hanging, you "
+                "may need to trigger a KBI to kill any "
+                "not-fully-initialized" " subprocesses and allow errors "
+                "from `trio` to propagate"
+            )
+            try:
+                # one more graceful wait try can can be cancelled by KBI
+                # sent by user.
+                await proc.wait()
 
+            finally:
+                if proc.returncode is None:
+                    # with trio.CancelScope(shield=True):
+                    await do_hard_kill(proc)
+        else:
+            # with trio.CancelScope(shield=True):
             await do_hard_kill(proc)
 
 

tractor/_streaming.py

@@ -15,7 +15,7 @@ import warnings
 import trio
 
 from ._ipc import Channel
-from ._exceptions import unpack_error, ContextCancelled
+from ._exceptions import unpack_error
 from ._state import current_actor
 from .log import get_logger
 
@@ -135,6 +135,16 @@ class ReceiveMsgStream(trio.abc.ReceiveChannel):
 
             raise  # propagate
 
+        # except trio.Cancelled:
+        #     if not self._shielded:
+        #         # if shielded we don't propagate a cancelled
+        #         raise
+
+        # except trio.Cancelled:
+        #     # relay cancels to the remote task
+        #     await self.aclose()
+        #     raise
+
     @contextmanager
     def shield(
         self
@@ -161,7 +171,7 @@ class ReceiveMsgStream(trio.abc.ReceiveChannel):
         # https://trio.readthedocs.io/en/stable/reference-io.html#trio.abc.AsyncResource.aclose
         rx_chan = self._rx_chan
 
-        if rx_chan._closed:
+        if rx_chan._closed: # or self._eoc:
             log.warning(f"{self} is already closed")
 
             # this stream has already been closed so silently succeed as
@@ -430,24 +440,18 @@ class Context:
             self.cid
         )
 
-        # Likewise if the surrounding context has been cancelled we error here
-        # since it likely means the surrounding block was exited or
-        # killed
-
-        if self._cancel_called:
-            task = trio.lowlevel.current_task().name
-            raise ContextCancelled(
-                f'Context around {actor.uid[0]}:{task} was already cancelled!'
-            )
-
-        # XXX: If the underlying channel feeder receive mem chan has
-        # been closed then likely client code has already exited
-        # a ``.open_stream()`` block prior or there was some other
-        # unanticipated error or cancellation from ``trio``.
-
+        # XXX: If the underlying receive mem chan has been closed then
+        # likely client code has already exited a ``.open_stream()``
+        # block prior. we error here until such a time that we decide
+        # allowing streams to be "re-connected" is supported and/or
+        # a good idea.
         if recv_chan._closed:
+            task = trio.lowlevel.current_task().name
             raise trio.ClosedResourceError(
-                'The underlying channel for this stream was already closed!?')
+                f'stream for {actor.uid[0]}:{task} has already been closed.'
+                '\nRe-opening a closed stream is not yet supported!'
+                '\nConsider re-calling the containing `@tractor.context` func'
+            )
 
         async with MsgStream(
             ctx=self,

tractor/log.py

@@ -29,7 +29,7 @@ LOG_FORMAT = (
 DATE_FORMAT = '%b %d %H:%M:%S'
 LEVELS = {
     'GARBAGE': 1,
-    'TRANSPORT': 5,
+    'TRACE': 5,
     'RUNTIME': 15,
     'PDB': 500,
     'QUIET': 1000,
@@ -42,7 +42,7 @@ STD_PALETTE = {
     'INFO': 'green',
     'RUNTIME': 'white',
     'DEBUG': 'white',
-    'TRANSPORT': 'cyan',
+    'TRACE': 'cyan',
     'GARBAGE': 'blue',
 }
 BOLD_PALETTE = {
@@ -77,7 +77,7 @@ def get_logger(
     # additional levels
     for name, val in LEVELS.items():
         logging.addLevelName(val, name)
-        # ex. create ``logger.runtime()``
+        # ex. create ``logger.trace()``
         setattr(logger, name.lower(), partial(logger.log, val))
 
     return logger