Skip to content
Snippets Groups Projects
Commit 7867e7c8 authored by Jorrit Schaap's avatar Jorrit Schaap
Browse files

SW-516: python3 fixes for ingestjobmanagementserver

parent 436e2bd7
No related branches found
No related tags found
No related merge requests found
...@@ -43,6 +43,7 @@ import time ...@@ -43,6 +43,7 @@ import time
from random import random from random import random
from threading import RLock from threading import RLock
from datetime import datetime, timedelta from datetime import datetime, timedelta
from functools import cmp_to_key
import logging import logging
from functools import reduce from functools import reduce
...@@ -676,7 +677,7 @@ class IngestJobManager: ...@@ -676,7 +677,7 @@ class IngestJobManager:
# filter out jad's from exclude_job_group_ids # filter out jad's from exclude_job_group_ids
job_admin_dicts = [jad for jad in job_admin_dicts if 'job_group_id' not in jad['job'] or jad['job']['job_group_id'] not in exclude_job_group_ids] job_admin_dicts = [jad for jad in job_admin_dicts if 'job_group_id' not in jad['job'] or jad['job']['job_group_id'] not in exclude_job_group_ids]
job_admin_dicts = sorted(job_admin_dicts, cmp=jad_compare_func) job_admin_dicts = sorted(job_admin_dicts, key=cmp_to_key(jad_compare_func))
if job_admin_dicts: if job_admin_dicts:
logger.info('%s jobs with status %s waiting', len(job_admin_dicts), jobState2String(status)) logger.info('%s jobs with status %s waiting', len(job_admin_dicts), jobState2String(status))
return job_admin_dicts[0] return job_admin_dicts[0]
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment