Commit 2dd2bcbe authored by Paul Rich's avatar Paul Rich
Browse files

Logging improvements

Making form of ALPS reserve/confirm messages consistient.
Adding a jobid to cleanup complete (we can do that on this system!)
parent 4c489ed1
...@@ -401,8 +401,7 @@ class CraySystem(BaseSystem): ...@@ -401,8 +401,7 @@ class CraySystem(BaseSystem):
#pending hardware status update #pending hardware status update
self.nodes[str(node_id)].status = 'idle' self.nodes[str(node_id)].status = 'idle'
res_jobid_to_delete.append(alps_res.jobid) res_jobid_to_delete.append(alps_res.jobid)
_logger.info('Nodes %s cleanup complete.', _logger.info('Jobid %s: Nodes %s cleanup complete.', alps_res.jobid, compact_num_list(alps_res.node_ids))
compact_num_list(alps_res.node_ids))
for jobid in res_jobid_to_delete: for jobid in res_jobid_to_delete:
_logger.info('%s: ALPS reservation for this job complete.', jobid) _logger.info('%s: ALPS reservation for this job complete.', jobid)
del self.alps_reservations[str(jobid)] del self.alps_reservations[str(jobid)]
...@@ -1503,7 +1502,7 @@ class ALPSReservation(object): ...@@ -1503,7 +1502,7 @@ class ALPSReservation(object):
''' '''
self.pg_id = pagg_id self.pg_id = pagg_id
_logger.info('ALPS Reservation %s for job %s confirmed', _logger.info('ALPS Reservation %s confirmed for job %s',
self.alps_res_id, self.jobid) self.alps_res_id, self.jobid)
def release(self): def release(self):
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment