return False when run launchers try to terminate a run that is alread…

…y finished Summary: Make this is a no-op rather than moving a run from a terminal state into a non-terminal state.
dagster-io · Jul 18, 2024 · 893888b · 893888b
1 parent c4328ab
commit 893888b
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/python_modules/dagster/dagster/_core/launcher/default_run_launcher.py b/python_modules/dagster/dagster/_core/launcher/default_run_launcher.py
@@ -157,7 +157,7 @@ def terminate(self, run_id):
             return False
 
         run = self._instance.get_run_by_id(run_id)
-        if not run:
+        if not run or run.is_finished:
             return False
 
         self._instance.report_run_canceling(run)

diff --git a/python_modules/libraries/dagster-aws/dagster_aws/ecs/launcher.py b/python_modules/libraries/dagster-aws/dagster_aws/ecs/launcher.py
@@ -517,7 +517,7 @@ def terminate(self, run_id):
         tags = self._get_run_tags(run_id)
 
         run = self._instance.get_run_by_id(run_id)
-        if not run:
+        if not run or run.is_finished:
             return False
 
         self._instance.report_run_canceling(run)

diff --git a/python_modules/libraries/dagster-celery-k8s/dagster_celery_k8s/launcher.py b/python_modules/libraries/dagster-celery-k8s/dagster_celery_k8s/launcher.py
@@ -276,7 +276,7 @@ def terminate(self, run_id):
         check.str_param(run_id, "run_id")
 
         run = self._instance.get_run_by_id(run_id)
-        if not run:
+        if not run or run.is_finished:
             return False
 
         self._instance.report_run_canceling(run)

diff --git a/python_modules/libraries/dagster-docker/dagster_docker/docker_run_launcher.py b/python_modules/libraries/dagster-docker/dagster_docker/docker_run_launcher.py
@@ -191,7 +191,7 @@ def _get_container(self, run):
     def terminate(self, run_id):
         run = self._instance.get_run_by_id(run_id)
 
-        if not run:
+        if not run or run.is_finished:
             return False
 
         self._instance.report_run_canceling(run)

diff --git a/python_modules/libraries/dagster-k8s/dagster_k8s/launcher.py b/python_modules/libraries/dagster-k8s/dagster_k8s/launcher.py
@@ -317,7 +317,7 @@ def terminate(self, run_id):
         check.str_param(run_id, "run_id")
         run = self._instance.get_run_by_id(run_id)
 
-        if not run:
+        if not run or run.is_finished:
             return False
 
         self._instance.report_run_canceling(run)