check if None

fjetter · fjetter · commit 178f57faca12 · 2022-12-13T14:16:38.000+01:00
diff --git a/distributed/core.py b/distributed/core.py
@@ -498,7 +498,9 @@ def __await__(self):
         return self.start().__await__()
 
     async def cancel_start(self):
-        self.__startup_task.cancel()
+        if self.__startup_task:
+            self.__startup_task.cancel()
+            await self.started()
 
     async def start_unsafe(self):
         """Attempt to start the server. This is not idempotent and not protected against concurrent startup attempts.
diff --git a/distributed/nanny.py b/distributed/nanny.py
@@ -584,7 +584,6 @@ async def close(
         # status to closing
         logger.info("Closing Nanny at %r. Reason: %s", self.address_safe, reason)
         await self.cancel_start()
-        await self.started()
 
         self.status = Status.closing
 
diff --git a/distributed/worker.py b/distributed/worker.py
@@ -1519,7 +1519,6 @@ async def close(  # type: ignore
         # Make sure we're not colliding with the startup coro when setting the
         # status to closing
         await self.cancel_start()
-        await self.started()
         self.status = Status.closing
 
         # Stop callbacks before giving up control in any `await`.
