Skip to content
Snippets Groups Projects
Commit 9b4aa1c5 authored by Nathaniel Kofalt's avatar Nathaniel Kofalt
Browse files

Add job profile

parent c210f694
No related branches found
No related tags found
No related merge requests found
......@@ -444,8 +444,9 @@ class JobHandler(base.RequestHandler):
def prepare_complete(self, _id):
payload = self.request.json
success = payload['success']
elapsed = payload['elapsed']
ticket = JobTicket.create(_id, success)
ticket = JobTicket.create(_id, success, elapsed)
return { 'ticket': ticket }
@require_login
......
......@@ -21,7 +21,7 @@ class Job(object):
modified=None, state='pending', request=None,
id_=None, config_=None, now=False, origin=None,
saved_files=None, produced_metadata=None, batch=None,
failed_output_accepted=False):
failed_output_accepted=False, profile=None):
"""
Creates a job.
......@@ -71,6 +71,8 @@ class Job(object):
created = time_now
if modified is None:
modified = time_now
if profile is None:
profile = {}
if destination is None and inputs is not None:
# Grab an arbitrary input's container
......@@ -106,6 +108,7 @@ class Job(object):
self.produced_metadata = produced_metadata
self.batch = batch
self.failed_output_accepted = failed_output_accepted
self.profile = profile
def intention_equals(self, other_job):
......@@ -165,7 +168,9 @@ class Job(object):
saved_files=d.get('saved_files'),
produced_metadata=d.get('produced_metadata'),
batch=d.get('batch'),
failed_output_accepted=d.get('failed_output_accepted', False))
failed_output_accepted=d.get('failed_output_accepted', False),
profile=d.get('profile', {})
)
@classmethod
def get(cls, _id):
......@@ -380,12 +385,13 @@ class JobTicket(object):
return config.db.job_tickets.find_one({'_id': bson.ObjectId(_id)})
@staticmethod
def create(job_id, success):
def create(job_id, success, elapsed):
j = Job.get(job_id)
result = config.db.job_tickets.insert_one({
'job': j.id_,
'success': success,
'elapsed': elapsed,
})
return result.inserted_id
......
......@@ -325,15 +325,25 @@ class EnginePlacer(Placer):
if job_ticket is not None:
if success:
Queue.mutate(job, {'state': 'complete'})
Queue.mutate(job, {
'state': 'complete',
'profile': {
'elapsed': job_ticket['elapsed']
}
})
else:
Queue.mutate(job, {'state': 'failed'})
Queue.mutate(job, {
'state': 'failed',
'profile': {
'elapsed': job_ticket['elapsed']
}
})
if self.context.get('job_id'):
job = Job.get(self.context.get('job_id'))
job.saved_files = [f['name'] for f in self.saved]
job.produced_metadata = self.metadata
job.save()
# if self.context.get('job_id'):
# job = Job.get(self.context.get('job_id'))
# job.saved_files = [f['name'] for f in self.saved]
# job.produced_metadata = self.metadata
# job.save()
self.recalc_session_compliance()
return self.saved
......
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