Don't cancel receive streams inside `.cancel_actor()`

We don't need to any more presuming you get ideal remote cancellation
conditions where the remote actor should teardown and kill the streams
from its end.
acked_backup
Tyler Goodlet 2021-12-02 12:42:29 -05:00
parent e561a4908f
commit 14f84571fb
2 changed files with 0 additions and 3 deletions

View File

@ -218,8 +218,6 @@ class Portal:
log.cancel("This portal is already closed can't cancel") log.cancel("This portal is already closed can't cancel")
return False return False
await self._cancel_streams()
log.cancel( log.cancel(
f"Sending actor cancel request to {self.channel.uid} on " f"Sending actor cancel request to {self.channel.uid} on "
f"{self.channel}") f"{self.channel}")

View File

@ -203,7 +203,6 @@ async def soft_wait(
# which will kill any waiting remote pdb trace). # which will kill any waiting remote pdb trace).
# This is a "soft" (cancellable) join/reap. # This is a "soft" (cancellable) join/reap.
try: try:
# await proc.wait()
await wait_func(proc) await wait_func(proc)
except trio.Cancelled: except trio.Cancelled:
# if cancelled during a soft wait, cancel the child # if cancelled during a soft wait, cancel the child