Skip to content

On helios, get PBS_JOBID associated with SRMJID #139

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
MarcCote merged 2 commits into from
Sep 12, 2016
Merged

On helios, get PBS_JOBID associated with SRMJID #139

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c00da88
On helios, get PBS_JOBID associated with SRMJID
slefrancois Aug 31, 2016
c39dc99
only return pbs_jobid
slefrancois Sep 12, 2016
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
11 changes: 11 additions & 0 deletions scripts/smart-dispatch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@ from smartdispatch.filelock import open_with_lock
import logging
import smartdispatch

# For cluster job_id mismatch
import re

LOGS_FOLDERNAME = "SMART_DISPATCH_LOGS"
CLUSTER_NAME = utils.detect_cluster()
AVAILABLE_QUEUES = get_available_queues(CLUSTER_NAME)
Expand Down Expand Up @@ -138,6 +141,14 @@ def main():
qsub_output = check_output('{launcher} {pbs_filename}'.format(launcher=LAUNCHER if args.launcher is None else args.launcher, pbs_filename=pbs_filename), shell=True)
jobs_id += [qsub_output.strip()]

# On some clusters, SRMJID and PBS_JOBID don't match
if CLUSTER_NAME in ['helios']:
qstat_out = check_output(['qstat', '-f']).split('Job Id: ')
for job in qstat_out:
if re.search(r"SRMJID:{job_id}".format(job_id=jobs_id[-1]), job):
pbs_job_id = re.match(r"[0-9a-zA-Z.-]*", job).group()
jobs_id[-1] = '{pbs}'.format(pbs=pbs_job_id)

with open_with_lock(pjoin(path_job, "jobs_id.txt"), 'a') as jobs_id_file:
jobs_id_file.writelines(t.strftime("## %Y-%m-%d %H:%M:%S ##\n"))
jobs_id_file.writelines("\n".join(jobs_id) + "\n")
Expand Down