diff --git a/doc/job_states.drawio.png b/doc/job_states.drawio.png index 842431f03807ed4c0f8f36fb267bc7f44bc86031..a2d0cb1565e43ef5d649a7a9664efeb715eaa6df 100644 Binary files a/doc/job_states.drawio.png and b/doc/job_states.drawio.png differ diff --git a/src/actions/spawn_job.py b/src/actions/spawn_job.py index d1b550fad156d780456b100e9104775b0330b1e1..b4b22d27605af393d34b1047d2f5bfe8bf7d447e 100644 --- a/src/actions/spawn_job.py +++ b/src/actions/spawn_job.py @@ -60,7 +60,7 @@ class WatchJob(GeneratorRecurringEvent): old_id = self.job.refresh_data(cstate) if self.job.jobData is None: raise Exception(f"Could not find job in db with id={old_id}") - if self.job.job_state == JobState.DELETED or self.job.job_state == JobState.FINISHED_AND_PROCESSED or self.job.job_state == JobState.FAILED_AND_PROCESSED: + if self.job.job_state == JobState.CANCELED or self.job.job_state == JobState.FINISHED_AND_PROCESSED or self.job.job_state == JobState.FAILED_AND_PROCESSED: print(f"Job already processed in db, state: {self.job.job_state}, not processing again") return expected_state = JobState.FINISHED if job_info.status.succeeded is not None else JobState.FAILED diff --git a/src/job_database_api.py b/src/job_database_api.py index 6271e9470971fc6124e5caae9e3b27400d78507a..b4c8562a17c2eb681c7ad6e903effafa03e42ea4 100644 --- a/src/job_database_api.py +++ b/src/job_database_api.py @@ -13,7 +13,7 @@ class JobState(Enum): FINISHED_AND_PROCESSED = "finished_and_processed" FAILED = "failed" FAILED_AND_PROCESSED = "failed_and_processed" - DELETED = "deleted" + CANCELED = "canceled" class JobData():