Fix cancel before run

temporalio/worker/workflow_instance.py

@@ -352,7 +352,10 @@ def _apply_cancel_workflow(
         self._cancel_requested = True
         # TODO(cretz): Details or cancel message or whatever?
         if self._primary_task:
-            self._primary_task.cancel()
+            # The primary task may not have started yet and we want to give the
+            # workflow the ability to receive the cancellation, so we must defer
+            # this cancellation to the next iteration of the event loop.
+            self.call_soon(self._primary_task.cancel)
 
     def _apply_fire_timer(
         self, job: temporalio.bridge.proto.workflow_activation.FireTimer

tests/worker/test_workflow.py

@@ -722,6 +722,31 @@ async def started() -> bool:
         assert isinstance(err.value.cause, CancelledError)
 
 
+@workflow.defn
+class TrapCancelWorkflow:
+    @workflow.run
+    async def run(self) -> str:
+        try:
+            await asyncio.Future()
+            raise RuntimeError("should not get here")
+        except asyncio.CancelledError:
+            return "cancelled"
+
+
+async def test_workflow_cancel_before_run(client: Client):
+    # Start the workflow _and_ send cancel before even starting the workflow
+    task_queue = str(uuid.uuid4())
+    handle = await client.start_workflow(
+        TrapCancelWorkflow.run,
+        id=f"workflow-{uuid.uuid4()}",
+        task_queue=task_queue,
+    )
+    await handle.cancel()
+    # Start worker and wait for result
+    async with new_worker(client, TrapCancelWorkflow, task_queue=task_queue):
+        assert "cancelled" == await handle.result()
+
+
 @activity.defn
 async def wait_forever() -> NoReturn:
     await asyncio.Future()