🐛 FIX: Task.cancel should not set state as EXCEPTED

aiida/engine/processes/calcjobs/tasks.py

@@ -8,6 +8,7 @@
 # For further information please visit http://www.aiida.net               #
 ###########################################################################
 """Transport tasks for calculation jobs."""
+import asyncio
 import functools
 import logging
 import tempfile
@@ -406,7 +407,7 @@ async def execute(self) -> plumpy.process_states.State:  # type: ignore[override
             else:
                 logger.warning(f'killed CalcJob<{node.pk}> but async future was None')
             raise
-        except (plumpy.process_states.Interruption, plumpy.futures.CancelledError):
+        except (plumpy.process_states.Interruption, plumpy.futures.CancelledError, asyncio.CancelledError):
             node.set_process_status(f'Transport task {command} was interrupted')
             raise
         else:

aiida/engine/transports.py

@@ -108,6 +108,10 @@ def do_open():
         try:
             transport_request.count += 1
             yield transport_request.future
+        except asyncio.CancelledError:  # pylint: disable=try-except-raise
+            # note this is only required in python<=3.7,
+            # where asyncio.CancelledError inherits from Exception
+            raise
         except Exception:
             _LOGGER.error('Exception whilst using transport:\n%s', traceback.format_exc())
             raise

aiida/manage/external/rmq.py

@@ -9,6 +9,7 @@
 ###########################################################################
 # pylint: disable=cyclic-import
 """Components to communicate tasks to RabbitMQ."""
+import asyncio
 from collections.abc import Mapping
 import logging
 import traceback
@@ -209,6 +210,10 @@ async def _continue(self, communicator, pid, nowait, tag=None):
             message = 'the class of the process could not be imported.'
             self.handle_continue_exception(node, exception, message)
             raise
+        except asyncio.CancelledError:  # pylint: disable=try-except-raise
+            # note this is only required in python<=3.7,
+            # where asyncio.CancelledError inherits from Exception
+            raise
         except Exception as exception:
             message = 'failed to recreate the process instance in order to continue it.'
             self.handle_continue_exception(node, exception, message)