Merge pull request #177 from trz42/fix_non_bot_job_crash_2

some fixes for letting the job manager handle non bot jobs correctly
EESSI · May 9, 2023 · e235ba7 · e235ba7
2 parents b55a422 + 828fa0c
commit e235ba7
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/eessi_bot_job_manager.py b/eessi_bot_job_manager.py
@@ -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'" %
@@ -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)
@@ -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)