Skip to content

master to develop #410

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sivkovic merged 9 commits into from
Apr 20, 2026
Merged

master to develop #410

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
6a0868d
Version bump 2.1.2
sivkovic Apr 2, 2026
bbd8825
Merge pull request #405 from mskcc/develop
sivkovic Apr 2, 2026
5a89f25
Merge branch 'master' of github.com:mskcc/ridgeback into hotfix/disab…
sivkovic Apr 2, 2026
43f64c9
Merge pull request #408 from mskcc/hotfix/disable_check_command_line
sivkovic Apr 2, 2026
84dc101
Disable all CHECK_COMMAND_LINE_STATUS
sivkovic Apr 15, 2026
2775fa1
Parse main job state when job is pending
nikhil Apr 15, 2026
5c79a4c
Merge branch 'hotfix/disable_check_command_line' of github.com:mskcc/…
sivkovic Apr 15, 2026
c11befb
Version bump 2.1.3
sivkovic Apr 15, 2026
4272346
Merge pull request #409 from mskcc/hotfix/parse_all_slurm_tasks
sivkovic Apr 17, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion batch_systems/slurm_client/slurm_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down
8 changes: 4 additions & 4 deletions orchestrator/tasks.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -330,7 +330,7 @@ def check_job_status(job):

if batch_system_status in (Status.RUNNING,):
command_processor.delay(Command(CommandType.CHECK_HANGING, str(job.id)).to_dict())
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.COMPLETED,):
submitter = JobSubmitterFactory.factory(
Expand All @@ -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))

Expand Down
2 changes: 1 addition & 1 deletion ridgeback/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = "2.1.1"
__version__ = "2.1.3"
Loading