diff --git a/batch_systems/slurm_client/slurm_client.py b/batch_systems/slurm_client/slurm_client.py index 0ed76d3a..3eedf15e 100644 --- a/batch_systems/slurm_client/slurm_client.py +++ b/batch_systems/slurm_client/slurm_client.py @@ -295,7 +295,7 @@ def status(self, external_job_id): Returns: tuple: (Ridgeback Status int, extra info) """ - saact_command = ["sacct", f"--jobs={external_job_id}.batch", "--format=jobid,state,exitcode", "-n", "-P"] + saact_command = ["sacct", f"--jobs={external_job_id}", "--format=jobid,state,exitcode", "-n", "-P"] self.logger.debug("Checking slurm status for job: %s", external_job_id) process = subprocess.run(saact_command, check=True, stdout=subprocess.PIPE, universal_newlines=True) status = self._parse_status(process.stdout, str(external_job_id)) diff --git a/orchestrator/tasks.py b/orchestrator/tasks.py index 329eaf1f..4b32755a 100644 --- a/orchestrator/tasks.py +++ b/orchestrator/tasks.py @@ -348,14 +348,14 @@ def check_job_status(job): outputs, error_message = submitter.get_outputs() if outputs: _pipeline_completed(job, outputs) - command_processor.delay(Command(CommandType.CHECK_COMMAND_LINE_STATUS, str(job.id)).to_dict()) + # command_processor.delay(Command(CommandType.CHECK_COMMAND_LINE_STATUS, str(job.id)).to_dict()) else: _fail(job, error_message) - command_processor.delay(Command(CommandType.CHECK_COMMAND_LINE_STATUS, str(job.id)).to_dict()) + # command_processor.delay(Command(CommandType.CHECK_COMMAND_LINE_STATUS, str(job.id)).to_dict()) elif batch_system_status in (Status.FAILED,): _fail(job, batch_system_message) - command_processor.delay(Command(CommandType.CHECK_COMMAND_LINE_STATUS, str(job.id)).to_dict()) + # command_processor.delay(Command(CommandType.CHECK_COMMAND_LINE_STATUS, str(job.id)).to_dict()) else: raise StopException("Invalid transition %s to %s" % (Status(job.status).name, Status(batch_system_status).name)) diff --git a/ridgeback/__init__.py b/ridgeback/__init__.py index 4eabd0b3..e835b9d0 100644 --- a/ridgeback/__init__.py +++ b/ridgeback/__init__.py @@ -1 +1 @@ -__version__ = "2.1.2" +__version__ = "2.1.3"