openstack/freezer
Code Issues Proposed changes

Merge "Remove unneeded if statements"

Browse Source
This commit is contained in:
Zuul 2018-10-25 06:54:44 +00:00 committed by Gerrit Code Review
commit 33fe93c4ce
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
freezer/scheduler/freezer_scheduler.py
View File

@ -151,9 +151,8 @@ class FreezerScheduler(object):
def create_job(self, job_doc): def create_job(self, job_doc):
job = scheduler_job.Job.create(self, self.freezerc_executable, job_doc) job = scheduler_job.Job.create(self, self.freezerc_executable, job_doc)
if job: self.jobs[job.id] = job
self.jobs[job.id] = job LOG.info("Created job {0}".format(job.id))
LOG.info("Created job {0}".format(job.id))
return job return job
def poll(self): def poll(self):
@ -170,13 +169,13 @@ class FreezerScheduler(object):
job_id = job_doc['job_id'] job_id = job_doc['job_id']
work_job_id_list.append(job_id) work_job_id_list.append(job_id)
job = self.jobs.get(job_id, None) or self.create_job(job_doc) job = self.jobs.get(job_id, None) or self.create_job(job_doc)
if job:
# check for abort status
if job_doc['job_schedule']['event'] == 'abort':
pid = int(job_doc['job_schedule']['current_pid'])
utils.terminate_subprocess(pid, 'freezer-agent')
job.process_event(job_doc) # check for abort status
if job_doc['job_schedule']['event'] == 'abort':
pid = int(job_doc['job_schedule']['current_pid'])
utils.terminate_subprocess(pid, 'freezer-agent')
job.process_event(job_doc)
# request removal of any job that has been removed in the api # request removal of any job that has been removed in the api
for job_id, job in self.jobs.items(): for job_id, job in self.jobs.items():