From c6aa2578bbe3821b9f38fd0d1aad55386b78d1d3 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Franti=C5=A1ek=20Dvo=C5=99=C3=A1k?= Date: Thu, 5 Mar 2015 18:03:09 +0100 Subject: [PATCH] Fix status. --- jobs.py | 4 ++-- stat2pbs.py | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/jobs.py b/jobs.py index cc83ea3..ebd97fa 100755 --- a/jobs.py +++ b/jobs.py @@ -280,8 +280,8 @@ for id, job in jobs.iteritems(): if job.yarn: if not job.name: job.name = job.yarn['name'] - if not job.status: - job.status = job.yarn['finalStatus'] + if not job.status or job.status == 'UNDEFINED': + job.status = job.yarn['state'] if not job.user: job.user = job.yarn['user'] if not job.queue: diff --git a/stat2pbs.py b/stat2pbs.py index 2aa202a..14f5a4d 100755 --- a/stat2pbs.py +++ b/stat2pbs.py @@ -35,7 +35,7 @@ def gen_string(job): log_time = time.strftime("%d/%m/%Y %H:%M:%S", time.gmtime()) if job['status'] == 'RUNNING': status = 'R' - elif job['status'] in ('SUCCEEDED', 'KILLED'): + elif job['status'] in ('SUCCEEDED', 'KILLED', 'FINISHED'): status = 'C' elif job['status'] in ('SUBMITTED', 'ACCEPTED'): status = 'Q' @@ -43,6 +43,9 @@ def gen_string(job): status = 'T' elif job['status'] in ('FAILED', 'UNDEFINED'): status = 'E' + else: + print 'Unknown status %s' % job['status'] + sys.exit(1) if job['status'] == 'SUCCEEDED': pbs_exit_status=' exit_status=0' -- 1.8.2.3