Skip to content

Commit

Permalink
need to remove non bot jobs earlier + using current jobs for processi…
Browse files Browse the repository at this point in the history
…ng running jobs
  • Loading branch information
truib committed Apr 14, 2023
1 parent 28cb285 commit 828fa0c
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions eessi_bot_job_manager.py
Original file line number Diff line number Diff line change
Expand Up @@ -676,6 +676,10 @@ def main():
# " %s due to parameter '--jobs %s'" % (
# nj,opts.jobs), job_manager.logfile)

# remove non bot jobs from current_jobs
for job in non_bot_jobs:
current_jobs.pop(job)

running_jobs = job_manager.determine_running_jobs(current_jobs)
log(
"job manager main loop: running_jobs='%s'" %
Expand All @@ -685,7 +689,7 @@ def main():

for rj in running_jobs:
if not job_manager.job_filter or rj in job_manager.job_filter:
job_manager.process_running_jobs(known_jobs[rj])
job_manager.process_running_jobs(current_jobs[rj])

finished_jobs = job_manager.determine_finished_jobs(
known_jobs, current_jobs)
Expand All @@ -703,10 +707,6 @@ def main():
# "job %s due"" to parameter '--jobs %s'" % (fj,opts.jobs),
# " job_manager.logfile)"

# remove non bot jobs from current_jobs
for job in non_bot_jobs:
current_jobs.pop(job)

known_jobs = current_jobs

# sleep poll_interval seconds (only if at least one more iteration)
Expand Down

0 comments on commit 828fa0c

Please sign in to comment.